From 86c9c6916ca63c44534be8a9ae7f11bd14566712 Mon Sep 17 00:00:00 2001 From: Jon Bratseth Date: Thu, 7 Nov 2019 13:03:01 +0100 Subject: YQL parsing/serialization improvements - Serialize annotated range and weightedset with bracing - Parse Infinity in ranges - Better error messages in range parsing --- .../java/com/yahoo/vespa/model/content/cluster/ContentCluster.java | 3 ++- .../com/yahoo/vespa/model/content/cluster/RedundancyBuilder.java | 7 ++++--- 2 files changed, 6 insertions(+), 4 deletions(-) (limited to 'config-model') diff --git a/config-model/src/main/java/com/yahoo/vespa/model/content/cluster/ContentCluster.java b/config-model/src/main/java/com/yahoo/vespa/model/content/cluster/ContentCluster.java index 270b425fda9..4925a13c4d2 100644 --- a/config-model/src/main/java/com/yahoo/vespa/model/content/cluster/ContentCluster.java +++ b/config-model/src/main/java/com/yahoo/vespa/model/content/cluster/ContentCluster.java @@ -266,7 +266,8 @@ public class ContentCluster extends AbstractConfigProducer implements String name = g.getName(); if (siblings.contains(name)) { throw new IllegalArgumentException("Cluster '" + cluster + "' has multiple groups " + - "with name '" + name + "' in the same subgroup. Group sibling names must be unique."); + "with name '" + name + + "' in the same subgroup. Group sibling names must be unique."); } siblings.add(name); } diff --git a/config-model/src/main/java/com/yahoo/vespa/model/content/cluster/RedundancyBuilder.java b/config-model/src/main/java/com/yahoo/vespa/model/content/cluster/RedundancyBuilder.java index bf579744efb..2e97cdabd73 100644 --- a/config-model/src/main/java/com/yahoo/vespa/model/content/cluster/RedundancyBuilder.java +++ b/config-model/src/main/java/com/yahoo/vespa/model/content/cluster/RedundancyBuilder.java @@ -9,9 +9,10 @@ import com.yahoo.vespa.model.content.Redundancy; * Builds redundancy config for a content cluster. */ public class RedundancyBuilder { - Integer initialRedundancy = 2; - Integer finalRedundancy = 3; - Integer readyCopies = 2; + + private Integer initialRedundancy = 2; + private Integer finalRedundancy = 3; + private Integer readyCopies = 2; RedundancyBuilder(ModelElement clusterXml) { ModelElement redundancyElement = clusterXml.child("redundancy"); -- cgit v1.2.3