diff options
author | Jon Bratseth <bratseth@oath.com> | 2018-03-19 13:03:38 +0100 |
---|---|---|
committer | Jon Bratseth <bratseth@oath.com> | 2018-03-19 13:03:38 +0100 |
commit | 904c61603407b1b522a86845376b458b5b33b2ce (patch) | |
tree | 5595894fca6c00b1a0f42c7d666d8809d858a0c4 /config-model | |
parent | 7826d89cf412a8791e4ac35deb5f199e0e95526e (diff) |
Nonfunctional changes only
Diffstat (limited to 'config-model')
6 files changed, 10 insertions, 12 deletions
diff --git a/config-model/src/main/java/com/yahoo/searchdefinition/document/SDField.java b/config-model/src/main/java/com/yahoo/searchdefinition/document/SDField.java index 6e7582a98c8..0590027a402 100644 --- a/config-model/src/main/java/com/yahoo/searchdefinition/document/SDField.java +++ b/config-model/src/main/java/com/yahoo/searchdefinition/document/SDField.java @@ -30,8 +30,7 @@ import java.util.*; */ public class SDField extends Field implements TypedKey, FieldOperationContainer, ImmutableSDField, Serializable { - /** Use this field for modifying index-structure, even if it doesn't - have any indexing code */ + /** Use this field for modifying index-structure, even if it doesn't have any indexing code */ private boolean indexStructureField = false; /** The indexing statements to be applied to this value during indexing */ @@ -61,7 +60,7 @@ public class SDField extends Field implements TypedKey, FieldOperationContainer, /** * Indicates what kind of matching should be done on this field */ - private Matching matching=new Matching(); + private Matching matching = new Matching(); /** Attribute settings, or null if there are none */ private Map<String, Attribute> attributes = new TreeMap<>(); @@ -104,11 +103,10 @@ public class SDField extends Field implements TypedKey, FieldOperationContainer, private boolean isExtraField = false; /** - Creates a new field. This method is only used to create reserved fields - @param name The name of the field - @param dataType The datatype of the field - @param isHeader Whether this is a "header" field or a "content" field - (true = "header"). + * Creates a new field. This method is only used to create reserved fields + * @param name The name of the field + * @param dataType The datatype of the field + * @param isHeader Whether this is a "header" field or a "content" field (true = "header"). */ protected SDField(SDDocumentType repo, String name, int id, DataType dataType, boolean isHeader, boolean populate) { super(name, id, dataType, isHeader); diff --git a/config-model/src/main/java/com/yahoo/searchdefinition/processing/LiteralBoost.java b/config-model/src/main/java/com/yahoo/searchdefinition/processing/LiteralBoost.java index 7d13233bc12..507a0e87cff 100644 --- a/config-model/src/main/java/com/yahoo/searchdefinition/processing/LiteralBoost.java +++ b/config-model/src/main/java/com/yahoo/searchdefinition/processing/LiteralBoost.java @@ -64,7 +64,7 @@ public class LiteralBoost extends Processor { private void reduceFieldLiteralBoosts(Search search) { for (SDField field : search.allConcreteFields()) { - if (field.getLiteralBoost()<0) continue; + if (field.getLiteralBoost() < 0) continue; reduceFieldLiteralBoost(field,search); } } diff --git a/config-model/src/main/java/com/yahoo/vespa/model/application/validation/Validation.java b/config-model/src/main/java/com/yahoo/vespa/model/application/validation/Validation.java index 490627e7b45..eaad6ad90a0 100644 --- a/config-model/src/main/java/com/yahoo/vespa/model/application/validation/Validation.java +++ b/config-model/src/main/java/com/yahoo/vespa/model/application/validation/Validation.java @@ -28,7 +28,6 @@ import static java.util.stream.Collectors.toList; * Executor of validators. This defines the right order of validator execution. * * @author hmusum - * @since 2010-01-29 */ public class Validation { diff --git a/config-model/src/main/java/com/yahoo/vespa/model/application/validation/change/ContainerRestartValidator.java b/config-model/src/main/java/com/yahoo/vespa/model/application/validation/change/ContainerRestartValidator.java index c27600578b5..5cee08ea9af 100644 --- a/config-model/src/main/java/com/yahoo/vespa/model/application/validation/change/ContainerRestartValidator.java +++ b/config-model/src/main/java/com/yahoo/vespa/model/application/validation/change/ContainerRestartValidator.java @@ -46,4 +46,5 @@ public class ContainerRestartValidator implements ChangeValidator { private static boolean isExistingContainer(Container container, VespaModel currentModel) { return currentModel.getService(container.getConfigId()).isPresent(); } + } diff --git a/config-model/src/main/java/com/yahoo/vespa/model/application/validation/change/search/AttributeChangeValidator.java b/config-model/src/main/java/com/yahoo/vespa/model/application/validation/change/search/AttributeChangeValidator.java index 95ae03d4e5f..26bebad93b4 100644 --- a/config-model/src/main/java/com/yahoo/vespa/model/application/validation/change/search/AttributeChangeValidator.java +++ b/config-model/src/main/java/com/yahoo/vespa/model/application/validation/change/search/AttributeChangeValidator.java @@ -22,7 +22,6 @@ import java.util.stream.Collectors; * Validates the changes between the current and next set of attribute fields in a document database. * * @author geirst - * @since 2014-12-04 */ public class AttributeChangeValidator { @@ -145,7 +144,7 @@ public class AttributeChangeValidator { List<VespaConfigChangeAction> result) { T currentValue = settingValueProvider.apply(currentAttr); T nextValue = settingValueProvider.apply(nextAttr); - if (!Objects.equals(currentValue, nextValue)) { + if ( ! Objects.equals(currentValue, nextValue)) { String message = String.format("change property '%s' from '%s' to '%s'", setting, currentValue, nextValue); result.add(new VespaRestartAction(new ChangeMessageBuilder(nextAttr.getName()).addChange(message).build())); } diff --git a/config-model/src/test/java/com/yahoo/vespa/model/application/validation/change/search/ContentClusterFixture.java b/config-model/src/test/java/com/yahoo/vespa/model/application/validation/change/search/ContentClusterFixture.java index 46f12a21bf0..3827da08679 100644 --- a/config-model/src/test/java/com/yahoo/vespa/model/application/validation/change/search/ContentClusterFixture.java +++ b/config-model/src/test/java/com/yahoo/vespa/model/application/validation/change/search/ContentClusterFixture.java @@ -22,6 +22,7 @@ import static org.junit.Assert.assertThat; * @author geirst */ public abstract class ContentClusterFixture { + protected ContentCluster currentCluster; protected ContentCluster nextCluster; |