Cleanup, no functional changes

2 files changed, 5 insertions, 23 deletions

diff --git a/config/src/main/java/com/yahoo/vespa/config/util/ConfigUtils.java b/config/src/main/java/com/yahoo/vespa/config/util/ConfigUtils.java
index efad076d85c..ea92738cc26 100644
--- a/config/src/main/java/com/yahoo/vespa/config/util/ConfigUtils.java
+++ b/config/src/main/java/com/yahoo/vespa/config/util/ConfigUtils.java
@@ -33,7 +33,7 @@ import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
 /**
- * Utilities for mangling config text, finding md5sums, finding name and namespace in .def files etc.
+ * Utilities for mangling config text, finding checksums, finding name and namespace in .def files etc.
  */
 public class ConfigUtils {
 
@@ -46,11 +46,7 @@ public class ConfigUtils {
     private static final String doubleFormattedMax = new DecimalFormat("#.#").format(1e308);
     private static final String doubleFormattedMin = new DecimalFormat("#.#", new DecimalFormatSymbols(Locale.ENGLISH)).format(-1e308);
 
-    public static String getMd5(ConfigPayload payload) {
-        return getMd5(getByteBuffer(payload));
-    }
-
-  public static String getMd5(String input) {
+    public static String getMd5(String input) {
         return getMd5(ByteBuffer.wrap(input.getBytes(StandardCharsets.UTF_8)));
     }
 
@@ -58,7 +54,7 @@ public class ConfigUtils {
         return getMd5(input.wrap());
     }
 
-    public static String getMd5(ByteBuffer input) {
+    private static String getMd5(ByteBuffer input) {
         MessageDigest md5 = getMd5Instance();
         md5.update(input);
         return HexDump.toHexString(md5.digest()).toLowerCase();
@@ -81,6 +77,7 @@ public class ConfigUtils {
         return Long.toHexString(hasher.hash(input, 0)).toLowerCase();
     }
 
+    @SuppressWarnings("unused") // Used by config integration test in system-test module
     public static String getXxhash64(ConfigPayload payload) {
         return getXxhash64(getByteBuffer(payload));
     }
@@ -95,7 +92,6 @@ public class ConfigUtils {
         return ByteBuffer.wrap(baos.toByteArray());
     }
 
-
     /**
      * Replaces sequences of spaces with 1 space, unless inside quotes. Public for testing;
      *
@@ -378,4 +374,5 @@ public class ConfigUtils {
     public static boolean isGenerationNewer(long newGen, long oldGen) {
         return (oldGen < newGen) || (newGen == 0);
     }
+
 }
diff --git a/config/src/test/java/com/yahoo/vespa/config/util/ConfigUtilsTest.java b/config/src/test/java/com/yahoo/vespa/config/util/ConfigUtilsTest.java
index 2d63c125706..f22016ca3e6 100644
--- a/config/src/test/java/com/yahoo/vespa/config/util/ConfigUtilsTest.java
+++ b/config/src/test/java/com/yahoo/vespa/config/util/ConfigUtilsTest.java
@@ -88,21 +88,6 @@ public class ConfigUtilsTest {
     }
 
     @Test
-    public void testGetMd5OfPayload() {
-        String expectedMd5 = "c9246ed8c8ab55b1c463c501c84075e6";
-        String expectedXxhash64 = "b89f402d53626490";
-        String expectedChangedMd5 = "f6f81062ef5f024f1912798490ba7dfc";
-        String expectedChangedXxhash64 = "e8c361d384889610";
-
-        ConfigPayload payload = ConfigPayload.fromInstance(new SimpletypesConfig(new SimpletypesConfig.Builder()));
-        assertEquals(expectedMd5, ConfigUtils.getMd5(payload));
-        assertEquals(expectedXxhash64, ConfigUtils.getXxhash64(payload));
-        payload.getSlime().get().setString("fabio", "bar");
-        assertEquals(expectedChangedMd5, ConfigUtils.getMd5(payload));
-        assertEquals(expectedChangedXxhash64, ConfigUtils.getXxhash64(payload));
-    }
-
-    @Test
     public void testGetMd5OfString() {
         String expectedMd5 = "c9246ed8c8ab55b1c463c501c84075e6";
         String expectedXxhash64 = "b89f402d53626490";