Merge pull request #163 from OsgiliathEnterprise/bumpspring

Sonarqube smells

Author: Tcharl

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

@@ -25,9 +25,7 @@
 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.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;
@@ -62,20 +60,18 @@ public GraphTraversalSource getGraph() {
             Graph graph = TinkerGraph.open();
             return traversal().withEmbedded(graph);
         } else if (dataMigratorConfiguration.getGraphDatasource().getType().equals(GraphDatasourceType.REMOTE)) {
-            IoRegistry registry = TinkerIoRegistryV3.instance();
-/*            TypeSerializerRegistry typeSerializerRegistry = TypeSerializerRegistry.build().addRegistry(registry)
-                    .create();*/
-
-/*            GraphSONMapper.Builder builder = GraphSONMapper.build().
+/*            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()).
+            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 {

core/src/main/java/net/osgiliath/migrator/core/rawelement/jpa/JpaRelationshipProcessor.java

@@ -78,9 +78,9 @@ public Object getEdgeRawValue(ModelElement modelElement, Method getterMethod) {
 
     @Override
     public void setEdgeRawValue(String fieldName, Field metamodelField, MetamodelVertex target, ModelElement modelElement, Object value) {
-        jpaEntityProcessor.getId(modelElement).ifPresent(id -> {
-            log.debug("setting raw value for edge {} to modelElement {}", fieldName, id);
-        });
+        jpaEntityProcessor.getId(modelElement).ifPresent(id ->
+                log.debug("setting raw value for edge {} to modelElement {}", fieldName, id)
+        );
         jpaEntityProcessor.setFieldValue(modelElement, fieldName, value);
         jpaEntityProcessor.getterMethod(modelElement.vertex(), metamodelField).flatMap(
                 method -> inverseRelationshipField(method, target)
@@ -394,7 +394,6 @@ public boolean isDerived(Class<?> entityClass, String attributeName) {
      */
     public boolean isFkIgnored(Class<?> entityClass, String attributeName) {
         try {
-
             return Arrays.stream(Introspector.getBeanInfo(entityClass).getPropertyDescriptors())
                     .filter(pd -> attributeName.equals(pd.getName()))
                     .map(PropertyDescriptor::getReadMethod)

core/src/test/java/net/osgiliath/migrator/core/graph/ModelElementTest.java

@@ -95,7 +95,7 @@ void testGetEdgeValueFromVertexGraphToOne() throws NoSuchMethodException {
         Optional<EdgeTargetVertexOrVertices> result = modelGraphEdgeBuilder.getEdgeValueFromVertexGraph(modelElement, fieldEdge, graphTraversalSource);
         // Assert
         assertTrue(result.isPresent());
-        Assertions.assertEquals(((UnitaryEdgeTarget) result.get()).target().id(), MockTraversalVertex.ENTITY_ID_1);
+        Assertions.assertEquals(MockTraversalVertex.ENTITY_ID_1, ((UnitaryEdgeTarget) result.get()).target().id());
     }
 
     @Transactional

core/src/test/java/net/osgiliath/migrator/core/graph/ModelGraphBuilderTest.java

@@ -101,7 +101,6 @@ void testModelGraphFromMetamodelGraph() {
     void testCreateEdges() {
         // Arrange
         MetamodelVertex metamodelVertex = new JpaMetamodelVertex(MetamodelClass.class, FakeEntity.class);
-        FieldEdge<MetamodelVertex> fieldEdge = new FieldEdge(null);
         Set<MetamodelVertex> metaVertex = new HashSet<>();
         metaVertex.add(metamodelVertex);
         GraphTraversal g = new DefaultGraphTraversal();

core/src/test/java/net/osgiliath/migrator/core/rawelement/jpa/JpaEntityProcessorTest.java

@@ -54,7 +54,7 @@ void testGetEntityId() {
         TestEntity ent = new TestEntity();
         JpaMetamodelVertex jpaMetamodelVertex = new JpaMetamodelVertex(null, TestEntity.class);
         Optional<Object> ret = jpaEntityProcessor.getId(jpaMetamodelVertex, ent);
-        assertThat(ret.get()).isEqualTo(1L);
+        assertThat(ret).contains(1L);
     }
 
     @Test

report-aggregate/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <groupId>net.osgiliath.datamigrator</groupId>
         <artifactId>data-migrator</artifactId>
-        <version>1.108-SNAPSHOT</version>
+        <version>1.109-SNAPSHOT</version>
     </parent>
     <artifactId>report-aggregate</artifactId>
     <name>datamigrator-report-aggregate</name>

sample-mono/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <groupId>net.osgiliath.datamigrator</groupId>
         <artifactId>data-migrator</artifactId>
-        <version>1.108-SNAPSHOT</version>
+        <version>1.109-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <groupId>net.osgiliath.datamigrator.sample</groupId>

sample-mono/src/test/java/net/osgiliath/InjectionIT.java

@@ -50,7 +50,6 @@ class InjectionIT {
     @Container
     static MySQLContainer mySQLSourceContainer = (MySQLContainer) new MySQLContainer(DockerImageName.parse("mysql:" + mysqlVersion))
             .withConnectTimeoutSeconds(mysqlTimeoutInSecond.intValue());
-    ;
     // .withExposedPorts(64449);
 
     @Container
@@ -117,7 +116,7 @@ void givenFedGraphWhenEntityProcessorIsCalledThenTargetDatabaseIsPopulatedExclud
         try (GraphTraversalSource modelGraph = modelGraphBuilder.modelGraphFromMetamodelGraph(entityMetamodelGraph)) {
             sinkEntityInjector.persist(modelGraph, entityMetamodelGraph);
             List<Employee> employees = employeeRepository.findAll();
-            assertThat(employees.size()).isLessThan(13); // Two employees has a cycle
+            assertThat(employees).hasSizeLessThan(13); // Two employees has a cycle
             List<Job> jobs = jobRepository.findAll();
             assertThat(jobs).hasSize(10); // has not been limited because intermediairy employee should have been removed