From bd23103498e292dad0506caed99c7d496e2deba4 Mon Sep 17 00:00:00 2001
From: Jon Bratseth <bratseth@gmail.com>
Date: Fri, 3 Jun 2022 13:42:04 +0200
Subject: Remove on Vespa 8

---
 config-lib/abi-spec.json                                 | 6 ++----
 config-lib/src/main/java/com/yahoo/config/InnerNode.java | 5 ++---
 2 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/config-lib/abi-spec.json b/config-lib/abi-spec.json
index dd4cf995f64..acc4dbbda71 100644
--- a/config-lib/abi-spec.json
+++ b/config-lib/abi-spec.json
@@ -102,9 +102,7 @@
       "public static java.lang.String getDefName(java.lang.Class)",
       "public static java.lang.String getDefNamespace(java.lang.Class)",
       "public static java.util.List serialize(com.yahoo.config.InnerNode)",
-      "public static void serialize(com.yahoo.config.InnerNode, com.yahoo.config.Serializer)",
-      "public java.lang.String getConfigMd5()",
-      "public void setConfigMd5(java.lang.String)"
+      "public static void serialize(com.yahoo.config.InnerNode, com.yahoo.config.Serializer)"
     ],
     "fields": []
   },
@@ -202,7 +200,7 @@
       "public void postInitialize(java.lang.String)",
       "public boolean equals(java.lang.Object)",
       "public int hashCode()",
-      "protected java.util.Map getChildren()",
+      "protected final java.util.Map getChildren()",
       "protected java.util.Map getChildrenWithVectorsFlattened()",
       "protected static java.util.Map getAllDescendantLeafNodes(com.yahoo.config.InnerNode)"
     ],
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 597a734e6a3..3655f877a96 100644
--- a/config-lib/src/main/java/com/yahoo/config/InnerNode.java
+++ b/config-lib/src/main/java/com/yahoo/config/InnerNode.java
@@ -88,10 +88,9 @@ public abstract class InnerNode extends Node {
         return res;
      }
 
-    // TODO Make final before Vespa 8 as correct order is required
-    protected Map<String, Object> getChildren() {
+    protected final Map<String, Object> getChildren() {
         HashMap<String, Object> ret = new LinkedHashMap<>();
-        Field fields[] = getClass().getDeclaredFields();
+        Field[] fields = getClass().getDeclaredFields();
         for (Field field : fields) {
             field.setAccessible(true);
             Object fieldValue;
-- 
cgit v1.2.3