diff options
author | Harald Musum <musum@yahooinc.com> | 2023-08-23 11:14:55 +0200 |
---|---|---|
committer | Harald Musum <musum@yahooinc.com> | 2023-08-23 11:14:55 +0200 |
commit | a3400e2963e8d12651e72bb2db3872bcecd5ccbf (patch) | |
tree | fec06f6c96934b8581b2059f56642753f7b94437 /configgen/src | |
parent | fb3f2fd29acab0f31e107a182ce0d334286871ce (diff) |
Minor cleanup, no functional changes
Diffstat (limited to 'configgen/src')
5 files changed, 7 insertions, 14 deletions
diff --git a/configgen/src/main/java/com/yahoo/config/codegen/ConfigGenerator.java b/configgen/src/main/java/com/yahoo/config/codegen/ConfigGenerator.java index 5ffe18b1699..cb10ffdc2be 100644 --- a/configgen/src/main/java/com/yahoo/config/codegen/ConfigGenerator.java +++ b/configgen/src/main/java/com/yahoo/config/codegen/ConfigGenerator.java @@ -296,7 +296,7 @@ public class ConfigGenerator { List<String> accessors = new LinkedList<>(); for (CNode child : children) { String accessor = getAccessorCode(child); - if (accessor.isEmpty() == false) { + if (! accessor.isEmpty()) { accessors.add(accessor); } } diff --git a/configgen/src/main/java/com/yahoo/config/codegen/CppClassBuilder.java b/configgen/src/main/java/com/yahoo/config/codegen/CppClassBuilder.java index 1727d2b3396..6490c78a150 100644 --- a/configgen/src/main/java/com/yahoo/config/codegen/CppClassBuilder.java +++ b/configgen/src/main/java/com/yahoo/config/codegen/CppClassBuilder.java @@ -424,11 +424,9 @@ public class CppClassBuilder implements ClassBuilder { static String getTypeName(CNode node, boolean includeArray) { String type = null; - if (node instanceof InnerCNode) { - InnerCNode innerNode = (InnerCNode) node; + if (node instanceof InnerCNode innerNode) { type = getTypeName(innerNode.getName()); - } else if (node instanceof LeafCNode) { - LeafCNode leaf = (LeafCNode) node; + } else if (node instanceof LeafCNode leaf) { if (leaf.getType().equals("bool")) { type = "bool"; } else if (leaf.getType().equals("int")) { diff --git a/configgen/src/main/java/com/yahoo/config/codegen/DefLine.java b/configgen/src/main/java/com/yahoo/config/codegen/DefLine.java index 753fad0d41a..48e1b58816e 100644 --- a/configgen/src/main/java/com/yahoo/config/codegen/DefLine.java +++ b/configgen/src/main/java/com/yahoo/config/codegen/DefLine.java @@ -157,7 +157,7 @@ public class DefLine { } enumString = enumString.replaceFirst("\\{\\s*", ""); enumString = enumString.replaceFirst("\\s*\\}", ""); - String result[] = enumPattern2.split(enumString); + String[] result = enumPattern2.split(enumString); type.enumArray = new String[result.length]; for (int i = 0; i < result.length; i++) { String s = result[i].trim(); diff --git a/configgen/src/main/java/com/yahoo/config/codegen/DefParser.java b/configgen/src/main/java/com/yahoo/config/codegen/DefParser.java index 2be824658b4..4ba4e85e79c 100644 --- a/configgen/src/main/java/com/yahoo/config/codegen/DefParser.java +++ b/configgen/src/main/java/com/yahoo/config/codegen/DefParser.java @@ -204,11 +204,8 @@ public class DefParser { */ public static void dumpTree(CNode root, String indent) { StringBuilder sb = new StringBuilder(indent + root.getName()); - if (root instanceof LeafCNode) { - LeafCNode leaf = ((LeafCNode)root); - if (leaf.getDefaultValue() != null) { - sb.append(" = ").append(((LeafCNode)root).getDefaultValue().getValue()); - } + if (root instanceof LeafCNode leaf && leaf.getDefaultValue() != null) { + sb.append(" = ").append(((LeafCNode) root).getDefaultValue().getValue()); } System.out.println(sb); if (!root.getComment().isEmpty()) { diff --git a/configgen/src/main/java/com/yahoo/config/codegen/InnerCNode.java b/configgen/src/main/java/com/yahoo/config/codegen/InnerCNode.java index 295558a469c..bbe31ee9f5b 100644 --- a/configgen/src/main/java/com/yahoo/config/codegen/InnerCNode.java +++ b/configgen/src/main/java/com/yahoo/config/codegen/InnerCNode.java @@ -68,9 +68,7 @@ public class InnerCNode extends CNode { if (newChild == null) throw new IllegalArgumentException("Could not create " + type.name + " " + name); } - return children.containsKey(newChild.getName()) - ? children.get(newChild.getName()) - : newChild; + return children.getOrDefault(newChild.getName(), newChild); } /** |