ArcadeData#3991 fix(cypher): valueType() missing NOT NULL suffix for non-null values (ArcadeData#3995)

Author: robfrank

engine/src/main/java/com/arcadedb/function/convert/ValueTypeFunction.java

@@ -43,25 +43,22 @@ public String getName() {
   public Object execute(final Object[] args, final CommandContext context) {
     if (args.length != 1)
       throw new CommandExecutionException("valueType() requires exactly one argument");
-    if (args[0] == null)
-      return "NULL";
     final Object value = args[0];
-    if (value instanceof Long || value instanceof Integer || value instanceof Short || value instanceof Byte)
-      return "INTEGER";
-    if (value instanceof Double || value instanceof Float)
-      return "FLOAT";
-    if (value instanceof String)
-      return "STRING";
-    if (value instanceof Boolean)
-      return "BOOLEAN";
-    if (value instanceof Vertex)
-      return "NODE";
-    if (value instanceof Edge)
-      return "RELATIONSHIP";
-    if (value instanceof List)
-      return "LIST<ANY>";
-    if (value instanceof Map)
-      return "MAP";
-    return value.getClass().getSimpleName().toUpperCase();
+    return switch (value) {
+      case null -> "NULL";
+      case Long l -> "INTEGER NOT NULL";
+      case Integer i -> "INTEGER NOT NULL";
+      case Short s -> "INTEGER NOT NULL";
+      case Byte b -> "INTEGER NOT NULL";
+      case Double d -> "FLOAT NOT NULL";
+      case Float f -> "FLOAT NOT NULL";
+      case String s -> "STRING NOT NULL";
+      case Boolean b -> "BOOLEAN NOT NULL";
+      case Vertex vertex -> "NODE NOT NULL";
+      case Edge edge -> "RELATIONSHIP NOT NULL";
+      case List list -> "LIST<ANY> NOT NULL";
+      case Map map -> "MAP NOT NULL";
+      default -> value.getClass().getSimpleName().toUpperCase() + " NOT NULL";
+    };
   }
 }

engine/src/test/java/com/arcadedb/query/opencypher/OpenCypherMissingFunctionsTest.java

@@ -373,31 +373,31 @@ void nullIfNotEqual() {
   void valueTypeInteger() {
     try (final ResultSet rs = database.command("opencypher", "RETURN valueType(42) AS val")) {
       assertThat(rs.hasNext()).isTrue();
-      assertThat(rs.next().<String>getProperty("val")).isEqualTo("INTEGER");
+      assertThat(rs.next().<String>getProperty("val")).isEqualTo("INTEGER NOT NULL");
     }
   }
 
   @Test
   void valueTypeFloat() {
     try (final ResultSet rs = database.command("opencypher", "RETURN valueType(3.14) AS val")) {
       assertThat(rs.hasNext()).isTrue();
-      assertThat(rs.next().<String>getProperty("val")).isEqualTo("FLOAT");
+      assertThat(rs.next().<String>getProperty("val")).isEqualTo("FLOAT NOT NULL");
     }
   }
 
   @Test
   void valueTypeString() {
     try (final ResultSet rs = database.command("opencypher", "RETURN valueType('hello') AS val")) {
       assertThat(rs.hasNext()).isTrue();
-      assertThat(rs.next().<String>getProperty("val")).isEqualTo("STRING");
+      assertThat(rs.next().<String>getProperty("val")).isEqualTo("STRING NOT NULL");
     }
   }
 
   @Test
   void valueTypeBoolean() {
     try (final ResultSet rs = database.command("opencypher", "RETURN valueType(true) AS val")) {
       assertThat(rs.hasNext()).isTrue();
-      assertThat(rs.next().<String>getProperty("val")).isEqualTo("BOOLEAN");
+      assertThat(rs.next().<String>getProperty("val")).isEqualTo("BOOLEAN NOT NULL");
     }
   }
 
@@ -413,7 +413,20 @@ void valueTypeNull() {
   void valueTypeList() {
     try (final ResultSet rs = database.command("opencypher", "RETURN valueType([1,2,3]) AS val")) {
       assertThat(rs.hasNext()).isTrue();
-      assertThat(rs.next().<String>getProperty("val")).isEqualTo("LIST<ANY>");
+      assertThat(rs.next().<String>getProperty("val")).isEqualTo("LIST<ANY> NOT NULL");
+    }
+  }
+
+  @Test
+  void valueTypeNotNullSuffixForAllLiterals() {
+    // Regression test for https://github.com/ArcadeData/arcadedb/issues/3991
+    try (final ResultSet rs = database.command("opencypher",
+        "RETURN valueType('abc') as t1, valueType(1) as t2, valueType(true) as t3")) {
+      assertThat(rs.hasNext()).isTrue();
+      final Result row = rs.next();
+      assertThat(row.<String>getProperty("t1")).isEqualTo("STRING NOT NULL");
+      assertThat(row.<String>getProperty("t2")).isEqualTo("INTEGER NOT NULL");
+      assertThat(row.<String>getProperty("t3")).isEqualTo("BOOLEAN NOT NULL");
     }
   }