From 551cb115ce7f2873bbceeeda7dcd0ace151d6e88 Mon Sep 17 00:00:00 2001 From: Bjørn Christian Seime Date: Wed, 8 Feb 2017 10:38:49 +0100 Subject: Minor changes from code review feedback --- .../main/java/com/yahoo/searchdefinition/DocumentModelBuilder.java | 4 ++-- .../src/test/java/com/yahoo/vespa/model/content/RedundancyTest.java | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) (limited to 'config-model') diff --git a/config-model/src/main/java/com/yahoo/searchdefinition/DocumentModelBuilder.java b/config-model/src/main/java/com/yahoo/searchdefinition/DocumentModelBuilder.java index 153d324e57e..b814d97e8db 100644 --- a/config-model/src/main/java/com/yahoo/searchdefinition/DocumentModelBuilder.java +++ b/config-model/src/main/java/com/yahoo/searchdefinition/DocumentModelBuilder.java @@ -332,7 +332,7 @@ public class DocumentModelBuilder { sdoc.getDocumentType().getHeaderType(), sdoc.getDocumentType().getBodyType(), sdoc.getFieldSets(), - convertDocumentRferences(sdoc.getDocumentReferences())); + convertDocumentReferences(sdoc.getDocumentReferences())); for (SDDocumentType n : sdoc.getInheritedTypes()) { NewDocumentType.Name name = new NewDocumentType.Name(n.getName()); NewDocumentType inherited = model.getDocumentManager().getDocumentType(name); @@ -388,7 +388,7 @@ public class DocumentModelBuilder { return dt; } - private static Set convertDocumentRferences(Optional documentReferences) { + private static Set convertDocumentReferences(Optional documentReferences) { if (!documentReferences.isPresent()) { return emptySet(); } diff --git a/config-model/src/test/java/com/yahoo/vespa/model/content/RedundancyTest.java b/config-model/src/test/java/com/yahoo/vespa/model/content/RedundancyTest.java index e93295ca12a..44ee35868e0 100644 --- a/config-model/src/test/java/com/yahoo/vespa/model/content/RedundancyTest.java +++ b/config-model/src/test/java/com/yahoo/vespa/model/content/RedundancyTest.java @@ -17,6 +17,7 @@ public class RedundancyTest { assertFalse(createRedundancy(5, 2, 12).isEffectivelyGloballyDistributed()); assertTrue(createRedundancy(5, 2, 10).isEffectivelyGloballyDistributed()); assertTrue(createRedundancy(5, 3, 10).isEffectivelyGloballyDistributed()); + assertTrue(createRedundancy(1, 1, 1).isEffectivelyGloballyDistributed()); } private static Redundancy createRedundancy(int redundancy, int implicitGroups, int totalNodes) { -- cgit v1.2.3