Remove dead code only used by unit test

2 files changed, 1 insertions, 59 deletions

diff --git a/config/src/main/java/com/yahoo/vespa/config/ConfigDefinition.java b/config/src/main/java/com/yahoo/vespa/config/ConfigDefinition.java
index ba1040dbf36..f7abddb3dfe 100644
--- a/config/src/main/java/com/yahoo/vespa/config/ConfigDefinition.java
+++ b/config/src/main/java/com/yahoo/vespa/config/ConfigDefinition.java
@@ -5,7 +5,6 @@ import com.yahoo.yolean.Exceptions;
 
 import java.util.ArrayList;
 import java.util.Arrays;
-import java.util.Comparator;
 import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
@@ -150,34 +149,6 @@ public class ConfigDefinition {
     }
 
     /**
-     * Compares def-versions. Examples: 2 is higher than 1, and 2-0-0 is higher than 1-2-2 but the same as 2.
-     */
-    public static class VersionComparator implements Comparator<String> {
-        int[] parseVersion(String version) {
-            int[] result = {0, 0, 0};
-            String[] v = version.split("-");
-
-            for (int i = 0; i < 3; i++) {
-                if (v.length > i) result[i] = Integer.parseInt(v[i]);
-            }
-
-            return result;
-        }
-
-        public int compare(String o1, String o2) throws ClassCastException {
-            int[] version1 = parseVersion(o1);
-            int[] version2 = parseVersion(o2);
-
-            for (int i = 0; i < 3; i ++) {
-                int diff = version1[i] - version2[i];
-                if (diff != 0) return diff;
-            }
-
-            return 0;
-        }
-    }
-
-    /**
      * String based ("untyped") type specification used by parser and arrays. May have the name of the field which it describes.
      * The index number is used to export data in correct order.
      * @author vegardh
diff --git a/config/src/test/java/com/yahoo/vespa/config/ConfigDefinitionTest.java b/config/src/test/java/com/yahoo/vespa/config/ConfigDefinitionTest.java
index 62eb0095dd3..0a5828b484a 100755
--- a/config/src/test/java/com/yahoo/vespa/config/ConfigDefinitionTest.java
+++ b/config/src/test/java/com/yahoo/vespa/config/ConfigDefinitionTest.java
@@ -1,14 +1,10 @@
 // Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.vespa.config;
 
-import org.junit.Test;
-
 import com.yahoo.vespa.config.ConfigDefinition.EnumDef;
+import org.junit.Test;
 
 import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.Comparator;
 import java.util.List;
 
 import static org.junit.Assert.assertEquals;
@@ -22,31 +18,6 @@ import static org.junit.Assert.assertNull;
 public class ConfigDefinitionTest {
 
     @Test
-    public void testVersionComparator() {
-        Comparator<String> c = new ConfigDefinition.VersionComparator();
-
-        assertEquals(0, c.compare("1", "1"));
-        assertEquals(0, c.compare("1-0", "1"));
-        assertEquals(0, c.compare("1-0-0", "1"));
-        assertEquals(0, c.compare("1-0-0", "1-0"));
-        assertEquals(0, c.compare("0-1-1", "0-1-1"));
-        assertEquals(0, c.compare("0-1-0", "0-1"));
-        assertEquals(-1, c.compare("0", "1"));
-        assertEquals(-1, c.compare("0-1-0", "0-1-1"));
-        assertEquals(-1, c.compare("0-1-0", "1-1-1"));
-        assertEquals(-1, c.compare("0-0-1", "0-1"));
-        assertEquals(1, c.compare("0-1-1", "0-1-0"));
-        assertEquals(1, c.compare("1-1-1", "0-1-0"));
-        assertEquals(1, c.compare("0-1", "0-0-1"));
-        assertEquals(1, c.compare("1-1", "1"));
-
-        List<String> versions = Arrays.asList("25", "5", "1-1", "0-2-3", "1", "1-0");
-        Collections.sort(versions, new ConfigDefinition.VersionComparator());
-        List<String> solution = Arrays.asList("0-2-3", "1", "1-0", "1-1", "5", "25");
-        assertEquals(solution, versions);
-    }
-
-    @Test
     public void testIntDefaultValues() {
         ConfigDefinition def = new ConfigDefinition("foo", "namespace1");