diff options
Diffstat (limited to 'config-lib/src/main/java/com/yahoo/config')
16 files changed, 37 insertions, 49 deletions
diff --git a/config-lib/src/main/java/com/yahoo/config/BooleanNode.java b/config-lib/src/main/java/com/yahoo/config/BooleanNode.java index d7ca5b55b55..cb91912bd5a 100644 --- a/config-lib/src/main/java/com/yahoo/config/BooleanNode.java +++ b/config-lib/src/main/java/com/yahoo/config/BooleanNode.java @@ -5,6 +5,7 @@ package com.yahoo.config; * The BooleanNode class represents a boolean in a configuration tree. */ public class BooleanNode extends LeafNode<Boolean> { + public BooleanNode() { } diff --git a/config-lib/src/main/java/com/yahoo/config/ChangesRequiringRestart.java b/config-lib/src/main/java/com/yahoo/config/ChangesRequiringRestart.java index 3eeb637a991..3cd7c5541a9 100644 --- a/config-lib/src/main/java/com/yahoo/config/ChangesRequiringRestart.java +++ b/config-lib/src/main/java/com/yahoo/config/ChangesRequiringRestart.java @@ -63,8 +63,8 @@ public class ChangesRequiringRestart { } } - private ArrayList<ReportLine> report = new ArrayList<>(); - private String componentName; + private final ArrayList<ReportLine> report = new ArrayList<>(); + private final String componentName; public ChangesRequiringRestart(String componentName) { this.componentName = componentName; @@ -105,14 +105,14 @@ public class ChangesRequiringRestart { int commonElements = Math.min(from.size(), to.size()); for (int i = 0; i < commonElements; ++i) { ChangesRequiringRestart childReport = func.getChangesRequiringRestart(from.get(i), to.get(i)); - String prefix = childReport.componentName + "[" + Integer.toString(i) + "]"; + String prefix = childReport.componentName + "[" + i + "]"; mergeChanges(prefix, childReport); } for (int i = commonElements; i < from.size(); ++i) { - report.add(new ReportLine(name + "[" + Integer.toString(i) + "]", from.get(i), null, comment)); + report.add(new ReportLine(name + "[" + i + "]", from.get(i), null, comment)); } for (int i = commonElements; i < to.size(); ++i) { - report.add(new ReportLine(name + "[" + Integer.toString(i) + "]", null, to.get(i), comment)); + report.add(new ReportLine(name + "[" + i + "]", null, to.get(i), comment)); } } return this; diff --git a/config-lib/src/main/java/com/yahoo/config/DoubleNode.java b/config-lib/src/main/java/com/yahoo/config/DoubleNode.java index 5be0c2dc4c8..c90284f9e2e 100644 --- a/config-lib/src/main/java/com/yahoo/config/DoubleNode.java +++ b/config-lib/src/main/java/com/yahoo/config/DoubleNode.java @@ -5,6 +5,7 @@ package com.yahoo.config; * The DoubleNode class represents a double in a configuration tree. */ public class DoubleNode extends LeafNode<Double> { + public DoubleNode() { } diff --git a/config-lib/src/main/java/com/yahoo/config/EnumNode.java b/config-lib/src/main/java/com/yahoo/config/EnumNode.java index b3969dcfd8c..5427e6dc057 100644 --- a/config-lib/src/main/java/com/yahoo/config/EnumNode.java +++ b/config-lib/src/main/java/com/yahoo/config/EnumNode.java @@ -5,6 +5,7 @@ package com.yahoo.config; * The EnumNode class is a superclass for Enumerations in a configuration tree. */ public abstract class EnumNode<ENUM extends Enum<?>> extends LeafNode<ENUM> { + public EnumNode() { } diff --git a/config-lib/src/main/java/com/yahoo/config/FileNode.java b/config-lib/src/main/java/com/yahoo/config/FileNode.java index a7c1ebb1488..170c1e438a9 100644 --- a/config-lib/src/main/java/com/yahoo/config/FileNode.java +++ b/config-lib/src/main/java/com/yahoo/config/FileNode.java @@ -36,5 +36,4 @@ public class FileNode extends LeafNode<FileReference> { return true; } - } diff --git a/config-lib/src/main/java/com/yahoo/config/InnerNode.java b/config-lib/src/main/java/com/yahoo/config/InnerNode.java index 610221094d2..ac60ee9a6e9 100644 --- a/config-lib/src/main/java/com/yahoo/config/InnerNode.java +++ b/config-lib/src/main/java/com/yahoo/config/InnerNode.java @@ -7,6 +7,7 @@ import java.util.HashMap; import java.util.LinkedHashMap; import java.util.Iterator; import java.util.Map; +import java.util.Objects; /** * Superclass for all inner nodes in a {@link ConfigInstance}. @@ -44,7 +45,7 @@ public abstract class InnerNode extends Node { /** * Overrides {@link Node#postInitialize(String)}. - * Perform post initialization on this nodes children. + * Perform post initialization on this node's children. * * @param configId The config id of this instance. */ @@ -65,7 +66,7 @@ public abstract class InnerNode extends Node { return false; /* This implementation requires getChildren() to return elements in order. - Hence we should make it final. Or make equals independent of order. */ + Hence, we should make it final. Or make equals independent of order. */ Collection<Object> children = getChildren().values(); Collection<Object> otherChildren = ((InnerNode)other).getChildren().values(); @@ -74,7 +75,7 @@ public abstract class InnerNode extends Node { while(e1.hasNext() && e2.hasNext()) { Object o1 = e1.next(); Object o2 = e2.next(); - if (!(o1 == null ? o2 == null : o1.equals(o2))) + if (!(Objects.equals(o1, o2))) return false; } return !(e1.hasNext() || e2.hasNext()); @@ -135,7 +136,6 @@ public abstract class InnerNode extends Node { ret.put(name + "{" + entry.getKey() + "}", entry.getValue()); } - private static void addNodeVectorEntries(Map<String, Node> ret, String name, NodeVector<?> vector) { for (int j = 0; j < vector.length(); j++) ret.put(name + "[" + j + "]", (Node) vector.get(j)); diff --git a/config-lib/src/main/java/com/yahoo/config/InnerNodeVector.java b/config-lib/src/main/java/com/yahoo/config/InnerNodeVector.java index 8bf9b4c1520..30a7580c6dd 100644 --- a/config-lib/src/main/java/com/yahoo/config/InnerNodeVector.java +++ b/config-lib/src/main/java/com/yahoo/config/InnerNodeVector.java @@ -5,7 +5,6 @@ import java.util.List; /** * @author gjoranv - * @since 5.1.4 */ public class InnerNodeVector<NODE extends InnerNode> extends NodeVector<NODE> { diff --git a/config-lib/src/main/java/com/yahoo/config/LeafNode.java b/config-lib/src/main/java/com/yahoo/config/LeafNode.java index 0463631e4f6..bf443740abf 100644 --- a/config-lib/src/main/java/com/yahoo/config/LeafNode.java +++ b/config-lib/src/main/java/com/yahoo/config/LeafNode.java @@ -11,7 +11,7 @@ package com.yahoo.config; */ public abstract class LeafNode<T> extends Node implements Cloneable { - protected boolean initialized; + protected final boolean initialized; protected T value; /** diff --git a/config-lib/src/main/java/com/yahoo/config/LeafNodeVector.java b/config-lib/src/main/java/com/yahoo/config/LeafNodeVector.java index ddbed4258dc..a4fea95088d 100644 --- a/config-lib/src/main/java/com/yahoo/config/LeafNodeVector.java +++ b/config-lib/src/main/java/com/yahoo/config/LeafNodeVector.java @@ -57,7 +57,7 @@ public class LeafNodeVector<REAL, NODE extends LeafNode<REAL>> extends NodeVecto // TODO: Try to eliminate the need for this method when we have moved FileAcquirer to the config library // It is needed now because the builder has a list of String, while REAL=FileReference. public static LeafNodeVector<FileReference, FileNode> createFileNodeVector(Collection<String> values) { - List<FileReference> fileReferences = new ArrayList<FileReference>(); + List<FileReference> fileReferences = new ArrayList<>(); for (String s : values) fileReferences.add(new FileReference(ReferenceNode.stripQuotes(s))); diff --git a/config-lib/src/main/java/com/yahoo/config/LongNode.java b/config-lib/src/main/java/com/yahoo/config/LongNode.java index 02b6a5f7654..ac6ae457087 100755 --- a/config-lib/src/main/java/com/yahoo/config/LongNode.java +++ b/config-lib/src/main/java/com/yahoo/config/LongNode.java @@ -48,4 +48,5 @@ public class LongNode extends LeafNode<Long> { void serialize(Serializer serializer) { serializer.serialize(value); } + } diff --git a/config-lib/src/main/java/com/yahoo/config/ModelReference.java b/config-lib/src/main/java/com/yahoo/config/ModelReference.java index fbf34c7ff23..38ddf753bd6 100644 --- a/config-lib/src/main/java/com/yahoo/config/ModelReference.java +++ b/config-lib/src/main/java/com/yahoo/config/ModelReference.java @@ -67,8 +67,8 @@ public class ModelReference { public String toString() { if (resolved != null) return resolved.toString(); return modelId.orElse("\"\"") + " " + - url.map(v -> v.value()).orElse("\"\"") + " " + - path.map(v -> v.value()).orElse("\"\""); + url.map(UrlReference::value).orElse("\"\"") + " " + + path.map(FileReference::value).orElse("\"\""); } /** diff --git a/config-lib/src/main/java/com/yahoo/config/Node.java b/config-lib/src/main/java/com/yahoo/config/Node.java index a07409b19e7..188a9ecc623 100644 --- a/config-lib/src/main/java/com/yahoo/config/Node.java +++ b/config-lib/src/main/java/com/yahoo/config/Node.java @@ -9,16 +9,16 @@ package com.yahoo.config; public abstract class Node { /** - * Postinitialize this node. Any node needing to process its values depending on the config + * Post-initialize this node. Any node needing to process its values depending on the config * id should override this method. * * @param configId the configId of the ConfigInstance that owns (or is) this node */ - public void postInitialize(String configId) { return; } + public void postInitialize(String configId) {} /** * This method is meant for internal use in the configuration system. - * Overrides Object.clone(), and is overriden by LeafNode.clone(). + * Overrides Object.clone(), and is overridden by LeafNode.clone(). * * @return a new instance similar to this object. */ diff --git a/config-lib/src/main/java/com/yahoo/config/NodeVector.java b/config-lib/src/main/java/com/yahoo/config/NodeVector.java index 3d07de944fd..5ab1f97ecde 100644 --- a/config-lib/src/main/java/com/yahoo/config/NodeVector.java +++ b/config-lib/src/main/java/com/yahoo/config/NodeVector.java @@ -12,7 +12,7 @@ import java.util.*; */ public abstract class NodeVector<NODE> implements java.util.List<NODE> { - protected final ArrayList<NODE> vector = new ArrayList<NODE>(); + protected final ArrayList<NODE> vector = new ArrayList<>(); /** * Returns the number of elements in this NodeVector. @@ -24,7 +24,6 @@ public abstract class NodeVector<NODE> implements java.util.List<NODE> { return size(); } - @SuppressWarnings("serial") public static class ReadOnlyException extends RuntimeException { } @@ -88,7 +87,6 @@ public abstract class NodeVector<NODE> implements java.util.List<NODE> { return vector.hashCode(); } - @SuppressWarnings("unchecked") public NODE get(int index) { return vector.get(index); } diff --git a/config-lib/src/main/java/com/yahoo/config/Serializer.java b/config-lib/src/main/java/com/yahoo/config/Serializer.java index 12c45c789a4..5e2d35cb2af 100644 --- a/config-lib/src/main/java/com/yahoo/config/Serializer.java +++ b/config-lib/src/main/java/com/yahoo/config/Serializer.java @@ -3,7 +3,6 @@ package com.yahoo.config; /** * @author Ulf Lilleengen -* @since 5.1 */ public interface Serializer { Serializer createInner(String name); @@ -28,4 +27,5 @@ public interface Serializer { void serialize(long value); void serialize(int value); void serialize(String value); + } diff --git a/config-lib/src/main/java/com/yahoo/config/StringNode.java b/config-lib/src/main/java/com/yahoo/config/StringNode.java index 2e4f0df07af..0a87a09ddc6 100644 --- a/config-lib/src/main/java/com/yahoo/config/StringNode.java +++ b/config-lib/src/main/java/com/yahoo/config/StringNode.java @@ -29,10 +29,10 @@ public class StringNode extends LeafNode<String> { /** * Returns the value of this string. Same as {@link #getValue()} * since the value of this node is a String (but implementations - * in other {@link LeafNode} sub-classes differ). + * in other {@link LeafNode} subclasses differ). * * @return the string representation of this StringNode, or null if - * the vlaue is explicitly set to null + * the value is explicitly set to null */ public String value() { return value; @@ -63,30 +63,18 @@ public class StringNode extends LeafNode<String> { throw new IllegalArgumentException("Parse error" + string); } switch (sb.charAt(i)) { - case'n': - sb.setCharAt(i, '\n'); - break; - case'r': - sb.setCharAt(i, '\r'); - break; - case't': - sb.setCharAt(i, '\t'); - break; - case'f': - sb.setCharAt(i, '\f'); - break; - case'x': + case 'n' -> sb.setCharAt(i, '\n'); + case 'r' -> sb.setCharAt(i, '\r'); + case 't' -> sb.setCharAt(i, '\t'); + case 'f' -> sb.setCharAt(i, '\f'); + case 'x' -> { if (i + 2 >= sb.length()) { - throw new IllegalArgumentException - ("Could not parse hex value " + string); + throw new IllegalArgumentException("Could not parse hex value " + string); } - sb.setCharAt(i, (char) Integer.parseInt - (sb.substring(i + 1, i + 3), 16)); + sb.setCharAt(i, (char) Integer.parseInt(sb.substring(i + 1, i + 3), 16)); sb.delete(i + 1, i + 3); - break; - case'\\': - sb.setCharAt(i, '\\'); - break; + } + case '\\' -> sb.setCharAt(i, '\\'); } } } @@ -101,7 +89,7 @@ public class StringNode extends LeafNode<String> { } /** - * Sets the value of this string from a the string representation + * Sets the value of this string from the string representation * of this value in the (escaped) input configuration. The value * supplied to this method needs un-escaping and will be * un-escaped. diff --git a/config-lib/src/main/java/com/yahoo/config/text/StringUtilities.java b/config-lib/src/main/java/com/yahoo/config/text/StringUtilities.java index ca0bc1758e3..5a1a570e913 100644 --- a/config-lib/src/main/java/com/yahoo/config/text/StringUtilities.java +++ b/config-lib/src/main/java/com/yahoo/config/text/StringUtilities.java @@ -20,9 +20,9 @@ public class StringUtilities { private static class ReplacementCharacters { - public byte[] needEscape = new byte[256]; - public byte[] replacement1 = new byte[256]; - public byte[] replacement2 = new byte[256]; + public final byte[] needEscape = new byte[256]; + public final byte[] replacement1 = new byte[256]; + public final byte[] replacement2 = new byte[256]; public ReplacementCharacters() { for (int i=0; i<256; ++i) { |