Restore previous exception message

Author: knutwalker

core/src/main/java/org/neo4j/gds/core/loading/nodeproperties/NodePropertiesFromStoreBuilder.java

@@ -31,12 +31,6 @@
 import org.neo4j.gds.values.GdsNoValue;
 import org.neo4j.gds.values.GdsValue;
 import org.neo4j.gds.values.primitive.PrimitiveValues;
-import org.neo4j.values.storable.DoubleArray;
-import org.neo4j.values.storable.FloatArray;
-import org.neo4j.values.storable.FloatingPointValue;
-import org.neo4j.values.storable.IntegralValue;
-import org.neo4j.values.storable.LongArray;
-import org.neo4j.values.storable.Value;
 
 import java.util.concurrent.atomic.AtomicReference;
 
@@ -134,23 +128,4 @@ private InnerNodePropertiesBuilder newInnerBuilder(ValueType valueType) {
                 ));
         }
     }
-
-    private ValueType valueType(Value value) {
-        if (value instanceof IntegralValue) {
-            return ValueType.LONG;
-        } else if (value instanceof FloatingPointValue) {
-            return ValueType.DOUBLE;
-        } else if (value instanceof LongArray) {
-            return ValueType.LONG_ARRAY;
-        } else if (value instanceof DoubleArray) {
-            return ValueType.DOUBLE_ARRAY;
-        } else if (value instanceof FloatArray) {
-            return ValueType.FLOAT_ARRAY;
-        } else {
-            throw new UnsupportedOperationException(formatWithLocale(
-                "Loading of values of type %s is currently not supported",
-                value.getTypeName()
-            ));
-        }
-    }
 }

native-projection/src/main/java/org/neo4j/gds/projection/NativeNodePropertyImporter.java

@@ -39,6 +39,11 @@
 import org.neo4j.kernel.api.KernelTransaction;
 import org.neo4j.storageengine.api.PropertySelection;
 import org.neo4j.storageengine.api.Reference;
+import org.neo4j.values.storable.DoubleArray;
+import org.neo4j.values.storable.FloatArray;
+import org.neo4j.values.storable.FloatingPointValue;
+import org.neo4j.values.storable.IntegralValue;
+import org.neo4j.values.storable.LongArray;
 import org.neo4j.values.storable.Value;
 
 import java.util.ArrayList;
@@ -50,6 +55,7 @@
 import static java.util.stream.Collectors.toMap;
 import static org.neo4j.gds.core.GraphDimensions.ANY_LABEL;
 import static org.neo4j.gds.core.GraphDimensions.IGNORE;
+import static org.neo4j.gds.utils.StringFormatting.formatWithLocale;
 
 public final class NativeNodePropertyImporter {
 
@@ -143,6 +149,7 @@ private int setPropertyValue(
             Value value = propertyCursor.propertyValue();
 
             for (NodePropertiesFromStoreBuilder builder : builders) {
+                verifyValueType(value);
                 var gdsValue = GdsNeo4jValueConverter.toValue(value);
                 builder.set(neoNodeId, gdsValue);
                 propertiesImported++;
@@ -152,6 +159,21 @@ private int setPropertyValue(
         return propertiesImported;
     }
 
+    private void verifyValueType(Value value) {
+        if (!(
+            value instanceof IntegralValue ||
+                value instanceof FloatingPointValue ||
+                value instanceof LongArray ||
+                value instanceof DoubleArray ||
+                value instanceof FloatArray
+        )) {
+            throw new UnsupportedOperationException(formatWithLocale(
+                "Loading of values of type %s is currently not supported",
+                value.getTypeName()
+            ));
+        }
+    }
+
     public static final class Builder {
         private Concurrency concurrency = ConcurrencyConfig.TYPED_DEFAULT_CONCURRENCY;
         private Map<NodeLabel, PropertyMappings> propertyMappings;