Feature/update dependencies (#7)

* update dependencies

* update material ui

* change color picker

* update nivo

* support neo4j 5.x

* update to neo4j 5.1.0-community

* fix image name for lokal build

Author: coding4kay

backend/csv2json/pom.xml

@@ -16,7 +16,7 @@
     <dependency>
       <groupId>com.fasterxml.jackson.core</groupId>
       <artifactId>jackson-databind</artifactId>
-      <version>2.12.3</version>
+      <version>2.12.7.1</version>
     </dependency>
 
     <dependency>

backend/server/pom.xml

@@ -14,14 +14,14 @@
 
   <properties>
     <compiler-plugin.version>3.8.1</compiler-plugin.version>
-    <maven.compiler.parameters>true</maven.compiler.parameters>
+    <failsafe.useModulePath>false</failsafe.useModulePath>
+    <maven.compiler.release>17</maven.compiler.release>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-    <quarkus-plugin.version>2.7.1.Final</quarkus-plugin.version>
     <quarkus.platform.artifact-id>quarkus-bom</quarkus.platform.artifact-id>
-    <quarkus.platform.group-id>io.quarkus</quarkus.platform.group-id>
-    <quarkus.platform.version>2.7.5.Final</quarkus.platform.version>
-    <surefire-plugin.version>3.0.0-M5</surefire-plugin.version>
+    <quarkus.platform.group-id>io.quarkus.platform</quarkus.platform.group-id>
+    <quarkus.platform.version>2.13.3.Final</quarkus.platform.version>
+    <surefire-plugin.version>3.0.0-M7</surefire-plugin.version>
   </properties>
   <dependencyManagement>
     <dependencies>
@@ -84,17 +84,18 @@
       <version>5.3</version>
     </dependency>
     <dependency>
-      <groupId>io.quarkus</groupId>
+      <groupId>io.quarkiverse.neo4j</groupId>
       <artifactId>quarkus-neo4j</artifactId>
+      <version>1.6.0</version>
     </dependency>
  </dependencies>
 
   <build>
     <plugins>
       <plugin>
-        <groupId>io.quarkus</groupId>
+        <groupId>${quarkus.platform.group-id}</groupId>
         <artifactId>quarkus-maven-plugin</artifactId>
-        <version>${quarkus-plugin.version}</version>
+        <version>${quarkus.platform.version}</version>
         <extensions>true</extensions>
         <executions>
           <execution>
@@ -106,6 +107,15 @@
           </execution>
         </executions>
       </plugin>
+      <plugin>
+        <artifactId>maven-compiler-plugin</artifactId>
+        <version>${compiler-plugin.version}</version>
+        <configuration>
+          <compilerArgs>
+            <arg>-parameters</arg>
+          </compilerArgs>
+        </configuration>
+      </plugin>
       <plugin>
         <artifactId>maven-surefire-plugin</artifactId>
         <version>${surefire-plugin.version}</version>

backend/server/src/main/java/com/prodyna/mifune/api/ApocalypseResource.java

@@ -74,10 +74,11 @@ public Multi<String> apocalypseNow() {
     Supplier<CompletionStage<Long>> dropIndex =
         () ->
             session
-                .runAsync("""
-				call db.indexes() yield name
-				return name
-				""")
+                .runAsync(
+                    """
+                        show index yield name
+                        return name
+                        """)
                 .thenCompose(
                     cursor ->
                         cursor.forEachAsync(
@@ -90,7 +91,7 @@ public Multi<String> apocalypseNow() {
         () ->
             session
                 .runAsync("""
-				call db.constraints() yield name
+				show constraints yield name
 				return name
 				""")
                 .thenCompose(

backend/server/src/main/java/com/prodyna/mifune/core/ImportService.java

@@ -62,6 +62,7 @@
 import org.eclipse.microprofile.config.inject.ConfigProperty;
 import org.jboss.logging.Logger;
 import org.neo4j.driver.Driver;
+import org.neo4j.driver.reactive.RxSession;
 import org.reactivestreams.FlowAdapters;
 import org.reactivestreams.Processor;
 
@@ -86,6 +87,10 @@ public class ImportService {
 
   @Inject protected SourceService sourceService;
 
+  static Uni<Void> sessionFinalizer(RxSession session) {
+    return Uni.createFrom().publisher(session.close());
+  }
+
   public Uni<String> runImport(UUID domainId) {
 
     if (pipelineMap.containsKey(domainId)) {
@@ -155,7 +160,6 @@ private Cancellable startImportTask(UUID domainId, Domain domain, Graph graph) {
   private MultiFlatten<JsonNode, Long> createImportTask(
       UUID domainId, Domain domain, String cypher, Processor<List<String>, JsonNode> publisher) {
     var counter = new AtomicLong(1L);
-    var session = driver.asyncSession();
     return Multi.createFrom()
         .publisher(publisher)
         .emitOn(Infrastructure.getDefaultWorkerPool())
@@ -165,19 +169,36 @@ private MultiFlatten<JsonNode, Long> createImportTask(
               var entry =
                   new ObjectMapper()
                       .convertValue(node, new TypeReference<HashMap<String, Object>>() {});
-              var s = driver.asyncSession();
               return Uni.createFrom()
-                  .completionStage(
-                      s.runAsync(cypher, Map.of("model", entry, "domainId", domainId.toString()))
-                          .exceptionally(
-                              e -> {
-                                log.errorf(
-                                    " Failed item import in file: %s on lines: %s   msg: %s",
-                                    domain.getFile(), node.get("lines"), e.getMessage(), e);
-                                return null;
-                              })
-                          .thenCompose(x1 -> session.closeAsync())
-                          .thenApply(v -> counter.getAndIncrement()));
+                  .emitter(
+                      emitter ->
+                          Multi.createFrom()
+                              .resource(
+                                  driver::rxSession,
+                                  session ->
+                                      session.writeTransaction(
+                                          tx ->
+                                              tx.run(
+                                                      cypher,
+                                                      Map.of(
+                                                          "model",
+                                                          entry,
+                                                          "domainId",
+                                                          domainId.toString()))
+                                                  .records()))
+                              .withFinalizer(ImportService::sessionFinalizer)
+                              .map(v -> counter.getAndIncrement())
+                              .onFailure()
+                              .invoke(
+                                  (throwable) ->
+                                      log.errorf(
+                                          " Failed item import in file: %s on lines: %s   msg: %s",
+                                          domain.getFile(),
+                                          node.get("lines"),
+                                          throwable.getMessage(),
+                                          throwable))
+                              .subscribe()
+                              .with(emitter::complete));
             });
   }
 

backend/server/src/main/java/com/prodyna/mifune/core/schema/CypherUpdateContext.java

@@ -82,18 +82,18 @@ private String toCypher(
           if (!c.existChecks.isEmpty()) {
             checks =
                 c.existChecks.stream()
-                    .map("exists(%s)"::formatted)
+                    .map("%s is not null"::formatted)
                     .collect(Collectors.joining(" and ", "where 1=1 and ", ""));
           }
 
           var currentCounter = counter.incrementAndGet();
           var subContext =
               """
                                     call {
-                                    return %s union
+                                    return 1 as result_%s union
                                     with %s
                                     %s
-                                    return %s
+                                    return 1 as result_%s
                                     }
                                     """
                   .formatted(

backend/server/src/main/resources/application.properties

@@ -72,6 +72,9 @@ Local Settings
 %local.quarkus.oidc.tenant-enabled=false
 %local.quarkus.oidc.auth-server-url=http://unused-auth-url
 
+quarkus.neo4j.devservices.image-name=neo4j:5.1.0-community
+quarkus.neo4j.devservices.bolt-port=7688
+quarkus.neo4j.devservices.http-port=7475
 
 TEST Settings
 %test.mifune.disable.authorization=true
@@ -95,7 +98,10 @@ TEST Settings
 %dev.vertx.static.content=../../ui/build
 
 
+
 #dev with security
+#quarkus.neo4j.devservices.http-port=7475
+#quarkus.neo4j.devservices.bolt-port=7688
 #%dev.mifune.disable.authorization=false
 #%dev.quarkus.oidc.tenant-enabled=true
 #%dev.mifune.root.path.api=http://localhost:8080
@@ -109,3 +115,11 @@ TEST Settings
 #%dev.quarkus.oidc.auth-server-url=http://localhost:8888/auth/realms/mifune
 #%dev.quarkus.oidc.client-id=mifune-server
 
+%dev.quarkus.http.auth.permission.public.paths=\
+${quarkus.http.root-path},\
+${quarkus.http.root-path}ui/*,\
+${quarkus.http.root-path}${quarkus.http.non-application-root-path}/dev/*,\
+${quarkus.http.root-path}${quarkus.http.non-application-root-path}/swagger-ui/*,\
+${quarkus.http.root-path}${quarkus.http.non-application-root-path}/openapi
+%dev.quarkus.http.auth.permission.public.policy=permit
+

backend/server/src/test/java/com/prodyna/mifune/core/GraphModelUpdateTest.java

@@ -151,15 +151,15 @@ public void testMergeRelationSameNodeModel() throws IOException {
 				on match set domain.lines = domain.lines + [x in $model.lines where not x in domain.lines | x]
 				with *
 					call {
-					return 1 union
+					return 1 as result_1 union
 					with var_1
 					unwind $model.user.friend as var_2
 					merge(var_3:User {id:var_2.user.id})
 					set var_3.name = coalesce(var_2.user.name, var_3.name)
 					merge(var_1)-[friend:FRIEND]->(var_3)
 					set friend.since = coalesce(var_2.since, friend.since)
 					with *
-					return 1
+					return 1 as result_1
 					}
 				return 'done'
 				 """;
@@ -247,13 +247,13 @@ public void testMergeRelationBetweenTwoNodeModels() throws IOException {
 				on match set domain.lines = domain.lines + [x in $model.lines where not x in domain.lines | x]
 				with *
 					call {
-					return 1 union
+					return 1 as result_1 union
 					with var_1
-					with * where 1=1 and exists($model.user.hasCar.car.id)
+					with * where 1=1 and $model.user.hasCar.car.id is not null
 					merge(var_2:Car {id:$model.user.hasCar.car.id})
 					merge(var_1)-[hasCar:HAS_CAR]->(var_2)
 					with *
-					return 1
+					return 1 as result_1
 					}
 				return 'done'
 				""";
@@ -350,14 +350,14 @@ public void testMergeRelationBetweenTwoNodeModelsWithProperty() throws IOExcepti
 				on match set domain.lines = domain.lines + [x in $model.lines where not x in domain.lines | x]
 				with *
 					call {
-					return 1 union
+					return 1 as result_1 union
 					with var_1
-					with * where 1=1 and exists($model.user.hasCar.car.id)
+					with * where 1=1 and $model.user.hasCar.car.id is not null
 					merge(var_2:Car {id:$model.user.hasCar.car.id})
 					merge(var_1)-[hasCar:HAS_CAR]->(var_2)
 					set hasCar.since = coalesce($model.user.hasCar.since, hasCar.since)
 					with *
-					return 1
+					return 1 as result_1
 					}
 				return 'done'
 				""";
@@ -457,14 +457,14 @@ public void testMergeMultiRelationBetweenNodesWithPrimaryKeys() throws IOExcepti
 				on match set domain.lines = domain.lines + [x in $model.lines where not x in domain.lines | x]
 				with *
 					call {
-					return 1 union
+					return 1 as result_1 union
 					with var_1
 					unwind $model.user.hasCar as var_2
 					merge(var_3:Car {id:var_2.car.id})
 					merge(var_1)-[hasCar:HAS_CAR]->(var_3)
 					set hasCar.since = coalesce(var_2.since, hasCar.since)
 					with *
-					return 1
+					return 1 as result_1
 					}
 				return 'done'
 				""";
@@ -565,13 +565,13 @@ public void testMergeCollectionByRelationWithKeyAndNodeWithoutPrimaryKeys() thro
 				on match set domain.lines = domain.lines + [x in $model.lines where not x in domain.lines | x]
 				with *
 					call {
-					return 1 union
+					return 1 as result_1 union
 					with var_1
 					unwind $model.user.hasCar as var_2
 					merge(var_3:Car {id:var_2.car.id})
 					merge(var_1)-[hasCar:HAS_CAR {since:var_2.since}]->(var_3)
 					with *
-					return 1
+					return 1 as result_1
 					}
 				return 'done'
 				  """;

deployment-sample/mifune-local/docker-compose.yaml

@@ -1,7 +1,7 @@
 version: "3"
 services:
   neo4j:
-    image: neo4j:4.4.3-community
+    image: "neo4j:5.1.0-community"
     ports:
       - "7474:7474"
       - "7687:7687"

deployment-sample/mifune-server/docker-compose.yaml

@@ -11,7 +11,7 @@ services:
     volumes:
       - "../keycloak/realm-export.json:/tmp/realm-export.json:z"
   neo4j:
-    image: "neo4j:4.4.5-community"
+    image: "neo4j:5.1.0-community"
     environment:
       NEO4J_AUTH: "neo4j/password"
     ports:

docker_build_local.sh

@@ -7,5 +7,5 @@ cd .. || exit
 cd ./backend || exit
 ./mvnw -f pom.xml clean install -DskipTests
 cd .. || exit
-docker build -t prodyna/capt-mifune:latest .
+docker build -t ghcr.io/prodyna/capt-mifune:latest .