compareTo should live in base class

neo4j · Nov 2, 2017 · 24f8667 · 24f8667
1 parent bde38ab
commit 24f8667
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 24 deletions.
diff --git a/community/values/src/main/java/org/neo4j/values/storable/StringValue.java b/community/values/src/main/java/org/neo4j/values/storable/StringValue.java
@@ -79,6 +79,29 @@ public String prettyPrint()
         return format( "'%s'", value() );
     }
 
+    @Override
+    public int compareTo( TextValue other )
+    {
+        String thisString = value();
+        String thatString = other.stringValue();
+        int len1 = thisString.length();
+        int len2 = thatString.length();
+        int lim = Math.min( len1, len2 );
+
+        int k = 0;
+        while ( k < lim )
+        {
+            int c1 = thisString.codePointAt( k );
+            int c2 = thatString.codePointAt( k );
+            if ( c1 != c2 )
+            {
+                return c1 - c2;
+            }
+            k += Character.charCount( c1 );
+        }
+        return length() - other.length();
+    }
+
     static TextValue EMTPY = new StringValue()
     {
         @Override

diff --git a/community/values/src/main/java/org/neo4j/values/storable/StringWrappingStringValue.java b/community/values/src/main/java/org/neo4j/values/storable/StringWrappingStringValue.java
@@ -62,29 +62,6 @@ public int computeHash()
         return h;
     }
 
-    @Override
-    public int compareTo( TextValue other )
-    {
-        String thisString = value;
-        String thatString = other.stringValue();
-        int len1 = thisString.length();
-        int len2 = thatString.length();
-        int lim = Math.min( len1, len2 );
-
-        int k = 0;
-        while ( k < lim )
-        {
-            int c1 = thisString.codePointAt( k );
-            int c2 = thatString.codePointAt( k );
-            if ( c1 != c2 )
-            {
-                return c1 - c2;
-            }
-            k += Character.charCount( c1 );
-        }
-        return length() - other.length();
-    }
-
     @Override
     public TextValue substring( int start, int length )
     {

diff --git a/community/values/src/main/java/org/neo4j/values/storable/UTF8StringValue.java b/community/values/src/main/java/org/neo4j/values/storable/UTF8StringValue.java
@@ -261,7 +261,7 @@ public int compareTo( TextValue other )
     {
         if ( !(other instanceof UTF8StringValue) )
         {
-            return -other.compareTo( this );
+            return super.compareTo( other );
         }
         UTF8StringValue otherUTF8 = (UTF8StringValue) other;
         int len1 = bytes.length;