From a3400e2963e8d12651e72bb2db3872bcecd5ccbf Mon Sep 17 00:00:00 2001
From: Harald Musum <musum@yahooinc.com>
Date: Wed, 23 Aug 2023 11:14:55 +0200
Subject: Minor cleanup, no functional changes

---
 configgen/README                                                   | 5 ++---
 .../src/main/java/com/yahoo/config/codegen/ConfigGenerator.java    | 2 +-
 .../src/main/java/com/yahoo/config/codegen/CppClassBuilder.java    | 6 ++----
 configgen/src/main/java/com/yahoo/config/codegen/DefLine.java      | 2 +-
 configgen/src/main/java/com/yahoo/config/codegen/DefParser.java    | 7 ++-----
 configgen/src/main/java/com/yahoo/config/codegen/InnerCNode.java   | 4 +---
 6 files changed, 9 insertions(+), 17 deletions(-)

diff --git a/configgen/README b/configgen/README
index cc122f6deb6..d973d206beb 100644
--- a/configgen/README
+++ b/configgen/README
@@ -1,9 +1,9 @@
 Vespa Config Generation
 =======================
 
-The configgen module is used to generate config-classes from .def files.
+The configgen module is used to generate config classes from .def files.
 
-Userguide
+User guide
 ---------
 
 Usually you will want to use this module through the config-class-plugin
@@ -13,4 +13,3 @@ This module can be used stand-alone by building the jar file (mvn package)
 and then calling MakeConfig from that file:
 
 java -Dconfig.spec=<def-file_1,def-file_2,...> -Dconfig.dest=<dest-dir> -jar target/configgen.jar
-
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);
     }
 
     /**
-- 
cgit v1.2.3