From 0046230abf1701928b78e67abe3c3f7801661bad Mon Sep 17 00:00:00 2001 From: Jonathan Shook Date: Fri, 12 Apr 2024 11:08:48 -0500 Subject: [PATCH] move neo4j from previous merge to new structure --- nb-adapters/adapter-http/pom.xml | 2 +- .../adapter-neo4j}/pom.xml | 2 +- .../adapter/neo4j/Neo4JAdapterUtils.java | 0 .../adapter/neo4j/Neo4JDriverAdapter.java | 0 .../adapter/neo4j/Neo4JDriverAdapterLoader.java | 0 .../io/nosqlbench/adapter/neo4j/Neo4JOpMapper.java | 0 .../io/nosqlbench/adapter/neo4j/Neo4JSpace.java | 0 .../opdispensers/Neo4JAutoCommitOpDispenser.java | 0 .../neo4j/opdispensers/Neo4JBaseOpDispenser.java | 0 .../opdispensers/Neo4JReadTxnOpDispenser.java | 0 .../opdispensers/Neo4JWriteTxnOpDispenser.java | 0 .../adapter/neo4j/ops/NBExecutionException.java | 0 .../adapter/neo4j/ops/NBInterruptedException.java | 0 .../adapter/neo4j/ops/NBTimeoutException.java | 0 .../adapter/neo4j/ops/Neo4JAutoCommitOp.java | 0 .../nosqlbench/adapter/neo4j/ops/Neo4JBaseOp.java | 0 .../adapter/neo4j/ops/Neo4JReadTxnOp.java | 0 .../adapter/neo4j/ops/Neo4JWriteTxnOp.java | 0 .../adapter/neo4j/types/Neo4JOpType.java | 0 .../src/main/resources/activities/neo4j.yaml | 0 .../adapter-neo4j}/src/main/resources/neo4j.md | 0 nb-adapters/nb-adapters-included/pom.xml | 14 ++++++++++++++ nb-adapters/pom.xml | 10 ++++++++++ .../adapters/api/evalctx/CycleFunctions.java | 6 +++--- 24 files changed, 29 insertions(+), 5 deletions(-) rename {adapter-neo4j => nb-adapters/adapter-neo4j}/pom.xml (97%) rename {adapter-neo4j => nb-adapters/adapter-neo4j}/src/main/java/io/nosqlbench/adapter/neo4j/Neo4JAdapterUtils.java (100%) rename {adapter-neo4j => nb-adapters/adapter-neo4j}/src/main/java/io/nosqlbench/adapter/neo4j/Neo4JDriverAdapter.java (100%) rename {adapter-neo4j => nb-adapters/adapter-neo4j}/src/main/java/io/nosqlbench/adapter/neo4j/Neo4JDriverAdapterLoader.java (100%) rename {adapter-neo4j => nb-adapters/adapter-neo4j}/src/main/java/io/nosqlbench/adapter/neo4j/Neo4JOpMapper.java (100%) rename {adapter-neo4j => nb-adapters/adapter-neo4j}/src/main/java/io/nosqlbench/adapter/neo4j/Neo4JSpace.java (100%) rename {adapter-neo4j => nb-adapters/adapter-neo4j}/src/main/java/io/nosqlbench/adapter/neo4j/opdispensers/Neo4JAutoCommitOpDispenser.java (100%) rename {adapter-neo4j => nb-adapters/adapter-neo4j}/src/main/java/io/nosqlbench/adapter/neo4j/opdispensers/Neo4JBaseOpDispenser.java (100%) rename {adapter-neo4j => nb-adapters/adapter-neo4j}/src/main/java/io/nosqlbench/adapter/neo4j/opdispensers/Neo4JReadTxnOpDispenser.java (100%) rename {adapter-neo4j => nb-adapters/adapter-neo4j}/src/main/java/io/nosqlbench/adapter/neo4j/opdispensers/Neo4JWriteTxnOpDispenser.java (100%) rename {adapter-neo4j => nb-adapters/adapter-neo4j}/src/main/java/io/nosqlbench/adapter/neo4j/ops/NBExecutionException.java (100%) rename {adapter-neo4j => nb-adapters/adapter-neo4j}/src/main/java/io/nosqlbench/adapter/neo4j/ops/NBInterruptedException.java (100%) rename {adapter-neo4j => nb-adapters/adapter-neo4j}/src/main/java/io/nosqlbench/adapter/neo4j/ops/NBTimeoutException.java (100%) rename {adapter-neo4j => nb-adapters/adapter-neo4j}/src/main/java/io/nosqlbench/adapter/neo4j/ops/Neo4JAutoCommitOp.java (100%) rename {adapter-neo4j => nb-adapters/adapter-neo4j}/src/main/java/io/nosqlbench/adapter/neo4j/ops/Neo4JBaseOp.java (100%) rename {adapter-neo4j => nb-adapters/adapter-neo4j}/src/main/java/io/nosqlbench/adapter/neo4j/ops/Neo4JReadTxnOp.java (100%) rename {adapter-neo4j => nb-adapters/adapter-neo4j}/src/main/java/io/nosqlbench/adapter/neo4j/ops/Neo4JWriteTxnOp.java (100%) rename {adapter-neo4j => nb-adapters/adapter-neo4j}/src/main/java/io/nosqlbench/adapter/neo4j/types/Neo4JOpType.java (100%) rename {adapter-neo4j => nb-adapters/adapter-neo4j}/src/main/resources/activities/neo4j.yaml (100%) rename {adapter-neo4j => nb-adapters/adapter-neo4j}/src/main/resources/neo4j.md (100%) diff --git a/nb-adapters/adapter-http/pom.xml b/nb-adapters/adapter-http/pom.xml index 1e82188e44..7aae14da42 100644 --- a/nb-adapters/adapter-http/pom.xml +++ b/nb-adapters/adapter-http/pom.xml @@ -72,7 +72,7 @@ io.swagger.core.v3 swagger-core - 2.2.20 + 2.2.21 diff --git a/adapter-neo4j/pom.xml b/nb-adapters/adapter-neo4j/pom.xml similarity index 97% rename from adapter-neo4j/pom.xml rename to nb-adapters/adapter-neo4j/pom.xml index 94bbdee00a..0e453cb049 100644 --- a/adapter-neo4j/pom.xml +++ b/nb-adapters/adapter-neo4j/pom.xml @@ -25,7 +25,7 @@ mvn-defaults io.nosqlbench ${revision} - ../mvn-defaults + ../../mvn-defaults ${project.artifactId} diff --git a/adapter-neo4j/src/main/java/io/nosqlbench/adapter/neo4j/Neo4JAdapterUtils.java b/nb-adapters/adapter-neo4j/src/main/java/io/nosqlbench/adapter/neo4j/Neo4JAdapterUtils.java similarity index 100% rename from adapter-neo4j/src/main/java/io/nosqlbench/adapter/neo4j/Neo4JAdapterUtils.java rename to nb-adapters/adapter-neo4j/src/main/java/io/nosqlbench/adapter/neo4j/Neo4JAdapterUtils.java diff --git a/adapter-neo4j/src/main/java/io/nosqlbench/adapter/neo4j/Neo4JDriverAdapter.java b/nb-adapters/adapter-neo4j/src/main/java/io/nosqlbench/adapter/neo4j/Neo4JDriverAdapter.java similarity index 100% rename from adapter-neo4j/src/main/java/io/nosqlbench/adapter/neo4j/Neo4JDriverAdapter.java rename to nb-adapters/adapter-neo4j/src/main/java/io/nosqlbench/adapter/neo4j/Neo4JDriverAdapter.java diff --git a/adapter-neo4j/src/main/java/io/nosqlbench/adapter/neo4j/Neo4JDriverAdapterLoader.java b/nb-adapters/adapter-neo4j/src/main/java/io/nosqlbench/adapter/neo4j/Neo4JDriverAdapterLoader.java similarity index 100% rename from adapter-neo4j/src/main/java/io/nosqlbench/adapter/neo4j/Neo4JDriverAdapterLoader.java rename to nb-adapters/adapter-neo4j/src/main/java/io/nosqlbench/adapter/neo4j/Neo4JDriverAdapterLoader.java diff --git a/adapter-neo4j/src/main/java/io/nosqlbench/adapter/neo4j/Neo4JOpMapper.java b/nb-adapters/adapter-neo4j/src/main/java/io/nosqlbench/adapter/neo4j/Neo4JOpMapper.java similarity index 100% rename from adapter-neo4j/src/main/java/io/nosqlbench/adapter/neo4j/Neo4JOpMapper.java rename to nb-adapters/adapter-neo4j/src/main/java/io/nosqlbench/adapter/neo4j/Neo4JOpMapper.java diff --git a/adapter-neo4j/src/main/java/io/nosqlbench/adapter/neo4j/Neo4JSpace.java b/nb-adapters/adapter-neo4j/src/main/java/io/nosqlbench/adapter/neo4j/Neo4JSpace.java similarity index 100% rename from adapter-neo4j/src/main/java/io/nosqlbench/adapter/neo4j/Neo4JSpace.java rename to nb-adapters/adapter-neo4j/src/main/java/io/nosqlbench/adapter/neo4j/Neo4JSpace.java diff --git a/adapter-neo4j/src/main/java/io/nosqlbench/adapter/neo4j/opdispensers/Neo4JAutoCommitOpDispenser.java b/nb-adapters/adapter-neo4j/src/main/java/io/nosqlbench/adapter/neo4j/opdispensers/Neo4JAutoCommitOpDispenser.java similarity index 100% rename from adapter-neo4j/src/main/java/io/nosqlbench/adapter/neo4j/opdispensers/Neo4JAutoCommitOpDispenser.java rename to nb-adapters/adapter-neo4j/src/main/java/io/nosqlbench/adapter/neo4j/opdispensers/Neo4JAutoCommitOpDispenser.java diff --git a/adapter-neo4j/src/main/java/io/nosqlbench/adapter/neo4j/opdispensers/Neo4JBaseOpDispenser.java b/nb-adapters/adapter-neo4j/src/main/java/io/nosqlbench/adapter/neo4j/opdispensers/Neo4JBaseOpDispenser.java similarity index 100% rename from adapter-neo4j/src/main/java/io/nosqlbench/adapter/neo4j/opdispensers/Neo4JBaseOpDispenser.java rename to nb-adapters/adapter-neo4j/src/main/java/io/nosqlbench/adapter/neo4j/opdispensers/Neo4JBaseOpDispenser.java diff --git a/adapter-neo4j/src/main/java/io/nosqlbench/adapter/neo4j/opdispensers/Neo4JReadTxnOpDispenser.java b/nb-adapters/adapter-neo4j/src/main/java/io/nosqlbench/adapter/neo4j/opdispensers/Neo4JReadTxnOpDispenser.java similarity index 100% rename from adapter-neo4j/src/main/java/io/nosqlbench/adapter/neo4j/opdispensers/Neo4JReadTxnOpDispenser.java rename to nb-adapters/adapter-neo4j/src/main/java/io/nosqlbench/adapter/neo4j/opdispensers/Neo4JReadTxnOpDispenser.java diff --git a/adapter-neo4j/src/main/java/io/nosqlbench/adapter/neo4j/opdispensers/Neo4JWriteTxnOpDispenser.java b/nb-adapters/adapter-neo4j/src/main/java/io/nosqlbench/adapter/neo4j/opdispensers/Neo4JWriteTxnOpDispenser.java similarity index 100% rename from adapter-neo4j/src/main/java/io/nosqlbench/adapter/neo4j/opdispensers/Neo4JWriteTxnOpDispenser.java rename to nb-adapters/adapter-neo4j/src/main/java/io/nosqlbench/adapter/neo4j/opdispensers/Neo4JWriteTxnOpDispenser.java diff --git a/adapter-neo4j/src/main/java/io/nosqlbench/adapter/neo4j/ops/NBExecutionException.java b/nb-adapters/adapter-neo4j/src/main/java/io/nosqlbench/adapter/neo4j/ops/NBExecutionException.java similarity index 100% rename from adapter-neo4j/src/main/java/io/nosqlbench/adapter/neo4j/ops/NBExecutionException.java rename to nb-adapters/adapter-neo4j/src/main/java/io/nosqlbench/adapter/neo4j/ops/NBExecutionException.java diff --git a/adapter-neo4j/src/main/java/io/nosqlbench/adapter/neo4j/ops/NBInterruptedException.java b/nb-adapters/adapter-neo4j/src/main/java/io/nosqlbench/adapter/neo4j/ops/NBInterruptedException.java similarity index 100% rename from adapter-neo4j/src/main/java/io/nosqlbench/adapter/neo4j/ops/NBInterruptedException.java rename to nb-adapters/adapter-neo4j/src/main/java/io/nosqlbench/adapter/neo4j/ops/NBInterruptedException.java diff --git a/adapter-neo4j/src/main/java/io/nosqlbench/adapter/neo4j/ops/NBTimeoutException.java b/nb-adapters/adapter-neo4j/src/main/java/io/nosqlbench/adapter/neo4j/ops/NBTimeoutException.java similarity index 100% rename from adapter-neo4j/src/main/java/io/nosqlbench/adapter/neo4j/ops/NBTimeoutException.java rename to nb-adapters/adapter-neo4j/src/main/java/io/nosqlbench/adapter/neo4j/ops/NBTimeoutException.java diff --git a/adapter-neo4j/src/main/java/io/nosqlbench/adapter/neo4j/ops/Neo4JAutoCommitOp.java b/nb-adapters/adapter-neo4j/src/main/java/io/nosqlbench/adapter/neo4j/ops/Neo4JAutoCommitOp.java similarity index 100% rename from adapter-neo4j/src/main/java/io/nosqlbench/adapter/neo4j/ops/Neo4JAutoCommitOp.java rename to nb-adapters/adapter-neo4j/src/main/java/io/nosqlbench/adapter/neo4j/ops/Neo4JAutoCommitOp.java diff --git a/adapter-neo4j/src/main/java/io/nosqlbench/adapter/neo4j/ops/Neo4JBaseOp.java b/nb-adapters/adapter-neo4j/src/main/java/io/nosqlbench/adapter/neo4j/ops/Neo4JBaseOp.java similarity index 100% rename from adapter-neo4j/src/main/java/io/nosqlbench/adapter/neo4j/ops/Neo4JBaseOp.java rename to nb-adapters/adapter-neo4j/src/main/java/io/nosqlbench/adapter/neo4j/ops/Neo4JBaseOp.java diff --git a/adapter-neo4j/src/main/java/io/nosqlbench/adapter/neo4j/ops/Neo4JReadTxnOp.java b/nb-adapters/adapter-neo4j/src/main/java/io/nosqlbench/adapter/neo4j/ops/Neo4JReadTxnOp.java similarity index 100% rename from adapter-neo4j/src/main/java/io/nosqlbench/adapter/neo4j/ops/Neo4JReadTxnOp.java rename to nb-adapters/adapter-neo4j/src/main/java/io/nosqlbench/adapter/neo4j/ops/Neo4JReadTxnOp.java diff --git a/adapter-neo4j/src/main/java/io/nosqlbench/adapter/neo4j/ops/Neo4JWriteTxnOp.java b/nb-adapters/adapter-neo4j/src/main/java/io/nosqlbench/adapter/neo4j/ops/Neo4JWriteTxnOp.java similarity index 100% rename from adapter-neo4j/src/main/java/io/nosqlbench/adapter/neo4j/ops/Neo4JWriteTxnOp.java rename to nb-adapters/adapter-neo4j/src/main/java/io/nosqlbench/adapter/neo4j/ops/Neo4JWriteTxnOp.java diff --git a/adapter-neo4j/src/main/java/io/nosqlbench/adapter/neo4j/types/Neo4JOpType.java b/nb-adapters/adapter-neo4j/src/main/java/io/nosqlbench/adapter/neo4j/types/Neo4JOpType.java similarity index 100% rename from adapter-neo4j/src/main/java/io/nosqlbench/adapter/neo4j/types/Neo4JOpType.java rename to nb-adapters/adapter-neo4j/src/main/java/io/nosqlbench/adapter/neo4j/types/Neo4JOpType.java diff --git a/adapter-neo4j/src/main/resources/activities/neo4j.yaml b/nb-adapters/adapter-neo4j/src/main/resources/activities/neo4j.yaml similarity index 100% rename from adapter-neo4j/src/main/resources/activities/neo4j.yaml rename to nb-adapters/adapter-neo4j/src/main/resources/activities/neo4j.yaml diff --git a/adapter-neo4j/src/main/resources/neo4j.md b/nb-adapters/adapter-neo4j/src/main/resources/neo4j.md similarity index 100% rename from adapter-neo4j/src/main/resources/neo4j.md rename to nb-adapters/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 index f2dbd346aa..5c108177c6 100644 --- a/nb-adapters/nb-adapters-included/pom.xml +++ b/nb-adapters/nb-adapters-included/pom.xml @@ -197,6 +197,20 @@ + + adapter-neo4j-include + + true + + + + io.nosqlbench + adapter-neo4j + ${revision} + + + + adapter-kafka-include diff --git a/nb-adapters/pom.xml b/nb-adapters/pom.xml index 193ae67b6b..08af473e8a 100644 --- a/nb-adapters/pom.xml +++ b/nb-adapters/pom.xml @@ -124,6 +124,16 @@ + + adapter-neo4j-module + + true + + + adapter-neo4j + + + adapter-pulsar-module 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 index 80cc2a7c7f..886fe09da0 100644 --- 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 CycleFunction of(BinaryOperator reducer, List> 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 void setVariable(String name, V value) { + public void setVariable(String name, VT value) { } @Override