This is an automated email from the ASF dual-hosted git repository. Cole-Greer pushed a commit to branch simplePDT in repository https://gitbox.apache.org/repos/asf/tinkerpop.git
commit f6f65aedd6dcc07cbb0087f6d3bc702771cf1344 Author: Cole Greer <[email protected]> AuthorDate: Wed Jun 24 13:03:40 2026 -0700 Extract ProviderDefinedTypeAdapter supertype; rename composite adapter to CompositePDTAdapter Behavior-preserving refactor that prepares the PDT adapter SPI for the upcoming PrimitivePDT (0xF1) work by introducing a common supertype. - ProviderDefinedTypeAdapter<T> is now a thin common supertype exposing only typeName() and targetClass(). - New CompositePDTAdapter<T> extends it with the composite-specific toFields(T)/fromFields(Map) methods. - ProviderDefinedTypeRegistry stores composite adapters as CompositePDTAdapter; register(...) accepts the supertype and routes composite adapters via instanceof; create() discovers adapters via ServiceLoader on the supertype so a single service file can list any adapter kind. AnnotatedTypeAdapter now implements CompositePDTAdapter. - Updated composite toFields call sites in GremlinLang and the lka write-path code (GraphBinaryWriter, PdtGraphSONSerializersV4) to use CompositePDTAdapter. - Updated test fixtures (TestPointAdapter and others) to implement CompositePDTAdapter. No primitive (0xF1) logic is introduced here. Composite behavior is unchanged; all composite PDT tests pass. tinkerpop-2gy.1 Assisted-by: Kiro:claude-opus-4.8 --- .../gremlin/process/traversal/GremlinLang.java | 3 ++- .../structure/io/binary/GraphBinaryWriter.java | 3 ++- .../io/graphson/PdtGraphSONSerializersV4.java | 3 ++- ...inedTypeAdapter.java => CompositePDTAdapter.java} | 5 ++--- .../structure/io/pdt/ProviderDefinedTypeAdapter.java | 7 ++----- .../io/pdt/ProviderDefinedTypeRegistry.java | 20 +++++++++++++------- .../gremlin/process/traversal/GremlinLangTest.java | 6 +++--- .../io/graphson/PdtGraphSONSerializersV4Test.java | 4 ++-- .../io/pdt/ProviderDefinedTypeRegistryTest.java | 10 +++++----- .../gremlin/server/GremlinDriverIntegrateTest.java | 4 ++-- .../util/ser/binary/GraphBinaryWriterPdtTest.java | 4 ++-- .../gremlin/util/ser/binary/TestPointAdapter.java | 4 ++-- .../types/ProviderDefinedTypeSerializerTest.java | 4 ++-- 13 files changed, 41 insertions(+), 36 deletions(-) diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/GremlinLang.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/GremlinLang.java index 3bd1cb5287..c1bc3461aa 100644 --- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/GremlinLang.java +++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/GremlinLang.java @@ -32,6 +32,7 @@ import org.apache.tinkerpop.gremlin.structure.T; import org.apache.tinkerpop.gremlin.structure.Vertex; import org.apache.tinkerpop.gremlin.structure.io.pdt.ProviderDefined; import org.apache.tinkerpop.gremlin.structure.io.pdt.ProviderDefinedType; +import org.apache.tinkerpop.gremlin.structure.io.pdt.CompositePDTAdapter; import org.apache.tinkerpop.gremlin.structure.io.pdt.ProviderDefinedTypeAdapter; import org.apache.tinkerpop.gremlin.structure.io.pdt.ProviderDefinedTypeRegistry; import org.apache.tinkerpop.gremlin.util.NumberHelper; @@ -273,7 +274,7 @@ public class GremlinLang implements Cloneable, Serializable { final Optional<ProviderDefinedTypeAdapter<?>> adapter = pdtRegistry.getAdapterByClass(arg.getClass()); if (adapter.isPresent()) { @SuppressWarnings("unchecked") - final Map<String, Object> fields = ((ProviderDefinedTypeAdapter) adapter.get()).toFields(arg); + final Map<String, Object> fields = ((CompositePDTAdapter) adapter.get()).toFields(arg); return argAsString(new ProviderDefinedType(adapter.get().typeName(), fields)); } } diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/binary/GraphBinaryWriter.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/binary/GraphBinaryWriter.java index 05fd63c366..27bc0bda15 100644 --- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/binary/GraphBinaryWriter.java +++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/binary/GraphBinaryWriter.java @@ -20,6 +20,7 @@ package org.apache.tinkerpop.gremlin.structure.io.binary; import org.apache.tinkerpop.gremlin.structure.io.binary.types.ProviderDefinedTypeSerializer; import org.apache.tinkerpop.gremlin.structure.io.binary.types.TransformSerializer; +import org.apache.tinkerpop.gremlin.structure.io.pdt.CompositePDTAdapter; import org.apache.tinkerpop.gremlin.structure.io.pdt.ProviderDefinedType; import org.apache.tinkerpop.gremlin.structure.io.pdt.ProviderDefinedTypeAdapter; import org.apache.tinkerpop.gremlin.structure.io.pdt.ProviderDefinedTypeRegistry; @@ -195,7 +196,7 @@ public class GraphBinaryWriter { if (pdtRegistry != null) { final Optional<ProviderDefinedTypeAdapter<?>> opt = pdtRegistry.getAdapterByClass(objectClass); if (opt.isPresent()) { - final ProviderDefinedTypeAdapter adapter = opt.get(); + final CompositePDTAdapter adapter = (CompositePDTAdapter) opt.get(); final Map<String, Object> fields = adapter.toFields(value); return new ProviderDefinedType(adapter.typeName(), fields); } diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/PdtGraphSONSerializersV4.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/PdtGraphSONSerializersV4.java index 03e686917c..5c0c72e1bf 100644 --- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/PdtGraphSONSerializersV4.java +++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/PdtGraphSONSerializersV4.java @@ -18,6 +18,7 @@ */ package org.apache.tinkerpop.gremlin.structure.io.graphson; +import org.apache.tinkerpop.gremlin.structure.io.pdt.CompositePDTAdapter; import org.apache.tinkerpop.gremlin.structure.io.pdt.ProviderDefinedType; import org.apache.tinkerpop.gremlin.structure.io.pdt.ProviderDefinedTypeAdapter; import org.apache.tinkerpop.gremlin.structure.io.pdt.ProviderDefinedTypeRegistry; @@ -162,7 +163,7 @@ final class PdtGraphSONSerializersV4 { if (!opt.isPresent()) { throw new IOException("No adapter found for " + value.getClass().getName()); } - final ProviderDefinedTypeAdapter adapter = opt.get(); + final CompositePDTAdapter adapter = (CompositePDTAdapter) opt.get(); final Map<String, Object> fields = adapter.toFields(value); return new ProviderDefinedType(adapter.typeName(), fields); } diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/pdt/ProviderDefinedTypeAdapter.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/pdt/CompositePDTAdapter.java similarity index 88% copy from gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/pdt/ProviderDefinedTypeAdapter.java copy to gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/pdt/CompositePDTAdapter.java index 701fba0d49..5ebf95d958 100644 --- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/pdt/ProviderDefinedTypeAdapter.java +++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/pdt/CompositePDTAdapter.java @@ -22,10 +22,9 @@ import java.util.Map; /** * Adapter for converting between a typed object and a {@link ProviderDefinedType} field map. + * Used for composite (multi-field) provider-defined types. */ -public interface ProviderDefinedTypeAdapter<T> { - String typeName(); - Class<T> targetClass(); +public interface CompositePDTAdapter<T> extends ProviderDefinedTypeAdapter<T> { Map<String, Object> toFields(T obj); T fromFields(Map<String, Object> fields); } diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/pdt/ProviderDefinedTypeAdapter.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/pdt/ProviderDefinedTypeAdapter.java index 701fba0d49..3612cda193 100644 --- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/pdt/ProviderDefinedTypeAdapter.java +++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/pdt/ProviderDefinedTypeAdapter.java @@ -18,14 +18,11 @@ */ package org.apache.tinkerpop.gremlin.structure.io.pdt; -import java.util.Map; - /** - * Adapter for converting between a typed object and a {@link ProviderDefinedType} field map. + * Common supertype for all PDT adapters. Exposes the type name and target class; + * serialization-specific methods live in subtypes ({@link CompositePDTAdapter}). */ public interface ProviderDefinedTypeAdapter<T> { String typeName(); Class<T> targetClass(); - Map<String, Object> toFields(T obj); - T fromFields(Map<String, Object> fields); } diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/pdt/ProviderDefinedTypeRegistry.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/pdt/ProviderDefinedTypeRegistry.java index dec03e5383..4213f4ec94 100644 --- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/pdt/ProviderDefinedTypeRegistry.java +++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/pdt/ProviderDefinedTypeRegistry.java @@ -40,8 +40,8 @@ public final class ProviderDefinedTypeRegistry { private static final Logger logger = LoggerFactory.getLogger(ProviderDefinedTypeRegistry.class); - private final Map<String, ProviderDefinedTypeAdapter<?>> adaptersByName = new ConcurrentHashMap<>(); - private final Map<Class<?>, ProviderDefinedTypeAdapter<?>> adaptersByClass = new ConcurrentHashMap<>(); + private final Map<String, CompositePDTAdapter<?>> adaptersByName = new ConcurrentHashMap<>(); + private final Map<Class<?>, CompositePDTAdapter<?>> adaptersByClass = new ConcurrentHashMap<>(); private ProviderDefinedTypeRegistry() {} @@ -64,9 +64,16 @@ public final class ProviderDefinedTypeRegistry { return new ProviderDefinedTypeRegistry(); } + /** + * Registers an adapter. Composite adapters ({@link CompositePDTAdapter}) are stored for + * hydration/dehydration; other adapter kinds are routed to their respective maps in future beads. + */ public void register(final ProviderDefinedTypeAdapter<?> adapter) { - adaptersByName.put(adapter.typeName(), adapter); - adaptersByClass.put(adapter.targetClass(), adapter); + if (adapter instanceof CompositePDTAdapter) { + final CompositePDTAdapter<?> composite = (CompositePDTAdapter<?>) adapter; + adaptersByName.put(composite.typeName(), composite); + adaptersByClass.put(composite.targetClass(), composite); + } } /** @@ -89,7 +96,6 @@ public final class ProviderDefinedTypeRegistry { return Optional.ofNullable(adaptersByClass.get(clazz)); } - /** /** * Attempts to hydrate a {@link ProviderDefinedType} into a typed object using a registered adapter. * Recursively hydrates nested PDT values in the fields map (including those inside Lists, Sets, @@ -110,7 +116,7 @@ public final class ProviderDefinedTypeRegistry { hydrated.put(entry.getKey(), value); } - final ProviderDefinedTypeAdapter adapter = adaptersByName.get(pdt.getName()); + final CompositePDTAdapter adapter = adaptersByName.get(pdt.getName()); if (adapter == null) { // No adapter for the outer type: return it raw, but with any registered nested types hydrated. // Preserve identity when nothing nested was hydrated. @@ -155,7 +161,7 @@ public final class ProviderDefinedTypeRegistry { * A reflective adapter synthesized from a {@link ProviderDefined}-annotated class. */ @SuppressWarnings({"unchecked", "rawtypes"}) - private static final class AnnotatedTypeAdapter<T> implements ProviderDefinedTypeAdapter<T> { + private static final class AnnotatedTypeAdapter<T> implements CompositePDTAdapter<T> { private final String typeName; private final Class<T> targetClass; private final Field[] fields; diff --git a/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/GremlinLangTest.java b/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/GremlinLangTest.java index 3a62dcd9ec..ad506a5cc9 100644 --- a/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/GremlinLangTest.java +++ b/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/GremlinLangTest.java @@ -30,7 +30,7 @@ import org.apache.tinkerpop.gremlin.structure.util.detached.DetachedVertex; import org.apache.tinkerpop.gremlin.structure.util.empty.EmptyGraph; import org.apache.tinkerpop.gremlin.structure.io.pdt.ProviderDefined; import org.apache.tinkerpop.gremlin.structure.io.pdt.ProviderDefinedType; -import org.apache.tinkerpop.gremlin.structure.io.pdt.ProviderDefinedTypeAdapter; +import org.apache.tinkerpop.gremlin.structure.io.pdt.CompositePDTAdapter; import org.apache.tinkerpop.gremlin.structure.io.pdt.ProviderDefinedTypeRegistry; import org.apache.tinkerpop.gremlin.structure.util.reference.ReferenceEdge; import org.apache.tinkerpop.gremlin.structure.util.reference.ReferenceVertex; @@ -470,7 +470,7 @@ public class GremlinLangTest { @Test public void shouldUseAdapterOverAnnotation() { final ProviderDefinedTypeRegistry registry = ProviderDefinedTypeRegistry.empty(); - registry.register(new ProviderDefinedTypeAdapter<DualType>() { + registry.register(new CompositePDTAdapter<DualType>() { @Override public String typeName() { return "AdapterName"; } @Override public Class<DualType> targetClass() { return DualType.class; } @Override public Map<String, Object> toFields(final DualType obj) { @@ -500,7 +500,7 @@ public class GremlinLangTest { @Test public void shouldDehydrateRegisteredTypeNestedInsideUnregisteredOuterPdt() { final ProviderDefinedTypeRegistry registry = ProviderDefinedTypeRegistry.empty(); - registry.register(new ProviderDefinedTypeAdapter<TestPoint>() { + registry.register(new CompositePDTAdapter<TestPoint>() { @Override public String typeName() { return "Point"; } @Override public Class<TestPoint> targetClass() { return TestPoint.class; } @Override public Map<String, Object> toFields(final TestPoint obj) { diff --git a/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/structure/io/graphson/PdtGraphSONSerializersV4Test.java b/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/structure/io/graphson/PdtGraphSONSerializersV4Test.java index fa29b1ba68..913d06bc51 100644 --- a/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/structure/io/graphson/PdtGraphSONSerializersV4Test.java +++ b/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/structure/io/graphson/PdtGraphSONSerializersV4Test.java @@ -18,8 +18,8 @@ */ package org.apache.tinkerpop.gremlin.structure.io.graphson; +import org.apache.tinkerpop.gremlin.structure.io.pdt.CompositePDTAdapter; import org.apache.tinkerpop.gremlin.structure.io.pdt.ProviderDefinedType; -import org.apache.tinkerpop.gremlin.structure.io.pdt.ProviderDefinedTypeAdapter; import org.apache.tinkerpop.gremlin.structure.io.pdt.ProviderDefinedTypeRegistry; import org.apache.tinkerpop.shaded.jackson.databind.JsonNode; import org.apache.tinkerpop.shaded.jackson.databind.ObjectMapper; @@ -152,7 +152,7 @@ public class PdtGraphSONSerializersV4Test extends AbstractGraphSONTest { Point(int x, int y) { this.x = x; this.y = y; } } - static class PointAdapter implements ProviderDefinedTypeAdapter<Point> { + static class PointAdapter implements CompositePDTAdapter<Point> { @Override public String typeName() { return "Point"; } @Override public Class<Point> targetClass() { return Point.class; } @Override public Map<String, Object> toFields(Point obj) { diff --git a/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/structure/io/pdt/ProviderDefinedTypeRegistryTest.java b/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/structure/io/pdt/ProviderDefinedTypeRegistryTest.java index b710a2d67c..7158cb71f5 100644 --- a/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/structure/io/pdt/ProviderDefinedTypeRegistryTest.java +++ b/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/structure/io/pdt/ProviderDefinedTypeRegistryTest.java @@ -40,7 +40,7 @@ public class ProviderDefinedTypeRegistryTest { Point(int x, int y) { this.x = x; this.y = y; } } - static class PointAdapter implements ProviderDefinedTypeAdapter<Point> { + static class PointAdapter implements CompositePDTAdapter<Point> { @Override public String typeName() { return "Point"; } @Override public Class<Point> targetClass() { return Point.class; } @Override public Map<String, Object> toFields(Point obj) { @@ -61,7 +61,7 @@ public class ProviderDefinedTypeRegistryTest { Line(Point start, Point end) { this.start = start; this.end = end; } } - static class LineAdapter implements ProviderDefinedTypeAdapter<Line> { + static class LineAdapter implements CompositePDTAdapter<Line> { @Override public String typeName() { return "Line"; } @Override public Class<Line> targetClass() { return Line.class; } @Override public Map<String, Object> toFields(Line obj) { @@ -76,7 +76,7 @@ public class ProviderDefinedTypeRegistryTest { } // Adapter that always throws - static class FailingAdapter implements ProviderDefinedTypeAdapter<Point> { + static class FailingAdapter implements CompositePDTAdapter<Point> { @Override public String typeName() { return "Failing"; } @Override public Class<Point> targetClass() { return Point.class; } @Override public Map<String, Object> toFields(Point obj) { return new HashMap<>(); } @@ -199,7 +199,7 @@ public class ProviderDefinedTypeRegistryTest { Polygon(List<Point> vertices) { this.vertices = vertices; } } - static class PolygonAdapter implements ProviderDefinedTypeAdapter<Polygon> { + static class PolygonAdapter implements CompositePDTAdapter<Polygon> { @Override public String typeName() { return "Polygon"; } @Override public Class<Polygon> targetClass() { return Polygon.class; } @Override public Map<String, Object> toFields(Polygon obj) { @@ -246,7 +246,7 @@ public class ProviderDefinedTypeRegistryTest { registry.register(new PointAdapter()); // A simple adapter that receives a map of named points - registry.register(new ProviderDefinedTypeAdapter<Map>() { + registry.register(new CompositePDTAdapter<Map>() { @Override public String typeName() { return "PointMap"; } @Override public Class<Map> targetClass() { return Map.class; } @Override public Map<String, Object> toFields(Map obj) { return new HashMap<>(); } diff --git a/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinDriverIntegrateTest.java b/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinDriverIntegrateTest.java index dd277cf8db..1416f35887 100644 --- a/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinDriverIntegrateTest.java +++ b/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinDriverIntegrateTest.java @@ -39,7 +39,7 @@ import org.apache.tinkerpop.gremlin.structure.io.Storage; import org.apache.tinkerpop.gremlin.structure.io.binary.TypeSerializerRegistry; import org.apache.tinkerpop.gremlin.structure.io.pdt.ProviderDefined; import org.apache.tinkerpop.gremlin.structure.io.pdt.ProviderDefinedType; -import org.apache.tinkerpop.gremlin.structure.io.pdt.ProviderDefinedTypeAdapter; +import org.apache.tinkerpop.gremlin.structure.io.pdt.CompositePDTAdapter; import org.apache.tinkerpop.gremlin.structure.io.pdt.ProviderDefinedTypeRegistry; import org.apache.tinkerpop.gremlin.structure.util.detached.DetachedVertex; import org.apache.tinkerpop.gremlin.util.ExceptionHelper; @@ -1402,7 +1402,7 @@ public class GremlinDriverIntegrateTest extends AbstractGremlinServerIntegration TestPoint(final int x, final int y) { this.x = x; this.y = y; } } - static class TestPointAdapter implements ProviderDefinedTypeAdapter<TestPoint> { + static class TestPointAdapter implements CompositePDTAdapter<TestPoint> { // TestPoint is the client-side representation of the server-side @ProviderDefined "Point" type, // so the adapter's type name matches the server type name "Point". @Override public String typeName() { return "Point"; } diff --git a/gremlin-util/src/test/java/org/apache/tinkerpop/gremlin/util/ser/binary/GraphBinaryWriterPdtTest.java b/gremlin-util/src/test/java/org/apache/tinkerpop/gremlin/util/ser/binary/GraphBinaryWriterPdtTest.java index 7576dbe306..919d9ba118 100644 --- a/gremlin-util/src/test/java/org/apache/tinkerpop/gremlin/util/ser/binary/GraphBinaryWriterPdtTest.java +++ b/gremlin-util/src/test/java/org/apache/tinkerpop/gremlin/util/ser/binary/GraphBinaryWriterPdtTest.java @@ -23,9 +23,9 @@ import org.apache.tinkerpop.gremlin.structure.io.Buffer; import org.apache.tinkerpop.gremlin.structure.io.binary.GraphBinaryReader; import org.apache.tinkerpop.gremlin.structure.io.binary.GraphBinaryWriter; import org.apache.tinkerpop.gremlin.structure.io.binary.TypeSerializerRegistry; +import org.apache.tinkerpop.gremlin.structure.io.pdt.CompositePDTAdapter; import org.apache.tinkerpop.gremlin.structure.io.pdt.ProviderDefined; import org.apache.tinkerpop.gremlin.structure.io.pdt.ProviderDefinedType; -import org.apache.tinkerpop.gremlin.structure.io.pdt.ProviderDefinedTypeAdapter; import org.apache.tinkerpop.gremlin.structure.io.pdt.ProviderDefinedTypeRegistry; import org.apache.tinkerpop.gremlin.util.ser.NettyBufferFactory; import org.junit.Test; @@ -60,7 +60,7 @@ public class GraphBinaryWriterPdtTest { int value = 1; } - static class UnannotatedTypeAdapter implements ProviderDefinedTypeAdapter<UnannotatedType> { + static class UnannotatedTypeAdapter implements CompositePDTAdapter<UnannotatedType> { @Override public String typeName() { return "UnannotatedType"; } @Override public Class<UnannotatedType> targetClass() { return UnannotatedType.class; } @Override public Map<String, Object> toFields(final UnannotatedType obj) { diff --git a/gremlin-util/src/test/java/org/apache/tinkerpop/gremlin/util/ser/binary/TestPointAdapter.java b/gremlin-util/src/test/java/org/apache/tinkerpop/gremlin/util/ser/binary/TestPointAdapter.java index 6a352f274c..e996d5e235 100644 --- a/gremlin-util/src/test/java/org/apache/tinkerpop/gremlin/util/ser/binary/TestPointAdapter.java +++ b/gremlin-util/src/test/java/org/apache/tinkerpop/gremlin/util/ser/binary/TestPointAdapter.java @@ -18,7 +18,7 @@ */ package org.apache.tinkerpop.gremlin.util.ser.binary; -import org.apache.tinkerpop.gremlin.structure.io.pdt.ProviderDefinedTypeAdapter; +import org.apache.tinkerpop.gremlin.structure.io.pdt.CompositePDTAdapter; import java.util.LinkedHashMap; import java.util.Map; @@ -26,7 +26,7 @@ import java.util.Map; /** * Test-only adapter registered via META-INF/services for SPI auto-wiring validation. */ -public class TestPointAdapter implements ProviderDefinedTypeAdapter<TestPointAdapter.TestPoint> { +public class TestPointAdapter implements CompositePDTAdapter<TestPointAdapter.TestPoint> { public static class TestPoint { public final int x; diff --git a/gremlin-util/src/test/java/org/apache/tinkerpop/gremlin/util/ser/binary/types/ProviderDefinedTypeSerializerTest.java b/gremlin-util/src/test/java/org/apache/tinkerpop/gremlin/util/ser/binary/types/ProviderDefinedTypeSerializerTest.java index 1294e82113..9e08436461 100644 --- a/gremlin-util/src/test/java/org/apache/tinkerpop/gremlin/util/ser/binary/types/ProviderDefinedTypeSerializerTest.java +++ b/gremlin-util/src/test/java/org/apache/tinkerpop/gremlin/util/ser/binary/types/ProviderDefinedTypeSerializerTest.java @@ -24,7 +24,7 @@ import org.apache.tinkerpop.gremlin.structure.io.binary.GraphBinaryReader; import org.apache.tinkerpop.gremlin.structure.io.binary.GraphBinaryWriter; import org.apache.tinkerpop.gremlin.structure.io.binary.TypeSerializerRegistry; import org.apache.tinkerpop.gremlin.structure.io.pdt.ProviderDefinedType; -import org.apache.tinkerpop.gremlin.structure.io.pdt.ProviderDefinedTypeAdapter; +import org.apache.tinkerpop.gremlin.structure.io.pdt.CompositePDTAdapter; import org.apache.tinkerpop.gremlin.structure.io.pdt.ProviderDefinedTypeRegistry; import org.apache.tinkerpop.gremlin.util.ser.NettyBufferFactory; import org.junit.Test; @@ -183,7 +183,7 @@ public class ProviderDefinedTypeSerializerTest { @Test public void shouldAutoHydrateWhenRegistryConfigured() throws IOException { final ProviderDefinedTypeRegistry pdtRegistry = ProviderDefinedTypeRegistry.empty(); - pdtRegistry.register(new ProviderDefinedTypeAdapter<Map<String, Object>>() { + pdtRegistry.register(new CompositePDTAdapter<Map<String, Object>>() { @Override public String typeName() { return "com.example.Point"; }
