move neo4j from previous merge to new structure

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>
 

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>

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>

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>

nb-apis/adapters-api/src/main/java/io/nosqlbench/adapters/api/evalctx/CycleFunctions.java

@@ -21,10 +21,10 @@ import java.util.function.BinaryOperator;
 
 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 class CycleFunctions {
         }
 
         @Override
-        public <V> void setVariable(String name, V value) {
+        public <VT> void setVariable(String name, VT value) {
         }
 
         @Override