Using Neo4j RX functions

Author: sim51

modules/Neo4jPlugin/pom.xml

@@ -17,6 +17,7 @@
     <properties>
         <neo4j.driver.version>4.3.4</neo4j.driver.version>
         <testcontainers.version>1.17.3</testcontainers.version>
+        <rxjava.version>2.2.21</rxjava.version>
     </properties>
 
     <dependencies>
@@ -25,6 +26,11 @@
             <artifactId>neo4j-java-driver</artifactId>
             <version>${neo4j.driver.version}</version>
         </dependency>
+        <dependency>
+            <groupId>io.reactivex.rxjava2</groupId>
+            <artifactId>rxjava</artifactId>
+            <version>${rxjava.version}</version>
+        </dependency>
         <dependency>
             <groupId>org.gephi</groupId>
             <artifactId>io-importer-api</artifactId>

…plugins/neo4j/Neo4jDatabaseImporter.java …eo4j/importer/Neo4jDatabaseImporter.javamodules/Neo4jPlugin/src/main/java/org/gephi/plugins/neo4j/Neo4jDatabaseImporter.java renamed to modules/Neo4jPlugin/src/main/java/org/gephi/plugins/neo4j/importer/Neo4jDatabaseImporter.java modules/Neo4jPlugin/src/main/java/org/gephi/plugins/neo4j/Neo4jDatabaseImporter.java renamed to modules/Neo4jPlugin/src/main/java/org/gephi/plugins/neo4j/importer/Neo4jDatabaseImporter.java

@@ -1,4 +1,4 @@
-package org.gephi.plugins.neo4j;
+package org.gephi.plugins.neo4j.importer;
 
 import org.gephi.io.importer.spi.WizardImporter;
 import org.gephi.io.importer.spi.WizardImporterBuilder;

…s/neo4j/Neo4jDatabaseImpoterBuilder.java …mporter/Neo4jDatabaseImpoterBuilder.javamodules/Neo4jPlugin/src/main/java/org/gephi/plugins/neo4j/Neo4jDatabaseImpoterBuilder.java renamed to modules/Neo4jPlugin/src/main/java/org/gephi/plugins/neo4j/importer/Neo4jDatabaseImpoterBuilder.java modules/Neo4jPlugin/src/main/java/org/gephi/plugins/neo4j/Neo4jDatabaseImpoterBuilder.java renamed to modules/Neo4jPlugin/src/main/java/org/gephi/plugins/neo4j/importer/Neo4jDatabaseImpoterBuilder.java

@@ -0,0 +1,79 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<form xmlns="http://www.intellij.com/uidesigner/form/" version="1" bind-to-class="org.gephi.plugins.neo4j.ui.Connection">
+  <grid id="27dc6" layout-manager="GridLayoutManager" row-count="4" column-count="2" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
+    <margin top="0" left="0" bottom="0" right="0"/>
+    <constraints>
+      <xy x="20" y="20" width="500" height="400"/>
+    </constraints>
+    <properties/>
+    <border type="none"/>
+    <children>
+      <component id="abae9" class="javax.swing.JTextField" binding="dbUrl">
+        <constraints>
+          <grid row="0" column="1" row-span="1" col-span="1" vsize-policy="0" hsize-policy="6" anchor="8" fill="1" indent="0" use-parent-layout="false">
+            <preferred-size width="150" height="-1"/>
+          </grid>
+        </constraints>
+        <properties/>
+      </component>
+      <component id="f4b47" class="javax.swing.JLabel" binding="dbUrlLabel">
+        <constraints>
+          <grid row="0" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="8" fill="0" indent="0" use-parent-layout="false">
+            <preferred-size width="122" height="17"/>
+          </grid>
+        </constraints>
+        <properties>
+          <labelFor value="abae9"/>
+          <text value="Database Url"/>
+        </properties>
+      </component>
+      <component id="f633a" class="javax.swing.JTextField" binding="dbLogin">
+        <constraints>
+          <grid row="1" column="1" row-span="1" col-span="1" vsize-policy="0" hsize-policy="6" anchor="8" fill="1" indent="0" use-parent-layout="false">
+            <preferred-size width="150" height="-1"/>
+          </grid>
+        </constraints>
+        <properties/>
+      </component>
+      <component id="a1b31" class="javax.swing.JPasswordField" binding="dbPassword">
+        <constraints>
+          <grid row="2" column="1" row-span="1" col-span="1" vsize-policy="0" hsize-policy="6" anchor="8" fill="1" indent="0" use-parent-layout="false">
+            <preferred-size width="150" height="-1"/>
+          </grid>
+        </constraints>
+        <properties/>
+      </component>
+      <component id="f9167" class="javax.swing.JLabel" binding="dbLoginLabel">
+        <constraints>
+          <grid row="1" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="8" fill="0" indent="0" use-parent-layout="false">
+            <preferred-size width="122" height="17"/>
+          </grid>
+        </constraints>
+        <properties>
+          <labelFor value="f633a"/>
+          <text value="Username"/>
+        </properties>
+      </component>
+      <component id="5ff91" class="javax.swing.JLabel" binding="dbPasswordLabel">
+        <constraints>
+          <grid row="2" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="8" fill="0" indent="0" use-parent-layout="false">
+            <preferred-size width="122" height="17"/>
+          </grid>
+        </constraints>
+        <properties>
+          <horizontalTextPosition value="11"/>
+          <labelFor value="a1b31"/>
+          <text value="Password"/>
+        </properties>
+      </component>
+      <component id="f795f" class="javax.swing.JButton" binding="submit">
+        <constraints>
+          <grid row="3" column="1" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="0" fill="1" indent="0" use-parent-layout="false"/>
+        </constraints>
+        <properties>
+          <text value="Next"/>
+        </properties>
+      </component>
+    </children>
+  </grid>
+</form>

modules/Neo4jPlugin/src/main/java/org/gephi/plugins/neo4j/ui/Connection.form

@@ -0,0 +1,13 @@
+package org.gephi.plugins.neo4j.ui;
+
+import javax.swing.*;
+
+public class Connection {
+    private JTextField dbUrl;
+    private JLabel dbUrlLabel;
+    private JTextField dbLogin;
+    private JPasswordField dbPassword;
+    private JLabel dbLoginLabel;
+    private JLabel dbPasswordLabel;
+    private JButton submit;
+}

modules/Neo4jPlugin/src/main/java/org/gephi/plugins/neo4j/ui/Connection.java

@@ -1,4 +1,4 @@
-package org.gephi.plugins.neo4j.test;
+package org.gephi.plugins.neo4j;
 
 import org.junit.AfterClass;
 import org.junit.BeforeClass;
@@ -11,26 +11,26 @@
 
 import java.util.Scanner;
 
-public class Neo4jIntegrationTest {
+public abstract class AbstractNeo4jIntegrationTest {
 
     @ClassRule
     public static Neo4jContainer<?> neo4j = new Neo4jContainer("neo4j:4.4");
 
     @BeforeClass
     public static void before() {
-        Neo4jIntegrationTest.neo4j.start();
+        AbstractNeo4jIntegrationTest.neo4j.start();
     }
 
     @AfterClass
     public static void after() {
-        Neo4jIntegrationTest.neo4j.stop();
+        AbstractNeo4jIntegrationTest.neo4j.stop();
     }
 
     /**
      * Retrieve the Neo4j driver instance for the running container.
      */
     public static Driver getNeo4jDriver() {
-        return GraphDatabase.driver(Neo4jIntegrationTest.neo4j.getBoltUrl(), AuthTokens.basic("neo4j", Neo4jIntegrationTest.neo4j.getAdminPassword()));
+        return GraphDatabase.driver(AbstractNeo4jIntegrationTest.neo4j.getBoltUrl(), AuthTokens.basic("neo4j", AbstractNeo4jIntegrationTest.neo4j.getAdminPassword()));
     }
 
     /**
@@ -40,12 +40,12 @@ public static void loadFile(String file) {
         // init db if needed
         if (file != null) {
             String query = "";
-            try (Scanner s = new Scanner(Neo4jIntegrationTest.class.getResourceAsStream(file)).useDelimiter("\\n")) {
+            try (Scanner s = new Scanner(AbstractNeo4jIntegrationTest.class.getResourceAsStream(file)).useDelimiter("\\n")) {
                 while (s.hasNext()) {
                     query += s.next() + "\n";
                 }
             }
-            Driver driver = Neo4jIntegrationTest.getNeo4jDriver();
+            Driver driver = AbstractNeo4jIntegrationTest.getNeo4jDriver();
             try (Session session = driver.session()) {
                 session.run(query);
             }

…ins/neo4j/test/Neo4jIntegrationTest.java …/neo4j/AbstractNeo4jIntegrationTest.javamodules/Neo4jPlugin/src/test/java/org/gephi/plugins/neo4j/test/Neo4jIntegrationTest.java renamed to modules/Neo4jPlugin/src/test/java/org/gephi/plugins/neo4j/AbstractNeo4jIntegrationTest.java modules/Neo4jPlugin/src/test/java/org/gephi/plugins/neo4j/test/Neo4jIntegrationTest.java renamed to modules/Neo4jPlugin/src/test/java/org/gephi/plugins/neo4j/AbstractNeo4jIntegrationTest.java

@@ -1,7 +1,7 @@
-package org.gephi.plugins.neo4j;
+package org.gephi.plugins.neo4j.importer;
 
 import org.gephi.io.importer.impl.ImportContainerImpl;
-import org.gephi.plugins.neo4j.test.Neo4jIntegrationTest;
+import org.gephi.plugins.neo4j.AbstractNeo4jIntegrationTest;
 import org.junit.BeforeClass;
 import org.junit.Test;
 import org.neo4j.driver.Result;
@@ -11,23 +11,23 @@
 
 import static org.junit.Assert.assertEquals;
 
-public class Neo4jDatabaseImporterTest extends Neo4jIntegrationTest {
+public class Neo4JDatabaseImporterTest extends AbstractNeo4jIntegrationTest {
 
     @BeforeClass
     public static void before() {
-        Neo4jDatabaseImporterTest.loadFile("/cypher/movie.cyp");
+        Neo4JDatabaseImporterTest.loadFile("/cypher/movie.cyp");
     }
 
     @Test
     public void import_full_database_should_work() {
         ImportContainerImpl container = new ImportContainerImpl();
 
         Neo4jDatabaseImporter importer = new Neo4jDatabaseImporter();
-        importer.setUrl(Neo4jDatabaseImporterTest.neo4j.getBoltUrl());
-        importer.setPasswd(Neo4jDatabaseImporterTest.neo4j.getAdminPassword());
+        importer.setUrl(Neo4JDatabaseImporterTest.neo4j.getBoltUrl());
+        importer.setPasswd(Neo4JDatabaseImporterTest.neo4j.getAdminPassword());
         importer.execute(container.getLoader());
 
-        try (Session session = Neo4jDatabaseImporterTest.getNeo4jDriver().session()) {
+        try (Session session = Neo4JDatabaseImporterTest.getNeo4jDriver().session()) {
             long nbNodes = session.readTransaction(tx -> {
                 Result rs = tx.run("MATCH (n) RETURN count(n)");
                 return rs.next().get(0).asLong();
@@ -47,13 +47,13 @@ public void import_by_node_and_edge_types_should_work() {
         ImportContainerImpl container = new ImportContainerImpl();
 
         Neo4jDatabaseImporter importer = new Neo4jDatabaseImporter();
-        importer.setUrl(Neo4jDatabaseImporterTest.neo4j.getBoltUrl());
-        importer.setPasswd(Neo4jDatabaseImporterTest.neo4j.getAdminPassword());
+        importer.setUrl(Neo4JDatabaseImporterTest.neo4j.getBoltUrl());
+        importer.setPasswd(Neo4JDatabaseImporterTest.neo4j.getAdminPassword());
         importer.setLabels(Arrays.asList("Person"));
         importer.setRelationshipTypes(Arrays.asList("FOLLOWS"));
         importer.execute(container.getLoader());
 
-        try (Session session = Neo4jDatabaseImporterTest.getNeo4jDriver().session()) {
+        try (Session session = Neo4JDatabaseImporterTest.getNeo4jDriver().session()) {
             long nbNodes = session.readTransaction(tx -> {
                 Result rs = tx.run("MATCH (n:Person) RETURN count(n)");
                 return rs.next().get(0).asLong();
@@ -73,12 +73,12 @@ public void import_by_node_types_should_work() {
         ImportContainerImpl container = new ImportContainerImpl();
 
         Neo4jDatabaseImporter importer = new Neo4jDatabaseImporter();
-        importer.setUrl(Neo4jDatabaseImporterTest.neo4j.getBoltUrl());
-        importer.setPasswd(Neo4jDatabaseImporterTest.neo4j.getAdminPassword());
+        importer.setUrl(Neo4JDatabaseImporterTest.neo4j.getBoltUrl());
+        importer.setPasswd(Neo4JDatabaseImporterTest.neo4j.getAdminPassword());
         importer.setLabels(Arrays.asList("Person"));
         importer.execute(container.getLoader());
 
-        try (Session session = Neo4jDatabaseImporterTest.getNeo4jDriver().session()) {
+        try (Session session = Neo4JDatabaseImporterTest.getNeo4jDriver().session()) {
             long nbNodes = session.readTransaction(tx -> {
                 Result rs = tx.run("MATCH (n:Person) RETURN count(n)");
                 return rs.next().get(0).asLong();
@@ -98,12 +98,12 @@ public void import_by_edge_types_should_work() {
         ImportContainerImpl container = new ImportContainerImpl();
 
         Neo4jDatabaseImporter importer = new Neo4jDatabaseImporter();
-        importer.setUrl(Neo4jDatabaseImporterTest.neo4j.getBoltUrl());
-        importer.setPasswd(Neo4jDatabaseImporterTest.neo4j.getAdminPassword());
+        importer.setUrl(Neo4JDatabaseImporterTest.neo4j.getBoltUrl());
+        importer.setPasswd(Neo4JDatabaseImporterTest.neo4j.getAdminPassword());
         importer.setRelationshipTypes(Arrays.asList("FOLLOWS"));
         importer.execute(container.getLoader());
 
-        try (Session session = Neo4jDatabaseImporterTest.getNeo4jDriver().session()) {
+        try (Session session = Neo4JDatabaseImporterTest.getNeo4jDriver().session()) {
             long nbNodes = session.readTransaction(tx -> {
                 Result rs = tx.run("MATCH (n) RETURN count(n)");
                 return rs.next().get(0).asLong();
@@ -124,13 +124,13 @@ public void import_by_nodes_and_edge_queries_should_work() {
         System.out.println(container.getNodeCount());
 
         Neo4jDatabaseImporter importer = new Neo4jDatabaseImporter();
-        importer.setUrl(Neo4jDatabaseImporterTest.neo4j.getBoltUrl());
-        importer.setPasswd(Neo4jDatabaseImporterTest.neo4j.getAdminPassword());
+        importer.setUrl(Neo4JDatabaseImporterTest.neo4j.getBoltUrl());
+        importer.setPasswd(Neo4JDatabaseImporterTest.neo4j.getAdminPassword());
         importer.setNodeQuery("MATCH (n:Person) RETURN id(n) AS id, n.name AS label");
         importer.setEdgeQuery("MATCH (n:Person)-[:ACTED_IN]->(m:Movie)<-[:ACTED_IN]-(m:Person) WHERE id(n) < id(m) RETURN  id(n) + '-'+ id(m) AS id, id(n) AS sourceId, id(m) AS targetId, count(m) AS weight");
         importer.execute(container.getLoader());
 
-        try (Session session = Neo4jDatabaseImporterTest.getNeo4jDriver().session()) {
+        try (Session session = Neo4JDatabaseImporterTest.getNeo4jDriver().session()) {
             long nbNodes = session.readTransaction(tx -> {
                 Result rs = tx.run("MATCH (n:Person) RETURN count(n)");
                 return rs.next().get(0).asLong();