Bump org.apache.maven.plugins:maven-release-plugin from 2.5.3 to 3.1.1

.gitignore

@@ -4,3 +4,4 @@ target
 src/main/java
 docs
 site
+tmp/

bom/pom.xml

@@ -4,15 +4,15 @@
     <parent>
         <groupId>net.osgiliath.datamigrator</groupId>
         <artifactId>data-migrator</artifactId>
-        <version>1.59-SNAPSHOT</version>
+        <version>1.65-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
     <artifactId>data-migrator-bom</artifactId>
     <packaging>pom</packaging>
 
     <properties>
-        <camel.version>4.5.0</camel.version>
+        <camel.version>4.6.0</camel.version>
         <log4j.version>2.22.0</log4j.version>
         <testcontainers.version>1.19.8</testcontainers.version>
         <jgrapht.version>1.5.2</jgrapht.version>

core/pom.xml

@@ -4,7 +4,7 @@
     <parent>
         <groupId>net.osgiliath.datamigrator</groupId>
         <artifactId>data-migrator</artifactId>
-        <version>1.59-SNAPSHOT</version>
+        <version>1.65-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>data-migrator-core</artifactId>

core/src/main/java/net/osgiliath/migrator/core/api/metamodel/model/MetamodelVertex.java

@@ -20,10 +20,12 @@
  * #L%
  */
 
+import java.io.Serializable;
+
 /**
  * A vertex in the metamodel graph.
  */
-public interface MetamodelVertex {
+public interface MetamodelVertex extends Serializable {
 
 
     /**

core/src/main/java/net/osgiliath/migrator/core/api/model/ModelElement.java

@@ -20,8 +20,13 @@
  * #L%
  */
 
+import net.osgiliath.migrator.core.api.metamodel.model.MetamodelVertex;
+
 /**
  * A vertex in the model graph.
+ *
+ * @param vertex     the metamodel element.
+ * @param rawElement the underlying element.
  */
-public record ModelElement(Object rawElement) {
+public record ModelElement(MetamodelVertex vertex, Object rawElement) {
 }

core/src/main/java/net/osgiliath/migrator/core/api/transformers/ModelElementColumnTransformer.java

@@ -50,10 +50,10 @@ public String columnName() {
 
     @Override
     public ModelElement evaluate(ModelElement toBeTransformed) {
-        Object rawValue = modelElementProcessor.getFieldRawValue(metamodel, columnName, toBeTransformed);
+        Object rawValue = modelElementProcessor.getFieldRawValue(toBeTransformed, columnName);
         log.info("transforming Vertex of class {} with column {} and value {}", metamodel.getTypeName(), columnName, rawValue);
         Object transformedValue = evaluateField((F) rawValue);
-        modelElementProcessor.setFieldRawValue(metamodel, columnName, toBeTransformed, transformedValue);
+        modelElementProcessor.setFieldRawValue(toBeTransformed, columnName, transformedValue);
         return toBeTransformed;
     }
 

core/src/main/java/net/osgiliath/migrator/core/configuration/CacheConfiguration.java

@@ -0,0 +1,39 @@
+package net.osgiliath.migrator.core.configuration;
+
+/*-
+ * #%L
+ * data-migrator-core
+ * %%
+ * Copyright (C) 2024 Osgiliath Inc.
+ * %%
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * #L%
+ */
+
+import org.springframework.cache.CacheManager;
+import org.springframework.cache.annotation.EnableCaching;
+import org.springframework.cache.concurrent.ConcurrentMapCacheManager;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+
+@Configuration
+@EnableCaching
+public class CacheConfiguration {
+
+
+    @Bean
+    public CacheManager cacheManager() {
+
+        return new ConcurrentMapCacheManager("metamodelEntitiesClass");
+    }
+}

core/src/main/java/net/osgiliath/migrator/core/configuration/DataSourceConfiguration.java

@@ -22,8 +22,16 @@
 
 import com.zaxxer.hikari.HikariConfig;
 import com.zaxxer.hikari.HikariDataSource;
+import net.osgiliath.migrator.core.api.metamodel.MetamodelScanner;
 import net.osgiliath.migrator.core.configuration.beans.CustomHikariDatasource;
+import net.osgiliath.migrator.core.graph.InGraphVertexResolver;
+import net.osgiliath.migrator.core.graph.ModelElementFactory;
+import net.osgiliath.migrator.core.graph.OffGraphVertexResolver;
+import net.osgiliath.migrator.core.graph.VertexResolver;
+import net.osgiliath.migrator.core.metamodel.impl.internal.jpa.JpaMetamodelVertexFactory;
+import net.osgiliath.migrator.core.rawelement.RawElementProcessor;
 import org.springframework.beans.factory.annotation.Qualifier;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.boot.autoconfigure.jdbc.DataSourceProperties;
 import org.springframework.boot.context.properties.ConfigurationProperties;
 import org.springframework.context.annotation.Bean;
@@ -86,6 +94,18 @@ public HikariConfig sinkHikariConfigProperties() {
         return new HikariConfig();
     }
 
+    @Bean
+    @ConditionalOnProperty(prefix = "data-migrator.graph-datasource", name = "type", havingValue = "embedded")
+    public VertexResolver vertexResolverInGraph() {
+        return new InGraphVertexResolver();
+    }
+
+    @Bean
+    @ConditionalOnProperty(prefix = "data-migrator.graph-datasource", name = "type", havingValue = "remote")
+    public VertexResolver vertexResolverOffGraph(JpaMetamodelVertexFactory jpaMetamodelVertexFactory, MetamodelScanner metamodelScanner, ModelElementFactory modelElementFactory, RawElementProcessor rawElementProcessor) {
+        return new OffGraphVertexResolver(jpaMetamodelVertexFactory, metamodelScanner, modelElementFactory, rawElementProcessor);
+    }
+
 
     @Bean(SOURCE_DATASOURCE)
     public DataSource sourceDataSource(

core/src/main/java/net/osgiliath/migrator/core/configuration/beans/GraphTraversalSourceProvider.java

@@ -9,9 +9,9 @@
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -22,12 +22,17 @@
 
 import net.osgiliath.migrator.core.configuration.DataMigratorConfiguration;
 import net.osgiliath.migrator.core.configuration.model.GraphDatasourceType;
+import org.apache.tinkerpop.gremlin.driver.remote.DriverRemoteConnection;
 import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.GraphTraversalSource;
 import org.apache.tinkerpop.gremlin.structure.Graph;
+import org.apache.tinkerpop.gremlin.structure.io.IoRegistry;
+import org.apache.tinkerpop.gremlin.structure.io.binary.TypeSerializerRegistry;
 import org.apache.tinkerpop.gremlin.tinkergraph.structure.TinkerGraph;
+import org.apache.tinkerpop.gremlin.tinkergraph.structure.TinkerIoRegistryV3;
 import org.springframework.stereotype.Component;
 
 import static org.apache.tinkerpop.gremlin.process.traversal.AnonymousTraversalSource.traversal;
+
 /**
  * Tinkerpop Graph traversal source provider.
  */
@@ -41,22 +46,42 @@ public class GraphTraversalSourceProvider {
 
     /**
      * Constructor.
+     *
      * @param dataMigratorConfiguration the data migrator configuration.
      */
     public GraphTraversalSourceProvider(DataMigratorConfiguration dataMigratorConfiguration) {
         this.dataMigratorConfiguration = dataMigratorConfiguration;
     }
+
     /**
      * Gets the graph traversal source (graph instance) in regards to configuration.
+     *
      * @return the graph traversal source.
      */
     public GraphTraversalSource getGraph() {
-       if (dataMigratorConfiguration.getGraphDatasource().getType() == GraphDatasourceType.EMBEDDED) {
+        if (dataMigratorConfiguration.getGraphDatasource().getType() == GraphDatasourceType.EMBEDDED) {
             Graph graph = TinkerGraph.open();
             return traversal().withEmbedded(graph);
+        } else if (dataMigratorConfiguration.getGraphDatasource().getType() == GraphDatasourceType.REMOTE) {
+            IoRegistry registry = TinkerIoRegistryV3.instance();
+            TypeSerializerRegistry typeSerializerRegistry = TypeSerializerRegistry.build().addRegistry(registry)
+                    .create();
+
+/*            GraphSONMapper.Builder builder = GraphSONMapper.build().
+                    typeInfo(TypeInfo.PARTIAL_TYPES)
+                    // .addCustomModule(new JpaMetamodelSerializationModule())
+                    .addCustomModule(GraphSONXModuleV3.build())
+                    .version(GraphSONVersion.V3_0);
+            MessageSerializer serializer = new GraphSONMessageSerializerV3(builder); //typeSerializerRegistry);*/
+/*            Cluster cluster = Cluster.build(dataMigratorConfiguration.getGraphDatasource().getHost()).port(dataMigratorConfiguration.getGraphDatasource().getPort()).
+                    serializer(new GraphBinaryMessageSerializerV1(typeSerializerRegistry)).
+                    create();
+
+            Client client = cluster.connect();*/
+            return traversal().withRemote(DriverRemoteConnection.using(dataMigratorConfiguration.getGraphDatasource().getHost(), dataMigratorConfiguration.getGraphDatasource().getPort()));
+        } else {
+            throw new UnsupportedOperationException("Only embedded graph is supported for now");
         }
-        else {
-           throw new UnsupportedOperationException("Only embedded graph is supported for now");
-       }
     }
+
 }

core/src/main/java/net/osgiliath/migrator/core/configuration/beans/MetamodelGraphDeserializer.java

@@ -0,0 +1,37 @@
+package net.osgiliath.migrator.core.configuration.beans;
+
+/*-
+ * #%L
+ * data-migrator-core
+ * %%
+ * Copyright (C) 2024 Osgiliath Inc.
+ * %%
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * #L%
+ */
+
+import net.osgiliath.migrator.core.api.metamodel.model.MetamodelVertex;
+import net.osgiliath.migrator.core.metamodel.impl.internal.jpa.model.JpaMetamodelVertex;
+import org.apache.tinkerpop.shaded.jackson.core.JacksonException;
+import org.apache.tinkerpop.shaded.jackson.core.JsonParser;
+import org.apache.tinkerpop.shaded.jackson.databind.DeserializationContext;
+import org.apache.tinkerpop.shaded.jackson.databind.JsonDeserializer;
+
+import java.io.IOException;
+
+public class MetamodelGraphDeserializer extends JsonDeserializer<MetamodelVertex> {
+    @Override
+    public MetamodelVertex deserialize(JsonParser jsonParser, DeserializationContext deserializationContext) throws IOException, JacksonException {
+        return deserializationContext.readValue(jsonParser, JpaMetamodelVertex.class);
+    }
+}

core/src/main/java/net/osgiliath/migrator/core/configuration/model/GraphDatasource.java

@@ -9,9 +9,9 @@
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -30,8 +30,13 @@ public class GraphDatasource {
      */
     private GraphDatasourceType type;
 
+    private int port = 8182;
+
+    private String host = "127.0.0.1";
+
     /**
      * Constructor.
+     *
      * @param graphDatasourceType the datasource type (embedded or remote).
      */
     public GraphDatasource(GraphDatasourceType graphDatasourceType) {
@@ -40,6 +45,7 @@ public GraphDatasource(GraphDatasourceType graphDatasourceType) {
 
     /**
      * Gets the datasource type (embedded or remote).
+     *
      * @return the datasource type (embedded or remote).
      */
     public GraphDatasourceType getType() {
@@ -48,9 +54,26 @@ public GraphDatasourceType getType() {
 
     /**
      * Sets the datasource type (embedded or remote).
+     *
      * @param type the datasource type (embedded or remote).
      */
     public void setType(GraphDatasourceType type) {
         this.type = type;
     }
+
+    public int getPort() {
+        return port;
+    }
+
+    public void setPort(int port) {
+        this.port = port;
+    }
+
+    public String getHost() {
+        return host;
+    }
+
+    public void setHost(String host) {
+        this.host = host;
+    }
 }