fix(server): close upgrade review gaps

- remove unsafe typed GraphSON V1 from shipped configs
- preserve mixed edge ID membership and count semantics
- encode public enums and SchemaManager with standard wire values
- share compatible Cypher factories across imports and replay
- align Jackson modules and release dependency notices

Author: imbajin

docs/upgrade-tinkerpop-3.8.md

@@ -32,16 +32,15 @@ serializer:
 
 GraphBinary preserves graph elements and UUID IDs for Java Driver accessors such
 as `Result.getVertex()` and `Result.get(UUID.class)`. Untyped GraphSON V1 decodes
-these results as maps and strings, and typed GraphSON V1 still decodes graph
-elements as maps.
+these results as maps and strings.
 
 `remote-objects.yaml` serves the Cypher HTTP JSON path and continues to use
 `org.apache.tinkerpop.gremlin.util.ser.GraphSONUntypedMessageSerializerV1` with
 `HugeGraphIoRegistry`. It retains its duplicate registry entry as a TinkerPop
 driver compatibility workaround.
 
 For the server, keep the GraphBinary builder and registry. The serializer order
-is GraphBinary, untyped GraphSON V1/V2/V3, then typed GraphSON V1/V2/V3. The
+is GraphBinary, untyped GraphSON V1/V2/V3, then typed GraphSON V2/V3. The
 GraphSON entries keep the HugeGraph registry. The first entries look like this:
 
 ```yaml
@@ -63,7 +62,8 @@ The full ordering is in `gremlin-server.yaml`; the config test checks that
 
 Typed GraphSON is available for the supported simple values and IDs, not as a
 replacement for untyped serialization of every HugeGraph schema or graph
-object. GraphSON V1 uses legacy `@class` metadata; V2/V3 use `@type`/`@value`.
+object. Typed V1 is not registered: its legacy `@class` deserialization can
+construct Java objects before request authentication. V2/V3 use `@type`/`@value`.
 
 GraphBinary uses `HugeGraphTypeSerializerRegistryBuilder` to write HugeGraph IDs
 as their underlying values. Schema results use standard maps and Blob values use
@@ -78,6 +78,15 @@ registry limited to untyped V1 messages. Standard graph-file IO and typed
 GraphSON serializers keep `HugeGraphIoRegistry` alone and use the TinkerPop
 Tree format for their negotiated version.
 
+HugeGraph enums such as `DataType.TEXT` and `Directions.OUT` return their names
+over GraphBinary, including in maps and lists. `graph.schema()` returns a map
+with `propertykeys`, `vertexlabels`, `edgelabels` and `indexlabels` lists, using
+the same schema conversion. TinkerPop enums retain their native wire types.
+
+Local edge ID filters accept both serialized strings and native edge IDs in
+mixed collections: `hasId(not(without(ids)))` and `hasId(within(ids))` agree on
+membership and count. Numeric and string vertex IDs keep their distinct types.
+
 Groovy interpolated strings (`GString`, including subclasses) return as standard
 strings over GraphBinary, including inside lists and maps. For example,
 `def value = 42; "r3-value:${value}"` returns `"r3-value:42"`. The untyped GraphSON
@@ -87,6 +96,9 @@ Cypher extension predicates use the current TinkerPop predicate constructor
 through the existing translator extension point. Computed-expression regex
 filters retain whole-string matching (`String.matches`), so `"marko"` matches
 `"mar.*"` and does not match `"ark"`.
+The public `cypherRegex`, `cypherIsString`, `cypherIsNode` and `cypherIsRelationship`
+factories imported by the bundled Gremlin configuration use that same adapter,
+so the Gremlin translation returned by `EXPLAIN` can be replayed.
 
 Cypher results normalize HugeGraph IDs, including
 values nested in collections, maps and paths. Cyclic results and nesting deeper
@@ -98,6 +110,10 @@ TinkerPop 3.5.1 to 3.8.1 upgrade interval before deploying.
 
 ## YAML configuration safety
 
+Jackson JSON and YAML modules share the root BOM version. Fabric8 kubeconfig
+extensions can contain integer and decimal values; the K8s configuration
+regression verifies auto-configuration without contacting a cluster.
+
 This TinkerPop 3.8.1 upgrade uses SnakeYAML 2.2, Spring Boot 2.5.15 and
 Spring Framework 5.3.27. The Boot patch keeps PD and Store's YAML startup
 loader compatible with SnakeYAML 2.x. These versions belong to the upgraded

hugegraph-commons/hugegraph-common/pom.xml

@@ -164,22 +164,18 @@
         <dependency>
             <groupId>com.fasterxml.jackson.core</groupId>
             <artifactId>jackson-annotations</artifactId>
-            <version>${jackson.version}</version>
         </dependency>
         <dependency>
             <groupId>com.fasterxml.jackson.core</groupId>
             <artifactId>jackson-core</artifactId>
-            <version>${jackson.version}</version>
         </dependency>
         <dependency>
             <groupId>com.fasterxml.jackson.core</groupId>
             <artifactId>jackson-databind</artifactId>
-            <version>${jackson.version}</version>
         </dependency>
         <dependency>
             <groupId>com.fasterxml.jackson.module</groupId>
             <artifactId>jackson-module-jaxb-annotations</artifactId>
-            <version>${jackson.version}</version>
             <exclusions>
                 <exclusion>
                     <artifactId>jakarta.xml.bind-api</artifactId>
@@ -190,12 +186,10 @@
         <dependency>
             <groupId>com.fasterxml.jackson.jaxrs</groupId>
             <artifactId>jackson-jaxrs-base</artifactId>
-            <version>${jackson.version}</version>
         </dependency>
         <dependency>
             <groupId>com.fasterxml.jackson.jaxrs</groupId>
             <artifactId>jackson-jaxrs-json-provider</artifactId>
-            <version>${jackson.version}</version>
         </dependency>
 
         <dependency>

hugegraph-commons/pom.xml

@@ -109,7 +109,6 @@
         <javassist.version>3.28.0-GA</javassist.version>
         <jersey.version>3.0.3</jersey.version>
         <jersey.hk2.version>3.0.3</jersey.hk2.version>
-        <jackson.version>2.14.0-rc1</jackson.version>
         <junit.version>4.13.1</junit.version>
         <mockito.version>4.1.0</mockito.version>
         <jakarta.xml.version>4.0.0-RC2</jakarta.xml.version>

hugegraph-pd/hg-pd-cli/pom.xml

@@ -31,7 +31,6 @@
     <artifactId>hg-pd-cli</artifactId>
 
     <properties>
-        <jackson.version>2.15.2</jackson.version>
     </properties>
 
     <dependencies>
@@ -84,32 +83,26 @@
         <dependency>
             <groupId>com.fasterxml.jackson.core</groupId>
             <artifactId>jackson-annotations</artifactId>
-            <version>${jackson.version}</version>
         </dependency>
         <dependency>
             <groupId>com.fasterxml.jackson.core</groupId>
             <artifactId>jackson-core</artifactId>
-            <version>${jackson.version}</version>
         </dependency>
         <dependency>
             <groupId>com.fasterxml.jackson.core</groupId>
             <artifactId>jackson-databind</artifactId>
-            <version>${jackson.version}</version>
         </dependency>
         <dependency>
             <groupId>com.fasterxml.jackson.module</groupId>
             <artifactId>jackson-module-jaxb-annotations</artifactId>
-            <version>${jackson.version}</version>
         </dependency>
         <dependency>
             <groupId>com.fasterxml.jackson.jaxrs</groupId>
             <artifactId>jackson-jaxrs-base</artifactId>
-            <version>${jackson.version}</version>
         </dependency>
         <dependency>
             <groupId>com.fasterxml.jackson.jaxrs</groupId>
             <artifactId>jackson-jaxrs-json-provider</artifactId>
-            <version>${jackson.version}</version>
         </dependency>
         <dependency>
             <groupId>org.apache.hugegraph</groupId>

hugegraph-pd/hg-pd-test/pom.xml

@@ -138,17 +138,14 @@
         <dependency>
             <groupId>com.fasterxml.jackson.core</groupId>
             <artifactId>jackson-databind</artifactId>
-            <version>2.13.0</version>
         </dependency>
         <dependency>
             <groupId>com.fasterxml.jackson.core</groupId>
             <artifactId>jackson-core</artifactId>
-            <version>2.13.0</version>
         </dependency>
         <dependency>
             <groupId>com.fasterxml.jackson.core</groupId>
             <artifactId>jackson-annotations</artifactId>
-            <version>2.13.0</version>
         </dependency>
 
         <dependency>

hugegraph-server/hugegraph-api/src/main/java/org/apache/hugegraph/opencypher/CypherGremlinPredicates.java

@@ -30,21 +30,37 @@ public final class CypherGremlinPredicates extends TraversalGremlinPredicates {
 
     @Override
     public P<Object> regexMatch(Object value) {
-        return predicate(CustomPredicate.cypherRegex, value);
+        return cypherRegex(value);
     }
 
     @Override
     public P<Object> isNode() {
-        return predicate(CustomPredicate.cypherIsNode, null);
+        return cypherIsNode();
     }
 
     @Override
     public P<Object> isRelationship() {
-        return predicate(CustomPredicate.cypherIsRelationship, null);
+        return cypherIsRelationship();
     }
 
     @Override
     public P<Object> isString() {
+        return cypherIsString();
+    }
+
+    public static P<Object> cypherRegex(Object value) {
+        return predicate(CustomPredicate.cypherRegex, value);
+    }
+
+    public static P<Object> cypherIsNode() {
+        return predicate(CustomPredicate.cypherIsNode, null);
+    }
+
+    public static P<Object> cypherIsRelationship() {
+        return predicate(CustomPredicate.cypherIsRelationship, null);
+    }
+
+    public static P<Object> cypherIsString() {
         return predicate(CustomPredicate.cypherIsString, null);
     }
 

hugegraph-server/hugegraph-api/src/main/java/org/apache/hugegraph/opencypher/CypherPlugin.java

@@ -40,15 +40,14 @@
 import org.apache.tinkerpop.gremlin.jsr223.GremlinPlugin;
 import org.apache.tinkerpop.gremlin.jsr223.ImportCustomizer;
 import org.opencypher.gremlin.traversal.CustomFunctions;
-import org.opencypher.gremlin.traversal.CustomPredicate;
 
 public class CypherPlugin implements GremlinPlugin {
 
     private static final ImportCustomizer IMPORTS =
             DefaultImportCustomizer.build()
-                                   .addClassImports(CustomPredicate.class)
+                                   .addClassImports(CypherGremlinPredicates.class)
                                    .addMethodImports(
-                                           getDeclaredPublicMethods(CustomPredicate.class))
+                                           getDeclaredPublicMethods(CypherGremlinPredicates.class))
                                    .addClassImports(CustomFunctions.class)
                                    .addMethodImports(
                                            getDeclaredPublicMethods(CustomFunctions.class))
@@ -57,7 +56,8 @@ public class CypherPlugin implements GremlinPlugin {
     private static List<Method> getDeclaredPublicMethods(Class<?> klass) {
         Method[] declaredMethods = klass.getDeclaredMethods();
         return Stream.of(declaredMethods)
-                     .filter(method -> Modifier.isPublic(method.getModifiers()))
+                     .filter(method -> Modifier.isPublic(method.getModifiers()) &&
+                                       Modifier.isStatic(method.getModifiers()))
                      .collect(Collectors.toList());
     }
 

hugegraph-server/hugegraph-core/pom.xml

@@ -49,17 +49,14 @@
         <dependency>
             <groupId>com.fasterxml.jackson.core</groupId>
             <artifactId>jackson-databind</artifactId>
-            <version>2.13.2</version>
         </dependency>
         <dependency>
             <groupId>com.fasterxml.jackson.core</groupId>
             <artifactId>jackson-core</artifactId>
-            <version>2.13.2</version>
         </dependency>
         <dependency>
             <groupId>com.fasterxml.jackson.core</groupId>
             <artifactId>jackson-annotations</artifactId>
-            <version>2.15.2</version>
         </dependency>
         <dependency>
             <groupId>io.fabric8</groupId>

hugegraph-server/hugegraph-core/src/main/java/org/apache/hugegraph/io/HugeGraphTypeSerializerRegistryBuilder.java

@@ -33,6 +33,7 @@
 import org.apache.hugegraph.schema.IndexLabel;
 import org.apache.hugegraph.schema.PropertyKey;
 import org.apache.hugegraph.schema.SchemaElement;
+import org.apache.hugegraph.schema.SchemaManager;
 import org.apache.hugegraph.schema.VertexLabel;
 import org.apache.hugegraph.type.define.HugeKeys;
 import org.apache.hugegraph.util.Blob;
@@ -55,6 +56,10 @@ public final class HugeGraphTypeSerializerRegistryBuilder
             new WireTransformSerializer<>(blob -> ByteBuffer.wrap(blob.bytes()));
     private static final TypeSerializer<SchemaElement> SCHEMA_TRANSFORM_SERIALIZER =
             new WireTransformSerializer<>(HugeGraphTypeSerializerRegistryBuilder::schemaMap);
+    private static final TypeSerializer<SchemaManager> SCHEMA_MANAGER_TRANSFORM_SERIALIZER =
+            new WireTransformSerializer<>(HugeGraphTypeSerializerRegistryBuilder::schemaManagerMap);
+    private static final TypeSerializer<Enum<?>> ENUM_TRANSFORM_SERIALIZER =
+            new WireTransformSerializer<>(Enum::name);
 
     private static final TypeSerializer<Optional<?>> OPTIONAL_TRANSFORM_SERIALIZER =
             new WireTransformSerializer<>(optional -> optional.orElse(null));
@@ -75,6 +80,12 @@ public HugeGraphTypeSerializerRegistryBuilder() {
             if (SchemaElement.class.isAssignableFrom(type)) {
                 return SCHEMA_TRANSFORM_SERIALIZER;
             }
+            if (SchemaManager.class.isAssignableFrom(type)) {
+                return SCHEMA_MANAGER_TRANSFORM_SERIALIZER;
+            }
+            if (isHugeGraphEnum(type)) {
+                return ENUM_TRANSFORM_SERIALIZER;
+            }
             if (Optional.class.isAssignableFrom(type)) {
                 return OPTIONAL_TRANSFORM_SERIALIZER;
             }
@@ -88,6 +99,21 @@ public HugeGraphTypeSerializerRegistryBuilder() {
         });
     }
 
+    private static boolean isHugeGraphEnum(Class<?> type) {
+        // Scope the fallback to HugeGraph; native TinkerPop enums keep their serializers.
+        return Enum.class.isAssignableFrom(type) &&
+               type.getName().startsWith("org.apache.hugegraph.");
+    }
+
+    private static Map<String, Object> schemaManagerMap(SchemaManager schema) {
+        Map<String, Object> result = new LinkedHashMap<>();
+        result.put("propertykeys", schemaValue(schema.getPropertyKeys()));
+        result.put("vertexlabels", schemaValue(schema.getVertexLabels()));
+        result.put("edgelabels", schemaValue(schema.getEdgeLabels()));
+        result.put("indexlabels", schemaValue(schema.getIndexLabels()));
+        return result;
+    }
+
     private static Map<String, Object> schemaMap(SchemaElement schema) {
         // Use the same field names and values as the existing GraphSON schema API.
         GraphSONSchemaSerializer serializer = new GraphSONSchemaSerializer();
@@ -109,9 +135,15 @@ private static Map<String, Object> schemaMap(SchemaElement schema) {
     }
 
     private static Object schemaValue(Object value) {
-        if (value instanceof Enum) {
+        if (value instanceof Enum && isHugeGraphEnum(value.getClass())) {
             return ((Enum<?>) value).name();
         }
+        if (value instanceof SchemaElement) {
+            return schemaMap((SchemaElement) value);
+        }
+        if (value instanceof SchemaManager) {
+            return schemaManagerMap((SchemaManager) value);
+        }
         if (value instanceof Map) {
             Map<Object, Object> result = new LinkedHashMap<>();
             ((Map<?, ?>) value).forEach((key, item) -> result.put(schemaValue(key), schemaValue(item)));

hugegraph-server/hugegraph-core/src/main/java/org/apache/hugegraph/traversal/optimize/TraversalUtil.java

@@ -32,6 +32,7 @@
 import org.apache.hugegraph.HugeException;
 import org.apache.hugegraph.HugeGraph;
 import org.apache.hugegraph.backend.BackendException;
+import org.apache.hugegraph.backend.id.EdgeId;
 import org.apache.hugegraph.backend.id.Id;
 import org.apache.hugegraph.backend.id.IdGenerator;
 import org.apache.hugegraph.backend.page.PageInfo;
@@ -46,6 +47,7 @@
 import org.apache.hugegraph.schema.IndexLabel;
 import org.apache.hugegraph.schema.PropertyKey;
 import org.apache.hugegraph.schema.SchemaLabel;
+import org.apache.hugegraph.structure.HugeEdge;
 import org.apache.hugegraph.structure.HugeElement;
 import org.apache.hugegraph.structure.HugeProperty;
 import org.apache.hugegraph.type.HugeType;
@@ -1325,7 +1327,12 @@ private static boolean testIdPredicate(P<?> predicate, Element element) {
                     for (Object value : values) {
                         Object actual = id instanceof IdGenerator.StringId && value instanceof String ?
                                         ((Id) id).asString() : id;
-                        if (Compare.eq.test(actual, value)) {
+                        // Edge lookup accepts its serialized ID as well as EdgeId.
+                        // Preserve that contract in local mixed-ID filters without
+                        // collapsing numeric and string vertex IDs.
+                        Object expected = id instanceof EdgeId &&
+                                          value instanceof String ? HugeEdge.getIdValue(value, true) : value;
+                        if (Compare.eq.test(actual, expected)) {
                             return predicate.getBiPredicate() == Contains.within;
                         }
                     }