move neo4j from previous merge to new structure

nosqlbench · Apr 12, 2024 · 0046230 · 0046230
1 parent 99636f3
commit 0046230
Show file tree

Hide file tree

Showing 24 changed files with 29 additions and 5 deletions.
diff --git a/nb-adapters/adapter-http/pom.xml b/nb-adapters/adapter-http/pom.xml
@@ -72,7 +72,7 @@
         <dependency>
             <groupId>io.swagger.core.v3</groupId>
             <artifactId>swagger-core</artifactId>
-            <version>2.2.20</version>
+            <version>2.2.21</version>
         </dependency>
     </dependencies>
 

diff --git a/adapter-neo4j/pom.xml → nb-adapters/adapter-neo4j/pom.xml b/adapter-neo4j/pom.xml → nb-adapters/adapter-neo4j/pom.xml
@@ -25,7 +25,7 @@
         <artifactId>mvn-defaults</artifactId>
         <groupId>io.nosqlbench</groupId>
         <version>${revision}</version>
-        <relativePath>../mvn-defaults</relativePath>
+        <relativePath>../../mvn-defaults</relativePath>
     </parent>
 
     <name>${project.artifactId}</name>

diff --git a/...ench/adapter/neo4j/Neo4JAdapterUtils.java → ...ench/adapter/neo4j/Neo4JAdapterUtils.java b/...ench/adapter/neo4j/Neo4JAdapterUtils.java → ...ench/adapter/neo4j/Neo4JAdapterUtils.java
diff --git a/...nch/adapter/neo4j/Neo4JDriverAdapter.java → ...nch/adapter/neo4j/Neo4JDriverAdapter.java b/...nch/adapter/neo4j/Neo4JDriverAdapter.java → ...nch/adapter/neo4j/Neo4JDriverAdapter.java
diff --git a/...apter/neo4j/Neo4JDriverAdapterLoader.java → ...apter/neo4j/Neo4JDriverAdapterLoader.java b/...apter/neo4j/Neo4JDriverAdapterLoader.java → ...apter/neo4j/Neo4JDriverAdapterLoader.java
diff --git a/...sqlbench/adapter/neo4j/Neo4JOpMapper.java → ...sqlbench/adapter/neo4j/Neo4JOpMapper.java b/...sqlbench/adapter/neo4j/Neo4JOpMapper.java → ...sqlbench/adapter/neo4j/Neo4JOpMapper.java
diff --git a/.../nosqlbench/adapter/neo4j/Neo4JSpace.java → .../nosqlbench/adapter/neo4j/Neo4JSpace.java b/.../nosqlbench/adapter/neo4j/Neo4JSpace.java → .../nosqlbench/adapter/neo4j/Neo4JSpace.java
diff --git a/...ispensers/Neo4JAutoCommitOpDispenser.java → ...ispensers/Neo4JAutoCommitOpDispenser.java b/...ispensers/Neo4JAutoCommitOpDispenser.java → ...ispensers/Neo4JAutoCommitOpDispenser.java
diff --git a/...4j/opdispensers/Neo4JBaseOpDispenser.java → ...4j/opdispensers/Neo4JBaseOpDispenser.java b/...4j/opdispensers/Neo4JBaseOpDispenser.java → ...4j/opdispensers/Neo4JBaseOpDispenser.java
diff --git a/...opdispensers/Neo4JReadTxnOpDispenser.java → ...opdispensers/Neo4JReadTxnOpDispenser.java b/...opdispensers/Neo4JReadTxnOpDispenser.java → ...opdispensers/Neo4JReadTxnOpDispenser.java
diff --git a/...pdispensers/Neo4JWriteTxnOpDispenser.java → ...pdispensers/Neo4JWriteTxnOpDispenser.java b/...pdispensers/Neo4JWriteTxnOpDispenser.java → ...pdispensers/Neo4JWriteTxnOpDispenser.java
diff --git a/...apter/neo4j/ops/NBExecutionException.java → ...apter/neo4j/ops/NBExecutionException.java b/...apter/neo4j/ops/NBExecutionException.java → ...apter/neo4j/ops/NBExecutionException.java
diff --git a/...ter/neo4j/ops/NBInterruptedException.java → ...ter/neo4j/ops/NBInterruptedException.java b/...ter/neo4j/ops/NBInterruptedException.java → ...ter/neo4j/ops/NBInterruptedException.java
diff --git a/...adapter/neo4j/ops/NBTimeoutException.java → ...adapter/neo4j/ops/NBTimeoutException.java b/...adapter/neo4j/ops/NBTimeoutException.java → ...adapter/neo4j/ops/NBTimeoutException.java
diff --git a/.../adapter/neo4j/ops/Neo4JAutoCommitOp.java → .../adapter/neo4j/ops/Neo4JAutoCommitOp.java b/.../adapter/neo4j/ops/Neo4JAutoCommitOp.java → .../adapter/neo4j/ops/Neo4JAutoCommitOp.java
diff --git a/...lbench/adapter/neo4j/ops/Neo4JBaseOp.java → ...lbench/adapter/neo4j/ops/Neo4JBaseOp.java b/...lbench/adapter/neo4j/ops/Neo4JBaseOp.java → ...lbench/adapter/neo4j/ops/Neo4JBaseOp.java
diff --git a/...nch/adapter/neo4j/ops/Neo4JReadTxnOp.java → ...nch/adapter/neo4j/ops/Neo4JReadTxnOp.java b/...nch/adapter/neo4j/ops/Neo4JReadTxnOp.java → ...nch/adapter/neo4j/ops/Neo4JReadTxnOp.java
diff --git a/...ch/adapter/neo4j/ops/Neo4JWriteTxnOp.java → ...ch/adapter/neo4j/ops/Neo4JWriteTxnOp.java b/...ch/adapter/neo4j/ops/Neo4JWriteTxnOp.java → ...ch/adapter/neo4j/ops/Neo4JWriteTxnOp.java
diff --git a/...ench/adapter/neo4j/types/Neo4JOpType.java → ...ench/adapter/neo4j/types/Neo4JOpType.java b/...ench/adapter/neo4j/types/Neo4JOpType.java → ...ench/adapter/neo4j/types/Neo4JOpType.java
diff --git a/.../src/main/resources/activities/neo4j.yaml → .../src/main/resources/activities/neo4j.yaml b/.../src/main/resources/activities/neo4j.yaml → .../src/main/resources/activities/neo4j.yaml
diff --git a/adapter-neo4j/src/main/resources/neo4j.md → ...adapter-neo4j/src/main/resources/neo4j.md b/adapter-neo4j/src/main/resources/neo4j.md → ...adapter-neo4j/src/main/resources/neo4j.md
diff --git a/nb-adapters/nb-adapters-included/pom.xml b/nb-adapters/nb-adapters-included/pom.xml
@@ -197,6 +197,20 @@
             </dependencies>
         </profile>
 
+        <profile>
+            <id>adapter-neo4j-include</id>
+            <activation>
+                <activeByDefault>true</activeByDefault>
+            </activation>
+            <dependencies>
+                <dependency>
+                    <groupId>io.nosqlbench</groupId>
+                    <artifactId>adapter-neo4j</artifactId>
+                    <version>${revision}</version>
+                </dependency>
+            </dependencies>
+        </profile>
+
         <profile>
             <id>adapter-kafka-include</id>
             <activation>

diff --git a/nb-adapters/pom.xml b/nb-adapters/pom.xml
@@ -124,6 +124,16 @@
             </modules>
         </profile>
 
+        <profile>
+            <id>adapter-neo4j-module</id>
+            <activation>
+                <activeByDefault>true</activeByDefault>
+            </activation>
+            <modules>
+                <module>adapter-neo4j</module>
+            </modules>
+        </profile>
+
         <profile>
             <id>adapter-pulsar-module</id>
             <activation>

diff --git a/nb-apis/adapters-api/src/main/java/io/nosqlbench/adapters/api/evalctx/CycleFunctions.java b/nb-apis/adapters-api/src/main/java/io/nosqlbench/adapters/api/evalctx/CycleFunctions.java
@@ -21,10 +21,10 @@
 
 public class CycleFunctions {
     public static <T> CycleFunction<T> of(BinaryOperator<T> reducer, List<CycleFunction<T>> verifiers, T defaultResult) {
-        if (verifiers.size()==0) {
+        if (verifiers.isEmpty()) {
             return new NOOPVerifier<>(defaultResult);
         } else if (verifiers.size()==1) {
-            return verifiers.get(0);
+            return verifiers.getFirst();
         } else {
             return new CompoundCycleFunction<>(reducer, verifiers);
         }
@@ -53,7 +53,7 @@ public String getExpressionDetails() {
         }
 
         @Override
-        public <V> void setVariable(String name, V value) {
+        public <VT> void setVariable(String name, VT value) {
         }
 
         @Override