package refactoring

adapter-cqld4/src/main/java/io/nosqlbench/adapter/cqld4/Cqld4Space.java

@@ -29,7 +29,6 @@ import com.google.gson.GsonBuilder;
 import io.nosqlbench.adapter.cqld4.optionhelpers.OptionHelpers;
 import io.nosqlbench.api.config.standard.*;
 import io.nosqlbench.api.engine.util.SSLKsFactory;
-import io.nosqlbench.nb.api.config.standard.*;
 import io.nosqlbench.api.content.Content;
 import io.nosqlbench.api.content.NBIO;
 import io.nosqlbench.api.errors.BasicError;

adapter-cqld4/src/main/java/io/nosqlbench/adapter/cqld4/opmappers/Cqld4CoreOpMapper.java

@@ -18,6 +18,7 @@ package io.nosqlbench.adapter.cqld4.opmappers;
 
 import com.datastax.oss.driver.api.core.CqlSession;
 import io.nosqlbench.adapter.cqld4.Cqld4Space;
+import io.nosqlbench.api.config.standard.NBConfiguration;
 import io.nosqlbench.engine.api.activityimpl.OpDispenser;
 import io.nosqlbench.engine.api.activityimpl.OpMapper;
 import io.nosqlbench.engine.api.activityimpl.uniform.DriverAdapter;
@@ -25,12 +26,14 @@ import io.nosqlbench.engine.api.activityimpl.uniform.DriverSpaceCache;
 import io.nosqlbench.engine.api.activityimpl.uniform.flowtypes.Op;
 import io.nosqlbench.engine.api.templating.ParsedOp;
 import io.nosqlbench.engine.api.templating.TypeAndTarget;
-import io.nosqlbench.api.config.standard.NBConfiguration;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 
 import java.util.function.LongFunction;
 
 public class Cqld4CoreOpMapper implements OpMapper<Op> {
 
+    private final static Logger logger = LogManager.getLogger(Cqld4CoreOpMapper.class);
 
     private final DriverSpaceCache<? extends Cqld4Space> cache;
     private final NBConfiguration cfg;
@@ -63,6 +66,8 @@ public class Cqld4CoreOpMapper implements OpMapper<Op> {
 
         TypeAndTarget<CqlD4OpType, String> target = op.getTypeAndTarget(CqlD4OpType.class, String.class, "type", "stmt");
 
+        logger.info("Using " + target.enumId + " statement form for '" + op.getName());
+
         return switch (target.enumId) {
             case raw -> new CqlD4RawStmtMapper(adapter, sessionFunc, target.targetFunction).apply(op);
             case simple -> new CqlD4CqlSimpleStmtMapper(adapter, sessionFunc, target.targetFunction).apply(op);

adapter-cqld4/src/main/java/io/nosqlbench/adapter/cqld4/optionhelpers/OptionHelpers.java

@@ -23,7 +23,6 @@ import com.datastax.oss.driver.api.core.config.TypedDriverOption;
 import com.datastax.oss.driver.internal.core.connection.ExponentialReconnectionPolicy;
 import com.datastax.oss.driver.internal.core.specex.ConstantSpeculativeExecutionPolicy;
 import io.nosqlbench.api.config.standard.*;
-import io.nosqlbench.nb.api.config.standard.*;
 import io.nosqlbench.api.errors.BasicError;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;

adapter-cqld4/src/main/java/io/nosqlbench/converters/cql/cqlast/CqlModel.java

@@ -31,7 +31,7 @@ public class CqlModel {
     transient CqlType udt;
 
     public boolean hasStats() {
-        return keyspaces.size()>0 && keyspaces.values().iterator().next().keyspaceAttributes!=null;
+        return keyspaces.size()>0 && keyspaces.values().iterator().next().getKeyspaceAttributes().size()!=0;
     }
     public CqlModel(Supplier<List<String>> errorSource) {
         this.errors = errorSource;

adapter-diag/src/main/java/io/nosqlbench/adapter/diag/optasks/DiagTask_diagrate.java

@@ -21,7 +21,6 @@ import io.nosqlbench.engine.api.activityapi.ratelimits.RateLimiter;
 import io.nosqlbench.engine.api.activityapi.ratelimits.RateLimiters;
 import io.nosqlbench.engine.api.activityapi.ratelimits.RateSpec;
 import io.nosqlbench.nb.annotations.Service;
-import io.nosqlbench.nb.api.config.standard.*;
 
 import java.util.Map;
 

adapter-diag/src/main/java/io/nosqlbench/adapter/diag/optasks/DiagTask_log.java

@@ -18,7 +18,6 @@ package io.nosqlbench.adapter.diag.optasks;
 
 import io.nosqlbench.api.config.standard.*;
 import io.nosqlbench.nb.annotations.Service;
-import io.nosqlbench.nb.api.config.standard.*;
 import org.apache.logging.log4j.Level;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;

adapter-dynamodb/src/main/java/io/nosqlbench/adapter/dynamodb/DynamoDBSpace.java

@@ -25,7 +25,6 @@ import io.nosqlbench.api.config.standard.ConfigModel;
 import io.nosqlbench.api.config.standard.NBConfigModel;
 import io.nosqlbench.api.config.standard.NBConfiguration;
 import io.nosqlbench.api.config.standard.Param;
-import io.nosqlbench.nb.api.config.standard.*;
 import io.nosqlbench.api.errors.OpConfigError;
 
 import java.util.Optional;

adapters-api/src/main/java/io/nosqlbench/engine/api/activityimpl/uniform/BaseDriverAdapter.java

@@ -19,7 +19,6 @@ package io.nosqlbench.engine.api.activityimpl.uniform;
 import io.nosqlbench.api.config.standard.*;
 import io.nosqlbench.engine.api.activityimpl.uniform.fieldmappers.FieldDestructuringMapper;
 import io.nosqlbench.engine.api.activityimpl.uniform.flowtypes.Op;
-import io.nosqlbench.nb.api.config.standard.*;
 
 import java.util.ArrayList;
 import java.util.List;

driver-jmx/src/main/java/io/nosqlbench/adapter/jmx/JMXSpace.java

@@ -17,7 +17,6 @@
 package io.nosqlbench.adapter.jmx;
 
 import io.nosqlbench.engine.api.util.SSLKsFactory;
-import io.nosqlbench.nb.api.config.standard.*;
 import io.nosqlbench.nb.api.errors.OpConfigError;
 
 import javax.management.remote.JMXConnector;

driver-jmx/src/test/java/io/nosqlbench/driver/jmx/JMXSpace.java

@@ -18,7 +18,6 @@ package io.nosqlbench.driver.jmx;
 
 import io.nosqlbench.adapter.jmx.SecureUtils;
 import io.nosqlbench.engine.api.util.SSLKsFactory;
-import io.nosqlbench.nb.api.config.standard.*;
 import io.nosqlbench.nb.api.errors.OpConfigError;
 
 import javax.management.remote.JMXConnector;

engine-api/src/main/java/io/nosqlbench/engine/api/activityimpl/uniform/StandardActivity.java

@@ -29,7 +29,6 @@ import io.nosqlbench.engine.api.activityimpl.uniform.decorators.SyntheticOpTempl
 import io.nosqlbench.engine.api.activityimpl.uniform.flowtypes.Op;
 import io.nosqlbench.engine.api.templating.ParsedOp;
 import io.nosqlbench.nb.annotations.ServiceSelector;
-import io.nosqlbench.nb.api.config.standard.*;
 import io.nosqlbench.api.errors.OpConfigError;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;

engine-core/src/main/java/io/nosqlbench/engine/core/metrics/LoggingAnnotator.java

@@ -20,7 +20,6 @@ import io.nosqlbench.api.config.standard.*;
 import io.nosqlbench.nb.annotations.Service;
 import io.nosqlbench.api.annotations.Annotation;
 import io.nosqlbench.api.annotations.Annotator;
-import io.nosqlbench.nb.api.config.standard.*;
 import org.apache.logging.log4j.Level;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;

nb-api/src/main/java/io/nosqlbench/api/engine/util/SSLKsFactory.java

@@ -17,7 +17,6 @@
 package io.nosqlbench.api.engine.util;
 
 import io.nosqlbench.api.config.standard.*;
-import io.nosqlbench.nb.api.config.standard.*;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 

nb-api/src/main/java/io/nosqlbench/api/system/NBEnvironment.java

@@ -58,7 +58,7 @@ public class NBEnvironment {
     public static final String NBLIBS = "NBLIBDIR";
 
     // package private for testing
-    NBEnvironment() {
+    public NBEnvironment() {
     }
 
     public final static NBEnvironment INSTANCE = new NBEnvironment();