diff options
3 files changed, 11 insertions, 19 deletions
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/HostSystem.java b/config-model/src/main/java/com/yahoo/vespa/model/HostSystem.java index 6f8064d0b5c..fdfe4f01790 100644 --- a/config-model/src/main/java/com/yahoo/vespa/model/HostSystem.java +++ b/config-model/src/main/java/com/yahoo/vespa/model/HostSystem.java @@ -55,7 +55,7 @@ public class HostSystem extends AbstractConfigProducer<Host> { } if (! hostname.contains(".")) { deployLogger.log(Level.WARNING, "Host named '" + hostname + "' may not receive any config " + - "since it is not a canonical hostname"); + "since it is not a canonical hostname"); } } diff --git a/document/src/main/java/com/yahoo/document/datatypes/StringFieldValue.java b/document/src/main/java/com/yahoo/document/datatypes/StringFieldValue.java index afb7efd788f..156fd853241 100644 --- a/document/src/main/java/com/yahoo/document/datatypes/StringFieldValue.java +++ b/document/src/main/java/com/yahoo/document/datatypes/StringFieldValue.java @@ -34,6 +34,7 @@ public class StringFieldValue extends FieldValue { return new StringFieldValue(); } } + public static PrimitiveDataType.Factory getFactory() { return new Factory(); } public static final int classId = registerClass(Ids.document + 15, StringFieldValue.class); private String value; @@ -52,7 +53,7 @@ public class StringFieldValue extends FieldValue { * {@link Text#isTextCharacter(int)} */ public StringFieldValue(String value) { - if (value==null) throw new IllegalArgumentException("Value cannot be null"); + if (value == null) throw new IllegalArgumentException("Value cannot be null"); setValue(value); } @@ -60,7 +61,7 @@ public class StringFieldValue extends FieldValue { OptionalInt illegalCodePoint = Text.validateTextString(value); if (illegalCodePoint.isPresent()) { throw new IllegalArgumentException("The string field value contains illegal code point 0x" + - Integer.toHexString(illegalCodePoint.getAsInt()).toUpperCase()); + Integer.toHexString(illegalCodePoint.getAsInt()).toUpperCase()); } } @@ -149,10 +150,7 @@ public class StringFieldValue extends FieldValue { return ImmutableList.copyOf(spanTrees.values()); } - /** - * - * @return The map of spantrees. Might be null. - */ + /** Returns the map of spantrees. Might be null. */ public final Map<String, SpanTree> getSpanTreeMap() { return spanTrees; } @@ -193,7 +191,7 @@ public class StringFieldValue extends FieldValue { * Removes the span tree associated with the given name. * * @param name the name of the span tree to remove - * @return the span tree previously associated with the given name, or null if it did not exist. + * @return the span tree previously associated with the given name, or null if it did not exist */ public SpanTree removeSpanTree(String name) { if (spanTrees == null) { @@ -206,20 +204,12 @@ public class StringFieldValue extends FieldValue { return tree; } - /** - * Returns the String value wrapped by this StringFieldValue. - * - * @return the String value wrapped by this StringFieldValue. - */ + /** Returns the String value wrapped by this StringFieldValue */ public String getString() { return value; } - /** - * Returns the String value wrapped by this StringFieldValue. - * - * @return the String value wrapped by this StringFieldValue. - */ + /** Returns the String value wrapped by this StringFieldValue */ @Override public Object getWrappedValue() { return value; @@ -228,7 +218,7 @@ public class StringFieldValue extends FieldValue { /** * Prints XML in Vespa Document XML format for this StringFieldValue. * - * @param xml the stream to print to. + * @param xml the stream to print to */ @Override public void printXml(XmlStream xml) { diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/provisioning/NodePrioritizer.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/provisioning/NodePrioritizer.java index a74f3b2d116..4126a95de2c 100644 --- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/provisioning/NodePrioritizer.java +++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/provisioning/NodePrioritizer.java @@ -30,6 +30,7 @@ import java.util.stream.Collectors; * @author smorgrav */ public class NodePrioritizer { + private final static Logger log = Logger.getLogger(NodePrioritizer.class.getName()); private final Map<Node, PrioritizableNode> nodes = new HashMap<>(); @@ -265,4 +266,5 @@ public class NodePrioritizer { // To get a stable algorithm - choose lexicographical from hostname return a.hostname().compareTo(b.hostname()); } + } |