updated package structure

activitytype-cql/pom.xml

@@ -31,20 +31,6 @@
             <version>3.12.3-SNAPSHOT</version>
         </dependency>
 
-<!--        <dependency>-->
-<!--            <groupId>com.datastax.labs</groupId>-->
-<!--            <artifactId>dsbench-virtdata</artifactId>-->
-<!--            <version>3.12.1-SNAPSHOT</version>-->
-<!--            <scope>compile</scope>-->
-<!--        </dependency>-->
-
-<!--        <dependency>-->
-<!--            <groupId>com.datastax.labs</groupId>-->
-<!--            <artifactId>dsbench-udts</artifactId>-->
-<!--            <version>3.12.1-SNAPSHOT</version>-->
-<!--            <scope>compile</scope>-->
-<!--        </dependency>-->
-
         <dependency>
             <groupId>com.datastax.dse</groupId>
             <artifactId>dse-java-driver-core</artifactId>

activitytype-cql/src/main/java/com/datastax/driver/core/TokenRangeStmtFilter.java

@@ -1,6 +1,6 @@
 package com.datastax.driver.core;
 
-import io.nosqlbench.activitytype.cql.ebdrivers.cql.api.StatementFilter;
+import io.nosqlbench.activitytype.cql.api.StatementFilter;
 
 import java.nio.ByteBuffer;
 import java.util.ArrayList;

activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/api/ErrorResponse.java

@@ -1,4 +1,4 @@
-package io.nosqlbench.activitytype.cql.ebdrivers.cql.api;
+package io.nosqlbench.activitytype.cql.api;
 
 /**
  * When an error filter allows us to see and handle an error in a specific way,

activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/api/ResultSetCycleOperator.java

@@ -1,4 +1,4 @@
-package io.nosqlbench.activitytype.cql.ebdrivers.cql.api;
+package io.nosqlbench.activitytype.cql.api;
 
 import com.datastax.driver.core.ResultSet;
 import com.datastax.driver.core.Statement;

activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/api/RowCycleOperator.java

@@ -1,4 +1,4 @@
-package io.nosqlbench.activitytype.cql.ebdrivers.cql.api;
+package io.nosqlbench.activitytype.cql.api;
 
 import com.datastax.driver.core.Row;
 

activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/api/StatementFilter.java

@@ -1,4 +1,4 @@
-package io.nosqlbench.activitytype.cql.ebdrivers.cql.api;
+package io.nosqlbench.activitytype.cql.api;
 
 import com.datastax.driver.core.Statement;
 

activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/api/VerifyApplied.java

@@ -1,4 +1,4 @@
-package io.nosqlbench.activitytype.cql.ebdrivers.cql.api;
+package io.nosqlbench.activitytype.cql.api;
 
 public enum VerifyApplied {
     ignore,

activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/core/CQLBindHelper.java

@@ -1,4 +1,4 @@
-package io.nosqlbench.activitytype.cql.ebdrivers.cql.core;
+package io.nosqlbench.activitytype.cql.core;
 
 import com.datastax.driver.core.*;
 import io.nosqlbench.engine.api.activityconfig.ParsedStmt;

activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/core/CQLOptions.java

@@ -1,4 +1,4 @@
-package io.nosqlbench.activitytype.cql.ebdrivers.cql.core;
+package io.nosqlbench.activitytype.cql.core;
 
 import com.datastax.driver.core.*;
 import com.datastax.driver.core.policies.*;

activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/core/CqlAction.java

@@ -1,17 +1,17 @@
-package io.nosqlbench.activitytype.cql.ebdrivers.cql.core;
+package io.nosqlbench.activitytype.cql.core;
 
 import com.codahale.metrics.Timer;
 import com.datastax.driver.core.*;
-import io.nosqlbench.activitytype.cql.ebdrivers.cql.api.ResultSetCycleOperator;
+import io.nosqlbench.activitytype.cql.api.ResultSetCycleOperator;
-import io.nosqlbench.activitytype.cql.ebdrivers.cql.api.RowCycleOperator;
+import io.nosqlbench.activitytype.cql.api.RowCycleOperator;
-import io.nosqlbench.activitytype.cql.ebdrivers.cql.api.StatementFilter;
+import io.nosqlbench.activitytype.cql.api.StatementFilter;
-import io.nosqlbench.activitytype.cql.ebdrivers.cql.errorhandling.ErrorStatus;
+import io.nosqlbench.activitytype.cql.errorhandling.ErrorStatus;
-import io.nosqlbench.activitytype.cql.ebdrivers.cql.errorhandling.HashedCQLErrorHandler;
+import io.nosqlbench.activitytype.cql.errorhandling.HashedCQLErrorHandler;
-import io.nosqlbench.activitytype.cql.ebdrivers.cql.errorhandling.exceptions.CQLCycleException;
+import io.nosqlbench.activitytype.cql.errorhandling.exceptions.CQLCycleException;
-import io.nosqlbench.activitytype.cql.ebdrivers.cql.errorhandling.exceptions.ChangeUnappliedCycleException;
+import io.nosqlbench.activitytype.cql.errorhandling.exceptions.ChangeUnappliedCycleException;
-import io.nosqlbench.activitytype.cql.ebdrivers.cql.errorhandling.exceptions.MaxTriesExhaustedException;
+import io.nosqlbench.activitytype.cql.errorhandling.exceptions.MaxTriesExhaustedException;
-import io.nosqlbench.activitytype.cql.ebdrivers.cql.errorhandling.exceptions.UnexpectedPagingException;
+import io.nosqlbench.activitytype.cql.errorhandling.exceptions.UnexpectedPagingException;
-import io.nosqlbench.activitytype.cql.ebdrivers.cql.statements.core.ReadyCQLStatement;
+import io.nosqlbench.activitytype.cql.statements.core.ReadyCQLStatement;
 import com.google.common.util.concurrent.ListenableFuture;
 import io.nosqlbench.engine.api.activityapi.core.ActivityDefObserver;
 import io.nosqlbench.engine.api.activityapi.core.MultiPhaseAction;

activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/core/CqlActionDispenser.java

@@ -1,4 +1,4 @@
-package io.nosqlbench.activitytype.cql.ebdrivers.cql.core;
+package io.nosqlbench.activitytype.cql.core;
 
 
 import io.nosqlbench.engine.api.activityapi.core.Action;

activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/core/CqlActivity.java

@@ -1,4 +1,4 @@
-package io.nosqlbench.activitytype.cql.ebdrivers.cql.core;
+package io.nosqlbench.activitytype.cql.core;
 
 import com.codahale.metrics.Histogram;
 import com.codahale.metrics.Meter;
@@ -6,18 +6,18 @@ import com.codahale.metrics.Timer;
 import com.datastax.driver.core.*;
 import io.nosqlbench.activitytype.cql.codecsupport.UDTCodecInjector;
 import com.datastax.driver.core.TokenRangeStmtFilter;
-import io.nosqlbench.activitytype.cql.ebdrivers.cql.api.ErrorResponse;
+import io.nosqlbench.activitytype.cql.api.ErrorResponse;
-import io.nosqlbench.activitytype.cql.ebdrivers.cql.api.ResultSetCycleOperator;
+import io.nosqlbench.activitytype.cql.api.ResultSetCycleOperator;
-import io.nosqlbench.activitytype.cql.ebdrivers.cql.api.RowCycleOperator;
+import io.nosqlbench.activitytype.cql.api.RowCycleOperator;
-import io.nosqlbench.activitytype.cql.ebdrivers.cql.api.StatementFilter;
+import io.nosqlbench.activitytype.cql.api.StatementFilter;
-import io.nosqlbench.activitytype.cql.ebdrivers.cql.errorhandling.EbdseCycleErrorHandler;
+import io.nosqlbench.activitytype.cql.errorhandling.EbdseCycleErrorHandler;
-import io.nosqlbench.activitytype.cql.ebdrivers.cql.errorhandling.HashedCQLErrorHandler;
+import io.nosqlbench.activitytype.cql.errorhandling.HashedCQLErrorHandler;
-import io.nosqlbench.activitytype.cql.ebdrivers.cql.statements.binders.CqlBinderTypes;
+import io.nosqlbench.activitytype.cql.statements.binders.CqlBinderTypes;
-import io.nosqlbench.activitytype.cql.ebdrivers.cql.statements.core.*;
+import io.nosqlbench.activitytype.cql.statements.core.*;
-import io.nosqlbench.activitytype.cql.ebdrivers.cql.statements.rowoperators.RowCycleOperators;
+import io.nosqlbench.activitytype.cql.statements.rowoperators.RowCycleOperators;
-import io.nosqlbench.activitytype.cql.ebdrivers.cql.statements.rowoperators.Save;
+import io.nosqlbench.activitytype.cql.statements.rowoperators.Save;
-import io.nosqlbench.activitytype.cql.ebdrivers.cql.statements.rsoperators.ResultSetCycleOperators;
+import io.nosqlbench.activitytype.cql.statements.rsoperators.ResultSetCycleOperators;
-import io.nosqlbench.activitytype.cql.ebdrivers.cql.statements.rsoperators.TraceLogger;
+import io.nosqlbench.activitytype.cql.statements.rsoperators.TraceLogger;
 import io.nosqlbench.engine.api.activityapi.core.Activity;
 import io.nosqlbench.engine.api.activityapi.core.ActivityDefObserver;
 import io.nosqlbench.engine.api.activityapi.planning.OpSequence;

activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/core/CqlActivityType.java

@@ -1,4 +1,4 @@
-package io.nosqlbench.activitytype.cql.ebdrivers.cql.core;
+package io.nosqlbench.activitytype.cql.core;
 
 
 import io.nosqlbench.engine.api.activityapi.core.ActionDispenser;

activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/core/CqlAsyncAction.java

@@ -1,18 +1,18 @@
-package io.nosqlbench.activitytype.cql.ebdrivers.cql.core;
+package io.nosqlbench.activitytype.cql.core;
 
 import com.codahale.metrics.Timer;
 import com.datastax.driver.core.ResultSet;
 import com.datastax.driver.core.ResultSetFuture;
-import io.nosqlbench.activitytype.cql.ebdrivers.cql.api.ErrorResponse;
+import io.nosqlbench.activitytype.cql.api.ErrorResponse;
-import io.nosqlbench.activitytype.cql.ebdrivers.cql.api.ResultSetCycleOperator;
+import io.nosqlbench.activitytype.cql.api.ResultSetCycleOperator;
-import io.nosqlbench.activitytype.cql.ebdrivers.cql.api.RowCycleOperator;
+import io.nosqlbench.activitytype.cql.api.RowCycleOperator;
-import io.nosqlbench.activitytype.cql.ebdrivers.cql.api.StatementFilter;
+import io.nosqlbench.activitytype.cql.api.StatementFilter;
-import io.nosqlbench.activitytype.cql.ebdrivers.cql.errorhandling.ErrorStatus;
+import io.nosqlbench.activitytype.cql.errorhandling.ErrorStatus;
-import io.nosqlbench.activitytype.cql.ebdrivers.cql.errorhandling.HashedCQLErrorHandler;
+import io.nosqlbench.activitytype.cql.errorhandling.HashedCQLErrorHandler;
-import io.nosqlbench.activitytype.cql.ebdrivers.cql.errorhandling.exceptions.CQLCycleException;
+import io.nosqlbench.activitytype.cql.errorhandling.exceptions.CQLCycleException;
-import io.nosqlbench.activitytype.cql.ebdrivers.cql.errorhandling.exceptions.ChangeUnappliedCycleException;
+import io.nosqlbench.activitytype.cql.errorhandling.exceptions.ChangeUnappliedCycleException;
-import io.nosqlbench.activitytype.cql.ebdrivers.cql.errorhandling.exceptions.UnexpectedPagingException;
+import io.nosqlbench.activitytype.cql.errorhandling.exceptions.UnexpectedPagingException;
-import io.nosqlbench.activitytype.cql.ebdrivers.cql.statements.core.ReadyCQLStatement;
+import io.nosqlbench.activitytype.cql.statements.core.ReadyCQLStatement;
 import com.google.common.util.concurrent.Futures;
 import com.google.common.util.concurrent.ListenableFuture;
 import io.nosqlbench.engine.api.activityapi.core.BaseAsyncAction;

activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/core/CqlOpData.java

@@ -1,9 +1,9 @@
-package io.nosqlbench.activitytype.cql.ebdrivers.cql.core;
+package io.nosqlbench.activitytype.cql.core;
 
 import com.datastax.driver.core.ResultSet;
 import com.datastax.driver.core.ResultSetFuture;
 import com.datastax.driver.core.Statement;
-import io.nosqlbench.activitytype.cql.ebdrivers.cql.statements.core.ReadyCQLStatement;
+import io.nosqlbench.activitytype.cql.statements.core.ReadyCQLStatement;
 import com.google.common.util.concurrent.FutureCallback;
 import io.nosqlbench.engine.api.activityapi.core.ops.fluent.opfacets.StartedOp;
 

activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/core/ProxyTranslator.java

@@ -1,4 +1,4 @@
-package io.nosqlbench.activitytype.cql.ebdrivers.cql.core;
+package io.nosqlbench.activitytype.cql.core;
 
 import com.datastax.driver.core.policies.AddressTranslator;
 import com.datastax.driver.core.Cluster;

activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/core/StatementModifier.java

@@ -1,4 +1,4 @@
-package io.nosqlbench.activitytype.cql.ebdrivers.cql.core;
+package io.nosqlbench.activitytype.cql.core;
 
 import com.datastax.driver.core.Statement;
 

activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/errorhandling/CQLExceptionEnum.java

@@ -1,7 +1,7 @@
-package io.nosqlbench.activitytype.cql.ebdrivers.cql.errorhandling;
+package io.nosqlbench.activitytype.cql.errorhandling;
 
 import com.datastax.driver.core.exceptions.*;
-import io.nosqlbench.activitytype.cql.ebdrivers.cql.errorhandling.exceptions.*;
+import io.nosqlbench.activitytype.cql.errorhandling.exceptions.*;
 import io.nosqlbench.engine.api.activityapi.cyclelog.buffers.results.ResultReadable;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -58,11 +58,11 @@ public enum CQLExceptionEnum implements ResultReadable {
     BusyConnectionException(BusyConnectionException.class, 37),
 
     ChangeUnappliedCycleException(ChangeUnappliedCycleException.class, 38),
-    ResultSetVerificationException(io.nosqlbench.activitytype.cql.ebdrivers.cql.errorhandling.exceptions.ResultSetVerificationException.class, 39),
+    ResultSetVerificationException(io.nosqlbench.activitytype.cql.errorhandling.exceptions.ResultSetVerificationException.class, 39),
-    RowVerificationException(io.nosqlbench.activitytype.cql.ebdrivers.cql.errorhandling.exceptions.RowVerificationException.class, 40),
+    RowVerificationException(io.nosqlbench.activitytype.cql.errorhandling.exceptions.RowVerificationException.class, 40),
-    UnexpectedPagingException(io.nosqlbench.activitytype.cql.ebdrivers.cql.errorhandling.exceptions.UnexpectedPagingException.class, 41),
+    UnexpectedPagingException(io.nosqlbench.activitytype.cql.errorhandling.exceptions.UnexpectedPagingException.class, 41),
     EbdseCycleException(CqlCycleException.class, 42),
-    MaxTriesExhaustedException(io.nosqlbench.activitytype.cql.ebdrivers.cql.errorhandling.exceptions.MaxTriesExhaustedException.class,43);
+    MaxTriesExhaustedException(io.nosqlbench.activitytype.cql.errorhandling.exceptions.MaxTriesExhaustedException.class,43);
 
     private final static Logger logger = LoggerFactory.getLogger(CQLExceptionEnum.class);
 

activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/errorhandling/EbdseCycleErrorHandler.java

@@ -1,8 +1,8 @@
-package io.nosqlbench.activitytype.cql.ebdrivers.cql.errorhandling;
+package io.nosqlbench.activitytype.cql.errorhandling;
 
-import io.nosqlbench.activitytype.cql.ebdrivers.cql.api.ErrorResponse;
+import io.nosqlbench.activitytype.cql.api.ErrorResponse;
-import io.nosqlbench.activitytype.cql.ebdrivers.cql.errorhandling.exceptions.CQLCycleException;
+import io.nosqlbench.activitytype.cql.errorhandling.exceptions.CQLCycleException;
-import io.nosqlbench.activitytype.cql.ebdrivers.cql.errorhandling.exceptions.CQLExceptionDetailer;
+import io.nosqlbench.activitytype.cql.errorhandling.exceptions.CQLExceptionDetailer;
 import io.nosqlbench.engine.api.activityapi.errorhandling.CycleErrorHandler;
 import io.nosqlbench.engine.api.metrics.ExceptionCountMetrics;
 import io.nosqlbench.engine.api.metrics.ExceptionHistoMetrics;

activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/errorhandling/ErrorStatus.java

@@ -1,6 +1,6 @@
-package io.nosqlbench.activitytype.cql.ebdrivers.cql.errorhandling;
+package io.nosqlbench.activitytype.cql.errorhandling;
 
-import io.nosqlbench.activitytype.cql.ebdrivers.cql.api.ErrorResponse;
+import io.nosqlbench.activitytype.cql.api.ErrorResponse;
 
 public class ErrorStatus {
     private boolean retryable;

activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/errorhandling/ExceptionMap.java

@@ -1,7 +1,7 @@
-package io.nosqlbench.activitytype.cql.ebdrivers.cql.errorhandling;
+package io.nosqlbench.activitytype.cql.errorhandling;
 
 import com.datastax.driver.core.exceptions.*;
-import io.nosqlbench.activitytype.cql.ebdrivers.cql.errorhandling.exceptions.*;
+import io.nosqlbench.activitytype.cql.errorhandling.exceptions.*;
 
 import java.util.LinkedHashMap;
 import java.util.Map;

activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/errorhandling/HashedCQLErrorHandler.java

@@ -1,10 +1,10 @@
-package io.nosqlbench.activitytype.cql.ebdrivers.cql.errorhandling;
+package io.nosqlbench.activitytype.cql.errorhandling;
 
 import com.datastax.driver.core.exceptions.*;
-import io.nosqlbench.activitytype.cql.ebdrivers.cql.errorhandling.exceptions.CQLCycleException;
+import io.nosqlbench.activitytype.cql.errorhandling.exceptions.CQLCycleException;
-import io.nosqlbench.activitytype.cql.ebdrivers.cql.errorhandling.exceptions.ChangeUnappliedCycleException;
+import io.nosqlbench.activitytype.cql.errorhandling.exceptions.ChangeUnappliedCycleException;
-import io.nosqlbench.activitytype.cql.ebdrivers.cql.errorhandling.exceptions.ResultSetVerificationException;
+import io.nosqlbench.activitytype.cql.errorhandling.exceptions.ResultSetVerificationException;
-import io.nosqlbench.activitytype.cql.ebdrivers.cql.errorhandling.exceptions.RowVerificationException;
+import io.nosqlbench.activitytype.cql.errorhandling.exceptions.RowVerificationException;
 import io.nosqlbench.engine.api.activityapi.errorhandling.CycleErrorHandler;
 import io.nosqlbench.engine.api.activityapi.errorhandling.HashedErrorHandler;
 import io.nosqlbench.engine.api.metrics.ExceptionCountMetrics;

activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/errorhandling/exceptions/CQLCycleException.java

@@ -1,6 +1,6 @@
-package io.nosqlbench.activitytype.cql.ebdrivers.cql.errorhandling.exceptions;
+package io.nosqlbench.activitytype.cql.errorhandling.exceptions;
 
-import io.nosqlbench.activitytype.cql.ebdrivers.cql.statements.core.ReadyCQLStatement;
+import io.nosqlbench.activitytype.cql.statements.core.ReadyCQLStatement;
 
 /**
  * In internal exception type that is used to saverow exception

activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/errorhandling/exceptions/CQLExceptionDetailer.java

@@ -1,4 +1,4 @@
-package io.nosqlbench.activitytype.cql.ebdrivers.cql.errorhandling.exceptions;
+package io.nosqlbench.activitytype.cql.errorhandling.exceptions;
 
 import com.datastax.driver.core.exceptions.ReadTimeoutException;
 import com.datastax.driver.core.exceptions.WriteTimeoutException;

activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/errorhandling/exceptions/CQLResultSetException.java

@@ -1,4 +1,4 @@
-package io.nosqlbench.activitytype.cql.ebdrivers.cql.errorhandling.exceptions;
+package io.nosqlbench.activitytype.cql.errorhandling.exceptions;
 
 import com.datastax.driver.core.BoundStatement;
 import com.datastax.driver.core.ResultSet;

activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/errorhandling/exceptions/ChangeUnappliedCycleException.java

@@ -1,4 +1,4 @@
-package io.nosqlbench.activitytype.cql.ebdrivers.cql.errorhandling.exceptions;
+package io.nosqlbench.activitytype.cql.errorhandling.exceptions;
 
 import com.datastax.driver.core.ResultSet;
 

activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/errorhandling/exceptions/CqlCycleException.java

@@ -1,4 +1,4 @@
-package io.nosqlbench.activitytype.cql.ebdrivers.cql.errorhandling.exceptions;
+package io.nosqlbench.activitytype.cql.errorhandling.exceptions;
 
 public abstract class CqlCycleException extends RuntimeException {
 

activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/errorhandling/exceptions/MaxTriesExhaustedException.java

@@ -1,4 +1,4 @@
-package io.nosqlbench.activitytype.cql.ebdrivers.cql.errorhandling.exceptions;
+package io.nosqlbench.activitytype.cql.errorhandling.exceptions;
 
 public class MaxTriesExhaustedException extends CqlCycleException {
 

activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/errorhandling/exceptions/ResultSetVerificationException.java

@@ -1,4 +1,4 @@
-package io.nosqlbench.activitytype.cql.ebdrivers.cql.errorhandling.exceptions;
+package io.nosqlbench.activitytype.cql.errorhandling.exceptions;
 
 import com.datastax.driver.core.ResultSet;
 import com.datastax.driver.core.Statement;

activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/errorhandling/exceptions/RowVerificationException.java

@@ -1,4 +1,4 @@
-package io.nosqlbench.activitytype.cql.ebdrivers.cql.errorhandling.exceptions;
+package io.nosqlbench.activitytype.cql.errorhandling.exceptions;
 
 import com.datastax.driver.core.Row;
 

activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/errorhandling/exceptions/UnexpectedPagingException.java

@@ -1,4 +1,4 @@
-package io.nosqlbench.activitytype.cql.ebdrivers.cql.errorhandling.exceptions;
+package io.nosqlbench.activitytype.cql.errorhandling.exceptions;
 
 import com.datastax.driver.core.ResultSet;
 

activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/filtering/CQLResultFilterType.java

@@ -1,6 +1,6 @@
-package io.nosqlbench.activitytype.cql.ebdrivers.cql.filtering;
+package io.nosqlbench.activitytype.cql.filtering;
 
-import io.nosqlbench.activitytype.cql.ebdrivers.cql.errorhandling.CQLExceptionEnum;
+import io.nosqlbench.activitytype.cql.errorhandling.CQLExceptionEnum;
 import io.nosqlbench.engine.api.activityapi.cyclelog.buffers.results.ResultReadable;
 import io.nosqlbench.engine.api.activityapi.cyclelog.filters.ResultFilterDispenser;
 import io.nosqlbench.engine.api.activityapi.cyclelog.filters.ResultValueFilterType;

activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/statements/binders/CqlBinderTypes.java

@@ -1,4 +1,4 @@
-package io.nosqlbench.activitytype.cql.ebdrivers.cql.statements.binders;
+package io.nosqlbench.activitytype.cql.statements.binders;
 
 import com.datastax.driver.core.PreparedStatement;
 import com.datastax.driver.core.Session;

activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/statements/binders/DiagnosticPreparedBinder.java

@@ -1,7 +1,7 @@
-package io.nosqlbench.activitytype.cql.ebdrivers.cql.statements.binders;
+package io.nosqlbench.activitytype.cql.statements.binders;
 
 import com.datastax.driver.core.*;
-import io.nosqlbench.activitytype.cql.ebdrivers.cql.core.CQLBindHelper;
+import io.nosqlbench.activitytype.cql.core.CQLBindHelper;
 import io.nosqlbench.virtdata.api.ValuesArrayBinder;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/statements/binders/DirectArrayValuesBinder.java

@@ -1,4 +1,4 @@
-package io.nosqlbench.activitytype.cql.ebdrivers.cql.statements.binders;
+package io.nosqlbench.activitytype.cql.statements.binders;
 
 import com.datastax.driver.core.PreparedStatement;
 import com.datastax.driver.core.Statement;

activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/statements/binders/SimpleStatementValuesBinder.java

@@ -1,4 +1,4 @@
-package io.nosqlbench.activitytype.cql.ebdrivers.cql.statements.binders;
+package io.nosqlbench.activitytype.cql.statements.binders;
 
 import com.datastax.driver.core.SimpleStatement;
 import com.datastax.driver.core.Statement;

activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/statements/binders/UnsettableValuesBinder.java

@@ -1,4 +1,4 @@
-package io.nosqlbench.activitytype.cql.ebdrivers.cql.statements.binders;
+package io.nosqlbench.activitytype.cql.statements.binders;
 
 import com.datastax.driver.core.*;
 import io.nosqlbench.virtdata.api.VALUE;

activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/statements/core/AvailableCQLStatements.java

@@ -1,4 +1,4 @@
-package io.nosqlbench.activitytype.cql.ebdrivers.cql.statements.core;
+package io.nosqlbench.activitytype.cql.statements.core;
 
 import io.nosqlbench.engine.api.util.TagFilter;
 

activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/statements/core/CQLSessionCache.java

@@ -1,10 +1,10 @@
-package io.nosqlbench.activitytype.cql.ebdrivers.cql.statements.core;
+package io.nosqlbench.activitytype.cql.statements.core;
 
 import com.datastax.driver.core.*;
 import com.datastax.driver.core.policies.*;
 import com.datastax.driver.dse.DseCluster;
-import io.nosqlbench.activitytype.cql.ebdrivers.cql.core.CQLOptions;
+import io.nosqlbench.activitytype.cql.core.CQLOptions;
-import io.nosqlbench.activitytype.cql.ebdrivers.cql.core.ProxyTranslator;
+import io.nosqlbench.activitytype.cql.core.ProxyTranslator;
 import io.nosqlbench.engine.api.activityapi.core.Shutdownable;
 import io.nosqlbench.engine.api.activityimpl.ActivityDef;
 import io.nosqlbench.engine.api.exceptions.BasicError;

activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/statements/core/CQLStatementDef.java

@@ -1,4 +1,4 @@
-package io.nosqlbench.activitytype.cql.ebdrivers.cql.statements.core;
+package io.nosqlbench.activitytype.cql.statements.core;
 
 import com.datastax.driver.core.ConsistencyLevel;
 import org.slf4j.Logger;

activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/statements/core/CQLStatementDefParser.java

@@ -1,4 +1,4 @@
-package io.nosqlbench.activitytype.cql.ebdrivers.cql.statements.core;
+package io.nosqlbench.activitytype.cql.statements.core;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/statements/core/CQLStatementGroups.java

@@ -1,4 +1,4 @@
-package io.nosqlbench.activitytype.cql.ebdrivers.cql.statements.core;
+package io.nosqlbench.activitytype.cql.statements.core;
 
 import java.util.*;
 

activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/statements/core/ReadyCQLStatement.java

@@ -1,12 +1,12 @@
-package io.nosqlbench.activitytype.cql.ebdrivers.cql.statements.core;
+package io.nosqlbench.activitytype.cql.statements.core;
 
 import com.codahale.metrics.Histogram;
 import com.codahale.metrics.Timer;
 import com.datastax.driver.core.PreparedStatement;
 import com.datastax.driver.core.SimpleStatement;
 import com.datastax.driver.core.Statement;
-import io.nosqlbench.activitytype.cql.ebdrivers.cql.api.ResultSetCycleOperator;
+import io.nosqlbench.activitytype.cql.api.ResultSetCycleOperator;
-import io.nosqlbench.activitytype.cql.ebdrivers.cql.api.RowCycleOperator;
+import io.nosqlbench.activitytype.cql.api.RowCycleOperator;
 import io.nosqlbench.virtdata.api.ContextualArrayBindings;
 
 import java.io.IOException;

activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/statements/core/ReadyCQLStatementTemplate.java

@@ -1,4 +1,4 @@
-package io.nosqlbench.activitytype.cql.ebdrivers.cql.statements.core;
+package io.nosqlbench.activitytype.cql.statements.core;
 
 import com.codahale.metrics.Histogram;
 import com.codahale.metrics.Timer;
@@ -6,11 +6,11 @@ import com.datastax.driver.core.PreparedStatement;
 import com.datastax.driver.core.Session;
 import com.datastax.driver.core.SimpleStatement;
 import com.datastax.driver.core.Statement;
-import io.nosqlbench.activitytype.cql.ebdrivers.cql.api.ResultSetCycleOperator;
+import io.nosqlbench.activitytype.cql.api.ResultSetCycleOperator;
-import io.nosqlbench.activitytype.cql.ebdrivers.cql.api.RowCycleOperator;
+import io.nosqlbench.activitytype.cql.api.RowCycleOperator;
-import io.nosqlbench.activitytype.cql.ebdrivers.cql.core.CqlActivity;
+import io.nosqlbench.activitytype.cql.core.CqlActivity;
-import io.nosqlbench.activitytype.cql.ebdrivers.cql.statements.binders.CqlBinderTypes;
+import io.nosqlbench.activitytype.cql.statements.binders.CqlBinderTypes;
-import io.nosqlbench.activitytype.cql.ebdrivers.cql.statements.binders.SimpleStatementValuesBinder;
+import io.nosqlbench.activitytype.cql.statements.binders.SimpleStatementValuesBinder;
 import io.nosqlbench.engine.api.metrics.ActivityMetrics;
 import io.nosqlbench.virtdata.api.BindingsTemplate;
 import io.nosqlbench.virtdata.api.ContextualBindingsArrayTemplate;

activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/statements/core/ReadyCQLStatementsTemplate.java

@@ -1,4 +1,4 @@
-package io.nosqlbench.activitytype.cql.ebdrivers.cql.statements.core;
+package io.nosqlbench.activitytype.cql.statements.core;
 
 import java.util.ArrayList;
 import java.util.List;

activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/statements/core/TaggedCQLStatementDefs.java

@@ -1,4 +1,4 @@
-package io.nosqlbench.activitytype.cql.ebdrivers.cql.statements.core;
+package io.nosqlbench.activitytype.cql.statements.core;
 
 import io.nosqlbench.engine.api.util.Tagged;
 

activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/statements/core/YamlCQLStatementLoader.java

@@ -1,4 +1,4 @@
-package io.nosqlbench.activitytype.cql.ebdrivers.cql.statements.core;
+package io.nosqlbench.activitytype.cql.statements.core;
 
 import io.nosqlbench.engine.api.activityimpl.ActivityInitializationError;
 import io.nosqlbench.engine.api.util.NosqlBenchFiles;

activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/statements/rowoperators/Print.java

@@ -1,7 +1,7 @@
-package io.nosqlbench.activitytype.cql.ebdrivers.cql.statements.rowoperators;
+package io.nosqlbench.activitytype.cql.statements.rowoperators;
 
 import com.datastax.driver.core.Row;
-import io.nosqlbench.activitytype.cql.ebdrivers.cql.api.RowCycleOperator;
+import io.nosqlbench.activitytype.cql.api.RowCycleOperator;
 
 /**
  * Save specific variables to the thread local object map

activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/statements/rowoperators/RowCycleOperators.java

@@ -1,6 +1,6 @@
-package io.nosqlbench.activitytype.cql.ebdrivers.cql.statements.rowoperators;
+package io.nosqlbench.activitytype.cql.statements.rowoperators;
 
-import io.nosqlbench.activitytype.cql.ebdrivers.cql.api.RowCycleOperator;
+import io.nosqlbench.activitytype.cql.api.RowCycleOperator;
 
 public enum RowCycleOperators {
 

activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/statements/rowoperators/Save.java

@@ -1,8 +1,8 @@
-package io.nosqlbench.activitytype.cql.ebdrivers.cql.statements.rowoperators;
+package io.nosqlbench.activitytype.cql.statements.rowoperators;
 
 import com.datastax.driver.core.ColumnDefinitions;
 import com.datastax.driver.core.Row;
-import io.nosqlbench.activitytype.cql.ebdrivers.cql.api.RowCycleOperator;
+import io.nosqlbench.activitytype.cql.api.RowCycleOperator;
 import io.nosqlbench.virtdata.library.basics.core.threadstate.SharedState;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/statements/rowoperators/SaveGlobalVars.java

@@ -1,8 +1,8 @@
-package io.nosqlbench.activitytype.cql.ebdrivers.cql.statements.rowoperators;
+package io.nosqlbench.activitytype.cql.statements.rowoperators;
 
 import com.datastax.driver.core.ColumnDefinitions;
 import com.datastax.driver.core.Row;
-import io.nosqlbench.activitytype.cql.ebdrivers.cql.api.RowCycleOperator;
+import io.nosqlbench.activitytype.cql.api.RowCycleOperator;
 import io.nosqlbench.virtdata.library.basics.core.threadstate.SharedState;
 
 import java.util.List;

activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/statements/rowoperators/SaveThreadRows.java

@@ -1,8 +1,8 @@
-package io.nosqlbench.activitytype.cql.ebdrivers.cql.statements.rowoperators;
+package io.nosqlbench.activitytype.cql.statements.rowoperators;
 
 import com.datastax.driver.core.Row;
-import io.nosqlbench.activitytype.cql.ebdrivers.cql.api.RowCycleOperator;
+import io.nosqlbench.activitytype.cql.api.RowCycleOperator;
-import io.nosqlbench.activitytype.cql.ebdrivers.cql.statements.rsoperators.PerThreadCQLData;
+import io.nosqlbench.activitytype.cql.statements.rsoperators.PerThreadCQLData;
 
 import java.util.LinkedList;
 

activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/statements/rowoperators/SaveThreadVars.java

@@ -1,8 +1,8 @@
-package io.nosqlbench.activitytype.cql.ebdrivers.cql.statements.rowoperators;
+package io.nosqlbench.activitytype.cql.statements.rowoperators;
 
 import com.datastax.driver.core.ColumnDefinitions;
 import com.datastax.driver.core.Row;
-import io.nosqlbench.activitytype.cql.ebdrivers.cql.api.RowCycleOperator;
+import io.nosqlbench.activitytype.cql.api.RowCycleOperator;
 import io.nosqlbench.virtdata.library.basics.core.threadstate.SharedState;
 
 import java.util.HashMap;

activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/statements/rsoperators/AssertSingleRowResultSet.java

@@ -1,9 +1,9 @@
-package io.nosqlbench.activitytype.cql.ebdrivers.cql.statements.rsoperators;
+package io.nosqlbench.activitytype.cql.statements.rsoperators;
 
 import com.datastax.driver.core.ResultSet;
 import com.datastax.driver.core.Statement;
-import io.nosqlbench.activitytype.cql.ebdrivers.cql.api.ResultSetCycleOperator;
+import io.nosqlbench.activitytype.cql.api.ResultSetCycleOperator;
-import io.nosqlbench.activitytype.cql.ebdrivers.cql.errorhandling.exceptions.ResultSetVerificationException;
+import io.nosqlbench.activitytype.cql.errorhandling.exceptions.ResultSetVerificationException;
 
 public class AssertSingleRowResultSet implements ResultSetCycleOperator {
 

activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/statements/rsoperators/ClearVars.java

@@ -1,8 +1,8 @@
-package io.nosqlbench.activitytype.cql.ebdrivers.cql.statements.rsoperators;
+package io.nosqlbench.activitytype.cql.statements.rsoperators;
 
 import com.datastax.driver.core.ResultSet;
 import com.datastax.driver.core.Statement;
-import io.nosqlbench.activitytype.cql.ebdrivers.cql.api.ResultSetCycleOperator;
+import io.nosqlbench.activitytype.cql.api.ResultSetCycleOperator;
 import io.nosqlbench.virtdata.library.basics.core.threadstate.SharedState;
 
 public class ClearVars implements ResultSetCycleOperator {

activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/statements/rsoperators/CqlResultSetLogger.java

@@ -1,7 +1,7 @@
-package io.nosqlbench.activitytype.cql.ebdrivers.cql.statements.rsoperators;
+package io.nosqlbench.activitytype.cql.statements.rsoperators;
 
 import com.datastax.driver.core.*;
-import io.nosqlbench.activitytype.cql.ebdrivers.cql.api.ResultSetCycleOperator;
+import io.nosqlbench.activitytype.cql.api.ResultSetCycleOperator;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/statements/rsoperators/PerThreadCQLData.java

@@ -1,4 +1,4 @@
-package io.nosqlbench.activitytype.cql.ebdrivers.cql.statements.rsoperators;
+package io.nosqlbench.activitytype.cql.statements.rsoperators;
 
 import com.datastax.driver.core.Row;
 

activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/statements/rsoperators/PopVars.java

@@ -1,8 +1,8 @@
-package io.nosqlbench.activitytype.cql.ebdrivers.cql.statements.rsoperators;
+package io.nosqlbench.activitytype.cql.statements.rsoperators;
 
 import com.datastax.driver.core.ResultSet;
 import com.datastax.driver.core.Statement;
-import io.nosqlbench.activitytype.cql.ebdrivers.cql.api.ResultSetCycleOperator;
+import io.nosqlbench.activitytype.cql.api.ResultSetCycleOperator;
 import io.nosqlbench.virtdata.library.basics.core.threadstate.SharedState;
 
 import java.util.HashMap;

activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/statements/rsoperators/Print.java

@@ -1,8 +1,8 @@
-package io.nosqlbench.activitytype.cql.ebdrivers.cql.statements.rsoperators;
+package io.nosqlbench.activitytype.cql.statements.rsoperators;
 
 import com.datastax.driver.core.ResultSet;
 import com.datastax.driver.core.Statement;
-import io.nosqlbench.activitytype.cql.ebdrivers.cql.api.ResultSetCycleOperator;
+import io.nosqlbench.activitytype.cql.api.ResultSetCycleOperator;
 
 public class Print implements ResultSetCycleOperator {
 

activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/statements/rsoperators/PushVars.java

@@ -1,8 +1,8 @@
-package io.nosqlbench.activitytype.cql.ebdrivers.cql.statements.rsoperators;
+package io.nosqlbench.activitytype.cql.statements.rsoperators;
 
 import com.datastax.driver.core.ResultSet;
 import com.datastax.driver.core.Statement;
-import io.nosqlbench.activitytype.cql.ebdrivers.cql.api.ResultSetCycleOperator;
+import io.nosqlbench.activitytype.cql.api.ResultSetCycleOperator;
 import io.nosqlbench.virtdata.library.basics.core.threadstate.SharedState;
 
 import java.util.HashMap;

activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/statements/rsoperators/ResultSetCycleOperators.java

@@ -1,6 +1,6 @@
-package io.nosqlbench.activitytype.cql.ebdrivers.cql.statements.rsoperators;
+package io.nosqlbench.activitytype.cql.statements.rsoperators;
 
-import io.nosqlbench.activitytype.cql.ebdrivers.cql.api.ResultSetCycleOperator;
+import io.nosqlbench.activitytype.cql.api.ResultSetCycleOperator;
 
 public enum ResultSetCycleOperators {
 

activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/statements/rsoperators/RowCapture.java

@@ -1,9 +1,9 @@
-package io.nosqlbench.activitytype.cql.ebdrivers.cql.statements.rsoperators;
+package io.nosqlbench.activitytype.cql.statements.rsoperators;
 
 import com.datastax.driver.core.ResultSet;
 import com.datastax.driver.core.Row;
 import com.datastax.driver.core.Statement;
-import io.nosqlbench.activitytype.cql.ebdrivers.cql.api.ResultSetCycleOperator;
+import io.nosqlbench.activitytype.cql.api.ResultSetCycleOperator;
 
 import java.util.LinkedList;
 

activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/statements/rsoperators/TraceLogger.java

@@ -1,11 +1,11 @@
-package io.nosqlbench.activitytype.cql.ebdrivers.cql.statements.rsoperators;
+package io.nosqlbench.activitytype.cql.statements.rsoperators;
 
 import com.datastax.driver.core.ExecutionInfo;
 import com.datastax.driver.core.QueryTrace;
 import com.datastax.driver.core.ResultSet;
 import com.datastax.driver.core.Statement;
-import io.nosqlbench.activitytype.cql.ebdrivers.cql.api.ResultSetCycleOperator;
+import io.nosqlbench.activitytype.cql.api.ResultSetCycleOperator;
-import io.nosqlbench.activitytype.cql.ebdrivers.cql.core.StatementModifier;
+import io.nosqlbench.activitytype.cql.core.StatementModifier;
 import io.nosqlbench.engine.api.util.SimpleConfig;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

activitytype-cql/src/test/java/com/datastax/ebdrivers/cql/CqlActionTest.java

@@ -1,7 +1,7 @@
 package com.datastax.ebdrivers.cql;
 
-import io.nosqlbench.activitytype.cql.ebdrivers.cql.core.CqlAction;
+import io.nosqlbench.activitytype.cql.core.CqlAction;
-import io.nosqlbench.activitytype.cql.ebdrivers.cql.core.CqlActivity;
+import io.nosqlbench.activitytype.cql.core.CqlActivity;
 import io.nosqlbench.engine.api.activityimpl.ActivityDef;
 import org.testng.annotations.Test;
 

activitytype-cql/src/test/java/com/datastax/ebdrivers/cql/statements/CQLCQLStatementDefParserTest.java

@@ -1,6 +1,6 @@
 package com.datastax.ebdrivers.cql.statements;
 
-import io.nosqlbench.activitytype.cql.ebdrivers.cql.statements.core.CQLStatementDefParser;
+import io.nosqlbench.activitytype.cql.statements.core.CQLStatementDefParser;
 import org.testng.annotations.Test;
 
 import java.util.HashMap;

activitytype-cql/src/test/java/com/datastax/ebdrivers/cql/statements/CQLOptionsTest.java

@@ -5,7 +5,7 @@ import com.datastax.driver.core.PoolingOptions;
 import com.datastax.driver.core.SocketOptions;
 import com.datastax.driver.core.policies.LoadBalancingPolicy;
 import com.datastax.driver.core.policies.SpeculativeExecutionPolicy;
-import io.nosqlbench.activitytype.cql.ebdrivers.cql.core.CQLOptions;
+import io.nosqlbench.activitytype.cql.core.CQLOptions;
 import org.testng.annotations.Test;
 
 import static org.assertj.core.api.Assertions.assertThat;