Use default implementation of value mapper to reduce the number of methods needed to implement

Co-Authored-By: Florentin Dörre <florentin.dorre@neotechnology.com>
Co-Authored-By: Christina Eiba <christina.eiba@neo4j.com>

Author: 3 people

cypher-aggregation/src/main/java/org/neo4j/gds/projection/CypherAggregation.java

@@ -68,14 +68,8 @@
 import org.neo4j.values.AnyValue;
 import org.neo4j.values.SequenceValue;
 import org.neo4j.values.storable.BooleanValue;
-import org.neo4j.values.storable.ByteValue;
-import org.neo4j.values.storable.IntValue;
 import org.neo4j.values.storable.IntegralValue;
-import org.neo4j.values.storable.LongValue;
 import org.neo4j.values.storable.NoValue;
-import org.neo4j.values.storable.ShortValue;
-import org.neo4j.values.storable.StringArray;
-import org.neo4j.values.storable.StringValue;
 import org.neo4j.values.storable.TextArray;
 import org.neo4j.values.storable.TextValue;
 import org.neo4j.values.virtual.MapValue;
@@ -857,6 +851,15 @@ public NodeLabelToken unsupported(AnyValue value) {
             return NodeLabelTokens.invalid();
         }
 
+        @Override
+        public NodeLabelToken mapSequence(SequenceValue value) {
+            if (value.isEmpty()) {
+                return NodeLabelTokens.empty();
+            }
+
+            return NodeLabelTokens.of(value);
+        }
+
         @Override
         public NodeLabelToken mapNoValue() {
             return NodeLabelTokens.missing();
@@ -877,29 +880,10 @@ public NodeLabelToken mapText(TextValue value) {
             return NodeLabelTokens.of(value);
         }
 
-        @Override
-        public NodeLabelToken mapString(StringValue value) {
-            return mapText(value);
-        }
-
-        @Override
-        public NodeLabelToken mapSequence(SequenceValue value) {
-            if (value.isEmpty()) {
-                return NodeLabelTokens.empty();
-            }
-
-            return NodeLabelTokens.of(value);
-        }
-
         @Override
         public NodeLabelToken mapTextArray(TextArray value) {
             return NodeLabelTokens.of(value);
         }
-
-        @Override
-        public NodeLabelToken mapStringArray(StringArray value) {
-            return mapTextArray(value);
-        }
     }
 
     private enum ExtractNodeId implements PartialValueMapper<Long> {
@@ -910,38 +894,18 @@ public Long unsupported(AnyValue value) {
             throw invalidNodeType(value.getTypeName());
         }
 
-        @Override
-        public Long mapNode(VirtualNodeValue value) {
-            return value.id();
-        }
-
         @Override
         public Long mapSequence(SequenceValue value) {
             throw invalidNodeType("List");
         }
 
         @Override
-        public Long mapIntegral(IntegralValue value) {
-            return value.longValue();
-        }
-
-        @Override
-        public Long mapByte(ByteValue value) {
-            return value.longValue();
-        }
-
-        @Override
-        public Long mapShort(ShortValue value) {
-            return value.longValue();
-        }
-
-        @Override
-        public Long mapInt(IntValue value) {
-            return value.longValue();
+        public Long mapNode(VirtualNodeValue value) {
+            return value.id();
         }
 
         @Override
-        public Long mapLong(LongValue value) {
+        public Long mapIntegral(IntegralValue value) {
             return value.longValue();
         }
 

cypher-aggregation/src/main/java/org/neo4j/gds/projection/PartialValueMapper.java

@@ -22,46 +22,16 @@
 import org.neo4j.values.AnyValue;
 import org.neo4j.values.SequenceValue;
 import org.neo4j.values.ValueMapper;
-import org.neo4j.values.storable.BooleanArray;
 import org.neo4j.values.storable.BooleanValue;
-import org.neo4j.values.storable.ByteArray;
-import org.neo4j.values.storable.ByteValue;
-import org.neo4j.values.storable.CharArray;
-import org.neo4j.values.storable.CharValue;
-import org.neo4j.values.storable.DateArray;
-import org.neo4j.values.storable.DateTimeArray;
 import org.neo4j.values.storable.DateTimeValue;
 import org.neo4j.values.storable.DateValue;
-import org.neo4j.values.storable.DoubleArray;
-import org.neo4j.values.storable.DoubleValue;
-import org.neo4j.values.storable.DurationArray;
 import org.neo4j.values.storable.DurationValue;
-import org.neo4j.values.storable.FloatArray;
-import org.neo4j.values.storable.FloatValue;
-import org.neo4j.values.storable.FloatingPointArray;
-import org.neo4j.values.storable.FloatingPointValue;
-import org.neo4j.values.storable.IntArray;
-import org.neo4j.values.storable.IntValue;
-import org.neo4j.values.storable.IntegralArray;
-import org.neo4j.values.storable.IntegralValue;
-import org.neo4j.values.storable.LocalDateTimeArray;
 import org.neo4j.values.storable.LocalDateTimeValue;
-import org.neo4j.values.storable.LocalTimeArray;
 import org.neo4j.values.storable.LocalTimeValue;
-import org.neo4j.values.storable.LongArray;
-import org.neo4j.values.storable.LongValue;
 import org.neo4j.values.storable.NoValue;
-import org.neo4j.values.storable.NumberArray;
 import org.neo4j.values.storable.NumberValue;
-import org.neo4j.values.storable.PointArray;
 import org.neo4j.values.storable.PointValue;
-import org.neo4j.values.storable.ShortArray;
-import org.neo4j.values.storable.ShortValue;
-import org.neo4j.values.storable.StringArray;
-import org.neo4j.values.storable.StringValue;
-import org.neo4j.values.storable.TextArray;
 import org.neo4j.values.storable.TextValue;
-import org.neo4j.values.storable.TimeArray;
 import org.neo4j.values.storable.TimeValue;
 import org.neo4j.values.virtual.MapValue;
 import org.neo4j.values.virtual.VirtualNodeValue;
@@ -71,6 +41,9 @@
 interface PartialValueMapper<R> extends ValueMapper<R> {
     R unsupported(AnyValue value);
 
+    @Override
+    R mapSequence(SequenceValue value);
+
     @Override
     default R mapPath(VirtualPathValue value) {
         return unsupported(value);
@@ -96,9 +69,6 @@ default R mapNoValue() {
         return unsupported(NoValue.NO_VALUE);
     }
 
-    @Override
-    R mapSequence(SequenceValue value);
-
     @Override
     default R mapText(TextValue value) {
         return unsupported(value);
@@ -148,154 +118,4 @@ default R mapDuration(DurationValue value) {
     default R mapPoint(PointValue value) {
         return unsupported(value);
     }
-
-    @Override
-    default R mapString(StringValue value) {
-        return unsupported(value);
-    }
-
-    @Override
-    default R mapTextArray(TextArray value) {
-        return unsupported(value);
-    }
-
-    @Override
-    default R mapStringArray(StringArray value) {
-        return unsupported(value);
-    }
-
-    @Override
-    default R mapChar(CharValue value) {
-        return unsupported(value);
-    }
-
-    @Override
-    default R mapCharArray(CharArray value) {
-        return unsupported(value);
-    }
-
-    @Override
-    default R mapBooleanArray(BooleanArray value) {
-        return unsupported(value);
-    }
-
-    @Override
-    default R mapNumberArray(NumberArray value) {
-        return unsupported(value);
-    }
-
-    @Override
-    default R mapIntegral(IntegralValue value) {
-        return unsupported(value);
-    }
-
-    @Override
-    default R mapIntegralArray(IntegralArray value) {
-        return unsupported(value);
-    }
-
-    @Override
-    default R mapByte(ByteValue value) {
-        return unsupported(value);
-    }
-
-    @Override
-    default R mapByteArray(ByteArray value) {
-        return unsupported(value);
-    }
-
-    @Override
-    default R mapShort(ShortValue value) {
-        return unsupported(value);
-    }
-
-    @Override
-    default R mapShortArray(ShortArray value) {
-        return unsupported(value);
-    }
-
-    @Override
-    default R mapInt(IntValue value) {
-        return unsupported(value);
-    }
-
-    @Override
-    default R mapIntArray(IntArray value) {
-        return unsupported(value);
-    }
-
-    @Override
-    default R mapLong(LongValue value) {
-        return unsupported(value);
-    }
-
-    @Override
-    default R mapLongArray(LongArray value) {
-        return unsupported(value);
-    }
-
-    @Override
-    default R mapFloatingPoint(FloatingPointValue value) {
-        return unsupported(value);
-    }
-
-    @Override
-    default R mapFloatingPointArray(FloatingPointArray value) {
-        return unsupported(value);
-    }
-
-    @Override
-    default R mapDouble(DoubleValue value) {
-        return unsupported(value);
-    }
-
-    @Override
-    default R mapDoubleArray(DoubleArray value) {
-        return unsupported(value);
-    }
-
-    @Override
-    default R mapFloat(FloatValue value) {
-        return unsupported(value);
-    }
-
-    @Override
-    default R mapFloatArray(FloatArray value) {
-        return unsupported(value);
-    }
-
-    @Override
-    default R mapPointArray(PointArray value) {
-        return unsupported(value);
-    }
-
-    @Override
-    default R mapDateTimeArray(DateTimeArray value) {
-        return unsupported(value);
-    }
-
-    @Override
-    default R mapLocalDateTimeArray(LocalDateTimeArray value) {
-        return unsupported(value);
-    }
-
-    @Override
-    default R mapLocalTimeArray(LocalTimeArray value) {
-        return unsupported(value);
-    }
-
-    @Override
-    default R mapTimeArray(TimeArray value) {
-        return unsupported(value);
-    }
-
-    @Override
-    default R mapDateArray(DateArray value) {
-        return unsupported(value);
-    }
-
-    @Override
-    default R mapDurationArray(DurationArray value) {
-        return unsupported(value);
-    }
 }

cypher-aggregation/src/main/java/org/neo4j/gds/projection/ValueMapWrapper.java

@@ -26,7 +26,7 @@
 import org.neo4j.values.storable.BooleanValue;
 import org.neo4j.values.storable.FloatingPointValue;
 import org.neo4j.values.storable.IntegralValue;
-import org.neo4j.values.storable.StringArray;
+import org.neo4j.values.storable.TextArray;
 import org.neo4j.values.storable.TextValue;
 import org.neo4j.values.storable.Value;
 import org.neo4j.values.virtual.MapValue;
@@ -151,11 +151,11 @@ public T mapText(TextValue value) {
         }
 
         @Override
-        public T mapStringArray(StringArray value) {
+        public T mapTextArray(TextArray value) {
             if (List.class.isAssignableFrom(expectedType)) {
                 return expectedType.cast(List.of(value.asObject()));
             }
-            return PartialValueMapper.super.mapStringArray(value);
+            return PartialValueMapper.super.mapTextArray(value);
         }
 
         @Override