collapse virtdata-annotations and virtdata-processors into virtdata-api

activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/datamappers/functions/collectionclobs/StringMapClob.java

@@ -1,9 +1,9 @@
 package io.nosqlbench.activitytype.cql.datamappers.functions.collectionclobs;
 
-import io.nosqlbench.virtdata.annotations.Categories;
-import io.nosqlbench.virtdata.annotations.Category;
-import io.nosqlbench.virtdata.annotations.Example;
-import io.nosqlbench.virtdata.annotations.ThreadSafeMapper;
+import io.nosqlbench.virtdata.api.annotations.Categories;
+import io.nosqlbench.virtdata.api.annotations.Category;
+import io.nosqlbench.virtdata.api.annotations.Example;
+import io.nosqlbench.virtdata.api.annotations.ThreadSafeMapper;
 
 import java.util.function.LongFunction;
 import java.util.function.LongToIntFunction;

activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/datamappers/functions/collections/ListMapper.java

@@ -1,9 +1,9 @@
 package io.nosqlbench.activitytype.cql.datamappers.functions.collections;
 
-import io.nosqlbench.virtdata.annotations.Example;
-import io.nosqlbench.virtdata.annotations.ThreadSafeMapper;
-import io.nosqlbench.virtdata.api.DataMapper;
-import io.nosqlbench.virtdata.api.VirtData;
+import io.nosqlbench.virtdata.api.annotations.Example;
+import io.nosqlbench.virtdata.api.annotations.ThreadSafeMapper;
+import io.nosqlbench.virtdata.core.bindings.DataMapper;
+import io.nosqlbench.virtdata.core.bindings.VirtData;
 
 import java.util.ArrayList;
 import java.util.List;

activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/datamappers/functions/contrib/WrappedClustering.java

@@ -1,7 +1,7 @@
 package io.nosqlbench.activitytype.cql.datamappers.functions.contrib;
 
 
-import io.nosqlbench.virtdata.annotations.ThreadSafeMapper;
+import io.nosqlbench.virtdata.api.annotations.ThreadSafeMapper;
 
 import java.util.function.IntUnaryOperator;
 
@@ -20,4 +20,4 @@ public class WrappedClustering implements IntUnaryOperator {
         else
             return (int) (integerMin - (sign * (longOperandTimes15 % integerMax)));
     }
-}
+}

activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/datamappers/functions/diagnostics/ToCqlType.java

@@ -4,7 +4,7 @@ import com.datastax.driver.core.DataType;
 import com.datastax.driver.core.LocalDate;
 import com.datastax.driver.core.TupleValue;
 import com.datastax.driver.core.UDTValue;
-import io.nosqlbench.virtdata.annotations.ThreadSafeMapper;
+import io.nosqlbench.virtdata.api.annotations.ThreadSafeMapper;
 
 import java.math.BigDecimal;
 import java.math.BigInteger;

activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/datamappers/functions/geometry/Distance.java

@@ -1,7 +1,7 @@
 package io.nosqlbench.activitytype.cql.datamappers.functions.geometry;
 
 import com.datastax.driver.dse.geometry.Point;
-import io.nosqlbench.virtdata.annotations.ThreadSafeMapper;
+import io.nosqlbench.virtdata.api.annotations.ThreadSafeMapper;
 
 import java.util.function.LongFunction;
 import java.util.function.LongToDoubleFunction;

activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/datamappers/functions/geometry/LineString.java

@@ -2,7 +2,7 @@ package io.nosqlbench.activitytype.cql.datamappers.functions.geometry;
 
 //import com.datastax.driver.dse.geometry.Point;
 
-import io.nosqlbench.virtdata.annotations.ThreadSafeMapper;
+import io.nosqlbench.virtdata.api.annotations.ThreadSafeMapper;
 
 import java.util.function.LongFunction;
 import java.util.function.LongToDoubleFunction;

activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/datamappers/functions/geometry/Point.java

@@ -1,6 +1,6 @@
 package io.nosqlbench.activitytype.cql.datamappers.functions.geometry;
 
-import io.nosqlbench.virtdata.annotations.ThreadSafeMapper;
+import io.nosqlbench.virtdata.api.annotations.ThreadSafeMapper;
 
 import java.util.function.LongFunction;
 import java.util.function.LongToDoubleFunction;

activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/datamappers/functions/geometry/Polygon.java

@@ -1,7 +1,7 @@
 package io.nosqlbench.activitytype.cql.datamappers.functions.geometry;
 
 import com.datastax.driver.dse.geometry.Point;
-import io.nosqlbench.virtdata.annotations.ThreadSafeMapper;
+import io.nosqlbench.virtdata.api.annotations.ThreadSafeMapper;
 
 import java.util.function.LongFunction;
 import java.util.function.LongToDoubleFunction;

activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/datamappers/functions/geometry/PolygonOnGrid.java

@@ -2,8 +2,8 @@ package io.nosqlbench.activitytype.cql.datamappers.functions.geometry;
 
 import com.datastax.driver.dse.geometry.Point;
 import com.datastax.driver.dse.geometry.Polygon;
-import io.nosqlbench.virtdata.annotations.Example;
-import io.nosqlbench.virtdata.annotations.ThreadSafeMapper;
+import io.nosqlbench.virtdata.api.annotations.Example;
+import io.nosqlbench.virtdata.api.annotations.ThreadSafeMapper;
 import io.nosqlbench.virtdata.library.curves4.discrete.long_int.Uniform;
 
 import java.util.function.LongFunction;

activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/datamappers/functions/long_localdate/EpochMillisToCqlLocalDate.java

@@ -1,8 +1,8 @@
 package io.nosqlbench.activitytype.cql.datamappers.functions.long_localdate;
 
 import com.datastax.driver.core.LocalDate;
-import io.nosqlbench.virtdata.annotations.Example;
-import io.nosqlbench.virtdata.annotations.ThreadSafeMapper;
+import io.nosqlbench.virtdata.api.annotations.Example;
+import io.nosqlbench.virtdata.api.annotations.ThreadSafeMapper;
 
 import java.util.function.LongFunction;
 

activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/datamappers/functions/long_localdate/EpochMillisToJavaLocalDate.java

@@ -1,7 +1,7 @@
 package io.nosqlbench.activitytype.cql.datamappers.functions.long_localdate;
 
-import io.nosqlbench.virtdata.annotations.Example;
-import io.nosqlbench.virtdata.annotations.ThreadSafeMapper;
+import io.nosqlbench.virtdata.api.annotations.Example;
+import io.nosqlbench.virtdata.api.annotations.ThreadSafeMapper;
 
 import java.time.Instant;
 import java.time.LocalDate;
@@ -18,7 +18,7 @@ import java.util.function.LongFunction;
  * Short form ZoneId values like 'CST' can be used, although US Domestic names
  * which specify the daylight savings hours are not supported. The full list of
  * short Ids at @see <a href="https://docs.oracle.com/en/java/javase/12/docs/api/java.base/java/time/ZoneId.html#SHORT_IDS">JavaSE ZoneId Ids</a>
- * 
+ *
  * Any timezone specifier may be used which can be read by {@link ZoneId#of(String)}
  */
 @ThreadSafeMapper

activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/datamappers/functions/long_localdate/EpochMillisToJavaLocalDateTime.java

@@ -1,7 +1,7 @@
 package io.nosqlbench.activitytype.cql.datamappers.functions.long_localdate;
 
-import io.nosqlbench.virtdata.annotations.Example;
-import io.nosqlbench.virtdata.annotations.ThreadSafeMapper;
+import io.nosqlbench.virtdata.api.annotations.Example;
+import io.nosqlbench.virtdata.api.annotations.ThreadSafeMapper;
 
 import java.time.Instant;
 import java.time.LocalDateTime;

activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/datamappers/functions/long_localdate/LongToLocalDateDays.java

@@ -1,8 +1,8 @@
 package io.nosqlbench.activitytype.cql.datamappers.functions.long_localdate;
 
 import com.datastax.driver.core.LocalDate;
-import io.nosqlbench.virtdata.annotations.Example;
-import io.nosqlbench.virtdata.annotations.ThreadSafeMapper;
+import io.nosqlbench.virtdata.api.annotations.Example;
+import io.nosqlbench.virtdata.api.annotations.ThreadSafeMapper;
 
 import java.util.function.LongFunction;
 
@@ -15,7 +15,7 @@ public class LongToLocalDateDays implements LongFunction<LocalDate> {
     public LocalDate apply(long value) {
         return LocalDate.fromDaysSinceEpoch((int) value % Integer.MAX_VALUE);
     }
-    
+
     @Example({"LongToLocalDateDays()","take the cycle number and turn it into a LocalDate based on days since 1970"})
     public LongToLocalDateDays (){
     }

activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/datamappers/functions/long_string/ModuloCSVLineToUUID.java

@@ -19,8 +19,8 @@
 
 package io.nosqlbench.activitytype.cql.datamappers.functions.long_string;
 
-import io.nosqlbench.virtdata.annotations.Example;
-import io.nosqlbench.virtdata.annotations.ThreadSafeMapper;
+import io.nosqlbench.virtdata.api.annotations.Example;
+import io.nosqlbench.virtdata.api.annotations.ThreadSafeMapper;
 import io.nosqlbench.nb.api.VirtDataResources;
 import io.nosqlbench.virtdata.library.basics.shared.from_long.to_string.ModuloLineToString;
 import org.apache.commons.csv.CSVParser;

activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/datamappers/functions/long_uuid/ToTimeUUIDMax.java

@@ -1,9 +1,9 @@
 package io.nosqlbench.activitytype.cql.datamappers.functions.long_uuid;
 
 import com.datastax.driver.core.utils.UUIDs;
-import io.nosqlbench.virtdata.annotations.Categories;
-import io.nosqlbench.virtdata.annotations.Category;
-import io.nosqlbench.virtdata.annotations.ThreadSafeMapper;
+import io.nosqlbench.virtdata.api.annotations.Categories;
+import io.nosqlbench.virtdata.api.annotations.Category;
+import io.nosqlbench.virtdata.api.annotations.ThreadSafeMapper;
 
 import java.util.UUID;
 import java.util.function.LongFunction;

activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/datamappers/functions/long_uuid/ToTimeUUIDMin.java

@@ -1,9 +1,9 @@
 package io.nosqlbench.activitytype.cql.datamappers.functions.long_uuid;
 
 import com.datastax.driver.core.utils.UUIDs;
-import io.nosqlbench.virtdata.annotations.Categories;
-import io.nosqlbench.virtdata.annotations.Category;
-import io.nosqlbench.virtdata.annotations.ThreadSafeMapper;
+import io.nosqlbench.virtdata.api.annotations.Categories;
+import io.nosqlbench.virtdata.api.annotations.Category;
+import io.nosqlbench.virtdata.api.annotations.ThreadSafeMapper;
 
 import java.util.UUID;
 import java.util.function.LongFunction;

activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/datamappers/functions/rainbow/TokenMapFileCycle.java

@@ -1,6 +1,6 @@
 package io.nosqlbench.activitytype.cql.datamappers.functions.rainbow;
 
-import io.nosqlbench.virtdata.annotations.ThreadSafeMapper;
+import io.nosqlbench.virtdata.api.annotations.ThreadSafeMapper;
 
 @ThreadSafeMapper
 public class TokenMapFileCycle extends TokenMapFileBaseFunction {

activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/datamappers/functions/rainbow/TokenMapFileNextCycle.java

@@ -1,6 +1,6 @@
 package io.nosqlbench.activitytype.cql.datamappers.functions.rainbow;
 
-import io.nosqlbench.virtdata.annotations.ThreadSafeMapper;
+import io.nosqlbench.virtdata.api.annotations.ThreadSafeMapper;
 
 @ThreadSafeMapper
 public class TokenMapFileNextCycle extends TokenMapFileBaseFunction {

activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/datamappers/functions/rainbow/TokenMapFileNextToken.java

@@ -1,6 +1,6 @@
 package io.nosqlbench.activitytype.cql.datamappers.functions.rainbow;
 
-import io.nosqlbench.virtdata.annotations.ThreadSafeMapper;
+import io.nosqlbench.virtdata.api.annotations.ThreadSafeMapper;
 
 @ThreadSafeMapper
 public class TokenMapFileNextToken extends TokenMapFileBaseFunction {

activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/datamappers/functions/rainbow/TokenMapFileToken.java

@@ -1,6 +1,6 @@
 package io.nosqlbench.activitytype.cql.datamappers.functions.rainbow;
 
-import io.nosqlbench.virtdata.annotations.ThreadSafeMapper;
+import io.nosqlbench.virtdata.api.annotations.ThreadSafeMapper;
 
 @ThreadSafeMapper
 public class TokenMapFileToken extends TokenMapFileBaseFunction {

activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/datamappers/functions/string_string/SnappyComp.java

@@ -1,6 +1,6 @@
 package io.nosqlbench.activitytype.cql.datamappers.functions.string_string;
 
-import io.nosqlbench.virtdata.annotations.ThreadSafeMapper;
+import io.nosqlbench.virtdata.api.annotations.ThreadSafeMapper;
 import org.xerial.snappy.Snappy;
 
 import java.io.IOException;

activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/datamappers/functions/to_daterange/DateRangeDuring.java

@@ -1,10 +1,10 @@
 package io.nosqlbench.activitytype.cql.datamappers.functions.to_daterange;
 
 import com.datastax.driver.dse.search.DateRange;
-import io.nosqlbench.virtdata.annotations.Categories;
-import io.nosqlbench.virtdata.annotations.Category;
-import io.nosqlbench.virtdata.annotations.Example;
-import io.nosqlbench.virtdata.annotations.ThreadSafeMapper;
+import io.nosqlbench.virtdata.api.annotations.Categories;
+import io.nosqlbench.virtdata.api.annotations.Category;
+import io.nosqlbench.virtdata.api.annotations.Example;
+import io.nosqlbench.virtdata.api.annotations.ThreadSafeMapper;
 
 import java.util.Date;
 import java.util.function.Function;

activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/datamappers/functions/to_daterange/DateRangeFunc.java

@@ -1,10 +1,10 @@
 package io.nosqlbench.activitytype.cql.datamappers.functions.to_daterange;
 
 import com.datastax.driver.dse.search.DateRange;
-import io.nosqlbench.virtdata.annotations.Categories;
-import io.nosqlbench.virtdata.annotations.Category;
-import io.nosqlbench.virtdata.annotations.Example;
-import io.nosqlbench.virtdata.annotations.ThreadSafeMapper;
+import io.nosqlbench.virtdata.api.annotations.Categories;
+import io.nosqlbench.virtdata.api.annotations.Category;
+import io.nosqlbench.virtdata.api.annotations.Example;
+import io.nosqlbench.virtdata.api.annotations.ThreadSafeMapper;
 
 import java.util.Date;
 import java.util.function.Function;

activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/datamappers/functions/to_daterange/DateRangeOnOrAfter.java

@@ -1,10 +1,10 @@
 package io.nosqlbench.activitytype.cql.datamappers.functions.to_daterange;
 
 import com.datastax.driver.dse.search.DateRange;
-import io.nosqlbench.virtdata.annotations.Categories;
-import io.nosqlbench.virtdata.annotations.Category;
-import io.nosqlbench.virtdata.annotations.Example;
-import io.nosqlbench.virtdata.annotations.ThreadSafeMapper;
+import io.nosqlbench.virtdata.api.annotations.Categories;
+import io.nosqlbench.virtdata.api.annotations.Category;
+import io.nosqlbench.virtdata.api.annotations.Example;
+import io.nosqlbench.virtdata.api.annotations.ThreadSafeMapper;
 
 import java.util.Date;
 import java.util.function.Function;

activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/datamappers/functions/to_daterange/DateRangeOnOrBefore.java

@@ -1,10 +1,10 @@
 package io.nosqlbench.activitytype.cql.datamappers.functions.to_daterange;
 
 import com.datastax.driver.dse.search.DateRange;
-import io.nosqlbench.virtdata.annotations.Categories;
-import io.nosqlbench.virtdata.annotations.Category;
-import io.nosqlbench.virtdata.annotations.Example;
-import io.nosqlbench.virtdata.annotations.ThreadSafeMapper;
+import io.nosqlbench.virtdata.api.annotations.Categories;
+import io.nosqlbench.virtdata.api.annotations.Category;
+import io.nosqlbench.virtdata.api.annotations.Example;
+import io.nosqlbench.virtdata.api.annotations.ThreadSafeMapper;
 
 import java.util.Date;
 import java.util.function.Function;

activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/datamappers/functions/to_daterange/DateRangeParser.java

@@ -1,10 +1,10 @@
 package io.nosqlbench.activitytype.cql.datamappers.functions.to_daterange;
 
 import com.datastax.driver.dse.search.DateRange;
-import io.nosqlbench.virtdata.annotations.Categories;
-import io.nosqlbench.virtdata.annotations.Category;
-import io.nosqlbench.virtdata.annotations.Example;
-import io.nosqlbench.virtdata.annotations.ThreadSafeMapper;
+import io.nosqlbench.virtdata.api.annotations.Categories;
+import io.nosqlbench.virtdata.api.annotations.Category;
+import io.nosqlbench.virtdata.api.annotations.Example;
+import io.nosqlbench.virtdata.api.annotations.ThreadSafeMapper;
 
 import java.text.ParseException;
 import java.util.Date;

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

@@ -3,7 +3,7 @@ package io.nosqlbench.activitytype.cql.statements.binders;
 import com.datastax.driver.core.PreparedStatement;
 import com.datastax.driver.core.Session;
 import com.datastax.driver.core.Statement;
-import io.nosqlbench.virtdata.api.ValuesArrayBinder;
+import io.nosqlbench.virtdata.core.bindings.ValuesArrayBinder;
 
 public enum CqlBinderTypes {
     direct_array,

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

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

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

@@ -2,7 +2,7 @@ package io.nosqlbench.activitytype.cql.statements.binders;
 
 import com.datastax.driver.core.PreparedStatement;
 import com.datastax.driver.core.Statement;
-import io.nosqlbench.virtdata.api.ValuesArrayBinder;
+import io.nosqlbench.virtdata.core.bindings.ValuesArrayBinder;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

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

@@ -2,7 +2,7 @@ package io.nosqlbench.activitytype.cql.statements.binders;
 
 import com.datastax.driver.core.SimpleStatement;
 import com.datastax.driver.core.Statement;
-import io.nosqlbench.virtdata.api.ValuesArrayBinder;
+import io.nosqlbench.virtdata.core.bindings.ValuesArrayBinder;
 
 /**
  * This binder is not meant to be used with anything but DDL or statements

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

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

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

@@ -7,7 +7,7 @@ import com.datastax.driver.core.SimpleStatement;
 import com.datastax.driver.core.Statement;
 import io.nosqlbench.activitytype.cql.api.ResultSetCycleOperator;
 import io.nosqlbench.activitytype.cql.api.RowCycleOperator;
-import io.nosqlbench.virtdata.api.ContextualArrayBindings;
+import io.nosqlbench.virtdata.core.bindings.ContextualArrayBindings;
 
 import java.io.IOException;
 import java.io.Writer;

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

@@ -12,9 +12,9 @@ import io.nosqlbench.activitytype.cql.core.CqlActivity;
 import io.nosqlbench.activitytype.cql.statements.binders.CqlBinderTypes;
 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;
-import io.nosqlbench.virtdata.api.ValuesArrayBinder;
+import io.nosqlbench.virtdata.core.bindings.BindingsTemplate;
+import io.nosqlbench.virtdata.core.bindings.ContextualBindingsArrayTemplate;
+import io.nosqlbench.virtdata.core.bindings.ValuesArrayBinder;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

activitytype-cql/src/main/resources/META-INF/services/javax.annotation.processing.Processor

@@ -1,2 +1,3 @@
-io.nosqlbench.virtdata.processors.FunctionDocInfoProcessor
+io.nosqlbench.virtdata.api.processors.FunctionDocInfoProcessor
+
 io.nosqlbench.nb.api.processors.ServiceProcessor

activitytype-cqlverify/src/main/java/io/nosqlbench/activitytype/cqlverify/CqlVerifyActivity.java

@@ -3,8 +3,8 @@ package io.nosqlbench.activitytype.cqlverify;
 import io.nosqlbench.activitytype.cql.core.CqlActivity;
 import io.nosqlbench.activitytype.cql.statements.rsoperators.AssertSingleRowResultSet;
 import io.nosqlbench.engine.api.activityimpl.ActivityDef;
-import io.nosqlbench.virtdata.api.Bindings;
-import io.nosqlbench.virtdata.api.BindingsTemplate;
+import io.nosqlbench.virtdata.core.bindings.Bindings;
+import io.nosqlbench.virtdata.core.bindings.BindingsTemplate;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

activitytype-cqlverify/src/main/java/io/nosqlbench/activitytype/cqlverify/RowDifferencer.java

@@ -3,7 +3,7 @@ package io.nosqlbench.activitytype.cqlverify;
 import com.datastax.driver.core.*;
 import io.nosqlbench.activitytype.cql.api.RowCycleOperator;
 import io.nosqlbench.activitytype.cql.errorhandling.exceptions.RowVerificationException;
-import io.nosqlbench.virtdata.api.Bindings;
+import io.nosqlbench.virtdata.core.bindings.Bindings;
 
 import java.math.BigDecimal;
 import java.math.BigInteger;

activitytype-diag/src/main/java/io/nosqlbench/activitytype/diag/DiagActivity.java

@@ -24,7 +24,7 @@ import io.nosqlbench.engine.api.activityapi.ratelimits.RateSpec;
 import io.nosqlbench.engine.api.activityimpl.ActivityDef;
 import io.nosqlbench.engine.api.activityimpl.SimpleActivity;
 import io.nosqlbench.engine.api.metrics.ActivityMetrics;
-import io.nosqlbench.virtdata.api.VirtData;
+import io.nosqlbench.virtdata.core.bindings.VirtData;
 
 import java.util.function.LongToIntFunction;
 import java.util.function.LongUnaryOperator;

activitytype-diag/src/main/resources/META-INF/services/javax.annotation.processing.Processor

@@ -1,2 +1,3 @@
-io.nosqlbench.virtdata.processors.FunctionDocInfoProcessor
+io.nosqlbench.virtdata.api.processors.FunctionDocInfoProcessor
+
 io.nosqlbench.nb.api.processors.ServiceProcessor

activitytype-http/src/main/java/io/nosqlbench/activitytype/http/HttpAction.java

@@ -4,7 +4,7 @@ import com.codahale.metrics.Timer;
 import io.nosqlbench.engine.api.activityapi.core.SyncAction;
 import io.nosqlbench.engine.api.activityapi.planning.OpSequence;
 import io.nosqlbench.engine.api.activityimpl.ActivityDef;
-import io.nosqlbench.virtdata.api.templates.StringBindings;
+import io.nosqlbench.virtdata.core.templates.StringBindings;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -122,4 +122,4 @@ public class HttpAction implements SyncAction {
     protected HttpActivity getHttpActivity() {
         return httpActivity;
     }
-}
+}

activitytype-http/src/main/java/io/nosqlbench/activitytype/http/HttpActivity.java

@@ -15,9 +15,9 @@ import io.nosqlbench.engine.api.activityapi.planning.SequencerType;
 import io.nosqlbench.engine.api.activityimpl.ActivityDef;
 import io.nosqlbench.engine.api.activityimpl.SimpleActivity;
 import io.nosqlbench.engine.api.metrics.ActivityMetrics;
-import io.nosqlbench.virtdata.api.BindingsTemplate;
-import io.nosqlbench.virtdata.api.templates.StringBindings;
-import io.nosqlbench.virtdata.api.templates.StringBindingsTemplate;
+import io.nosqlbench.virtdata.core.bindings.BindingsTemplate;
+import io.nosqlbench.virtdata.core.templates.StringBindings;
+import io.nosqlbench.virtdata.core.templates.StringBindingsTemplate;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

activitytype-stdout/src/main/java/io/nosqlbench/activitytype/stdout/AsyncStdoutAction.java

@@ -6,7 +6,7 @@ import io.nosqlbench.engine.api.activityapi.core.ops.fluent.opfacets.StartedOp;
 import io.nosqlbench.engine.api.activityapi.core.ops.fluent.opfacets.TrackedOp;
 import io.nosqlbench.engine.api.activityapi.planning.OpSequence;
 import io.nosqlbench.engine.api.activityimpl.ActivityDef;
-import io.nosqlbench.virtdata.api.templates.StringBindings;
+import io.nosqlbench.virtdata.core.templates.StringBindings;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

activitytype-stdout/src/main/java/io/nosqlbench/activitytype/stdout/StdoutAction.java

@@ -20,7 +20,7 @@ package io.nosqlbench.activitytype.stdout;
 import com.codahale.metrics.Timer;
 import io.nosqlbench.engine.api.activityapi.core.SyncAction;
 import io.nosqlbench.engine.api.activityapi.planning.OpSequence;
-import io.nosqlbench.virtdata.api.templates.StringBindings;
+import io.nosqlbench.virtdata.core.templates.StringBindings;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -65,4 +65,4 @@ public class StdoutAction implements SyncAction {
         return 0;
     }
 
-}
+}

activitytype-stdout/src/main/java/io/nosqlbench/activitytype/stdout/StdoutActivity.java

@@ -33,9 +33,9 @@ import io.nosqlbench.engine.api.activityimpl.SimpleActivity;
 import io.nosqlbench.engine.api.metrics.ActivityMetrics;
 import io.nosqlbench.engine.api.metrics.ExceptionMeterMetrics;
 import io.nosqlbench.engine.api.util.StrInterpolator;
-import io.nosqlbench.virtdata.api.BindingsTemplate;
-import io.nosqlbench.virtdata.api.templates.StringBindings;
-import io.nosqlbench.virtdata.api.templates.StringBindingsTemplate;
+import io.nosqlbench.virtdata.core.bindings.BindingsTemplate;
+import io.nosqlbench.virtdata.core.templates.StringBindings;
+import io.nosqlbench.virtdata.core.templates.StringBindingsTemplate;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

activitytype-stdout/src/main/java/io/nosqlbench/activitytype/stdout/StdoutOpContext.java

@@ -1,6 +1,6 @@
 package io.nosqlbench.activitytype.stdout;
 
-import io.nosqlbench.virtdata.api.templates.StringBindings;
+import io.nosqlbench.virtdata.core.templates.StringBindings;
 
 public class StdoutOpContext {
     StringBindings stringBindings;

engine-api/src/main/java/io/nosqlbench/engine/api/activityconfig/ParsedStmt.java

@@ -18,8 +18,8 @@
 package io.nosqlbench.engine.api.activityconfig;
 
 import io.nosqlbench.engine.api.activityconfig.yaml.StmtDef;
-import io.nosqlbench.virtdata.api.templates.BindPoint;
-import io.nosqlbench.virtdata.api.templates.ParsedTemplate;
+import io.nosqlbench.virtdata.core.templates.BindPoint;
+import io.nosqlbench.virtdata.core.templates.ParsedTemplate;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

engine-api/src/test/java/io/nosqlbench/engine/api/activityconfig/rawyaml/BindingEscapingTest.java

@@ -17,8 +17,8 @@
 
 package io.nosqlbench.engine.api.activityconfig.rawyaml;
 
-import io.nosqlbench.virtdata.api.DataMapper;
-import io.nosqlbench.virtdata.api.VirtData;
+import io.nosqlbench.virtdata.core.bindings.DataMapper;
+import io.nosqlbench.virtdata.core.bindings.VirtData;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.junit.Test;

engine-core/src/main/resources/META-INF/services/javax.annotation.processing.Processor

@@ -1,2 +1,3 @@
-io.nosqlbench.virtdata.processors.FunctionDocInfoProcessor
+io.nosqlbench.virtdata.api.processors.FunctionDocInfoProcessor
+
 io.nosqlbench.nb.api.processors.ServiceProcessor

engine-extensions/src/main/resources/META-INF/services/javax.annotation.processing.Processor

@@ -1,2 +1,3 @@
-io.nosqlbench.virtdata.processors.FunctionDocInfoProcessor
+io.nosqlbench.virtdata.api.processors.FunctionDocInfoProcessor
+
 io.nosqlbench.nb.api.processors.ServiceProcessor

nb/src/main/resources/META-INF/services/javax.annotation.processing.Processor

@@ -1,2 +1,3 @@
-io.nosqlbench.virtdata.processors.FunctionDocInfoProcessor
+io.nosqlbench.virtdata.api.processors.FunctionDocInfoProcessor
+
 io.nosqlbench.nb.api.processors.ServiceProcessor

pom.xml

@@ -45,8 +45,6 @@
     <!-- VIRTDATA MODULES -->
 
     <module>virtdata-api</module>
-    <module>virtdata-annotations</module>
-    <module>virtdata-processors</module>
     <module>virtdata-lang</module>
     <module>virtdata-core</module>
     <module>virtdata-realdata</module>

virtdata-annotations/pom.xml

@@ -1,16 +0,0 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-
-    <artifactId>virtdata-annotations</artifactId>
-    <packaging>jar</packaging>
-
-    <parent>
-        <artifactId>mvn-defaults</artifactId>
-        <groupId>io.nosqlbench</groupId>
-        <version>3.12.73-SNAPSHOT</version>
-        <relativePath>../mvn-defaults</relativePath>
-    </parent>
-
-    <name>virtdata-annotations</name>
-
-</project>

virtdata-api/pom.xml

@@ -27,16 +27,6 @@
             <version>3.12.73-SNAPSHOT</version>
         </dependency>
 
-        <dependency>
-            <groupId>io.nosqlbench</groupId>
-            <artifactId>virtdata-processors</artifactId>
-            <version>3.12.73-SNAPSHOT</version>
-        </dependency>
-<!--        <dependency>-->
-<!--            <groupId>io.nosqlbench</groupId>-->
-<!--            <artifactId>virtdata-annotations</artifactId>-->
-<!--            <version>3.12.73-SNAPSHOT</version>-->
-<!--        </dependency>-->
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>virtdata-lang</artifactId>
@@ -61,6 +51,11 @@
             <scope>test</scope>
         </dependency>
 
+        <dependency>
+            <groupId>com.squareup</groupId>
+            <artifactId>javapoet</artifactId>
+        </dependency>
+
     </dependencies>
 
 </project>

virtdata-api/src/main/java/io/nosqlbench/virtdata/api/annotations/Categories.java

@@ -1,4 +1,4 @@
-package io.nosqlbench.virtdata.annotations;
+package io.nosqlbench.virtdata.api.annotations;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;

virtdata-api/src/main/java/io/nosqlbench/virtdata/api/annotations/Category.java

@@ -1,4 +1,4 @@
-package io.nosqlbench.virtdata.annotations;
+package io.nosqlbench.virtdata.api.annotations;
 
 public enum Category {
     datetime,

virtdata-api/src/main/java/io/nosqlbench/virtdata/api/annotations/DeprecatedFunction.java

@@ -1,4 +1,4 @@
-package io.nosqlbench.virtdata.annotations;/*
+package io.nosqlbench.virtdata.api.annotations;/*
 *   Copyright 2016 jshook
 *   Licensed under the Apache License, Version 2.0 (the "License");
 *   you may not use this file except in compliance with the License.

virtdata-api/src/main/java/io/nosqlbench/virtdata/api/annotations/Description.java

@@ -1,4 +1,4 @@
-package io.nosqlbench.virtdata.annotations;
+package io.nosqlbench.virtdata.api.annotations;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;

virtdata-api/src/main/java/io/nosqlbench/virtdata/api/annotations/Example.java

@@ -1,4 +1,4 @@
-package io.nosqlbench.virtdata.annotations;
+package io.nosqlbench.virtdata.api.annotations;
 
 
 import java.lang.annotation.Repeatable;

virtdata-api/src/main/java/io/nosqlbench/virtdata/api/annotations/ExampleData.java

@@ -1,4 +1,4 @@
-package io.nosqlbench.virtdata.annotations;
+package io.nosqlbench.virtdata.api.annotations;
 
 import java.util.Arrays;
 import java.util.List;

virtdata-api/src/main/java/io/nosqlbench/virtdata/api/annotations/Examples.java

@@ -1,4 +1,4 @@
-package io.nosqlbench.virtdata.annotations;
+package io.nosqlbench.virtdata.api.annotations;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;

virtdata-api/src/main/java/io/nosqlbench/virtdata/api/annotations/Input.java

@@ -1,4 +1,4 @@
-package io.nosqlbench.virtdata.annotations;/*
+package io.nosqlbench.virtdata.api.annotations;/*
 *   Copyright 2016 jshook
 *   Licensed under the Apache License, Version 2.0 (the "License");
 *   you may not use this file except in compliance with the License.

virtdata-api/src/main/java/io/nosqlbench/virtdata/api/annotations/Output.java

@@ -1,4 +1,4 @@
-package io.nosqlbench.virtdata.annotations;/*
+package io.nosqlbench.virtdata.api.annotations;/*
 *   Copyright 2016 jshook
 *   Licensed under the Apache License, Version 2.0 (the "License");
 *   you may not use this file except in compliance with the License.

virtdata-api/src/main/java/io/nosqlbench/virtdata/api/annotations/PerThreadMapper.java

@@ -1,4 +1,4 @@
-package io.nosqlbench.virtdata.annotations;/*
+package io.nosqlbench.virtdata.api.annotations;/*
 *   Copyright 2016 jshook
 *   Licensed under the Apache License, Version 2.0 (the "License");
 *   you may not use this file except in compliance with the License.

virtdata-api/src/main/java/io/nosqlbench/virtdata/api/annotations/Range.java

@@ -1,4 +1,4 @@
-package io.nosqlbench.virtdata.annotations;
+package io.nosqlbench.virtdata.api.annotations;
 
 public enum Range {
     NonNegativeLongs("All positive long values and zero: 0L.." + Long.MAX_VALUE),

virtdata-api/src/main/java/io/nosqlbench/virtdata/api/annotations/See.java

@@ -13,7 +13,7 @@
 *   limitations under the License.
 */
 
-package io.nosqlbench.virtdata.annotations;
+package io.nosqlbench.virtdata.api.annotations;
 
 import java.lang.annotation.*;
 

virtdata-api/src/main/java/io/nosqlbench/virtdata/api/annotations/SeeList.java

@@ -1,4 +1,4 @@
-package io.nosqlbench.virtdata.annotations;
+package io.nosqlbench.virtdata.api.annotations;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;

virtdata-api/src/main/java/io/nosqlbench/virtdata/api/annotations/ThreadSafeMapper.java

@@ -1,4 +1,4 @@
-package io.nosqlbench.virtdata.annotations;/*
+package io.nosqlbench.virtdata.api.annotations;/*
 *   Copyright 2016 jshook
 *   Licensed under the Apache License, Version 2.0 (the "License");
 *   you may not use this file except in compliance with the License.

virtdata-api/src/main/java/io/nosqlbench/virtdata/api/processors/DocCtorData.java

@@ -1,4 +1,4 @@
-package io.nosqlbench.virtdata.processors;
+package io.nosqlbench.virtdata.api.processors;
 
 import java.util.List;
 import java.util.Map;

virtdata-api/src/main/java/io/nosqlbench/virtdata/api/processors/DocForFunc.java

@@ -1,6 +1,6 @@
-package io.nosqlbench.virtdata.processors;
+package io.nosqlbench.virtdata.api.processors;
 
-import io.nosqlbench.virtdata.annotations.Category;
+import io.nosqlbench.virtdata.api.annotations.Category;
 
 import java.util.ArrayList;
 import java.util.LinkedHashMap;

virtdata-api/src/main/java/io/nosqlbench/virtdata/api/processors/DocForFuncCtor.java

@@ -1,6 +1,6 @@
-package io.nosqlbench.virtdata.processors;
+package io.nosqlbench.virtdata.api.processors;
 
-import io.nosqlbench.virtdata.annotations.ExampleData;
+import io.nosqlbench.virtdata.api.annotations.ExampleData;
 
 import java.util.ArrayList;
 import java.util.LinkedHashMap;

virtdata-api/src/main/java/io/nosqlbench/virtdata/api/processors/DocFuncData.java

@@ -1,6 +1,6 @@
-package io.nosqlbench.virtdata.processors;
+package io.nosqlbench.virtdata.api.processors;
 
-import io.nosqlbench.virtdata.annotations.Category;
+import io.nosqlbench.virtdata.api.annotations.Category;
 
 import java.util.List;
 

virtdata-api/src/main/java/io/nosqlbench/virtdata/api/processors/ExampleDocData.java

@@ -1,6 +1,6 @@
-package io.nosqlbench.virtdata.processors;
+package io.nosqlbench.virtdata.api.processors;
 
-import io.nosqlbench.virtdata.annotations.Category;
+import io.nosqlbench.virtdata.api.annotations.Category;
 
 import java.util.ArrayList;
 import java.util.LinkedHashMap;

virtdata-api/src/main/java/io/nosqlbench/virtdata/api/processors/ExampleManifest.java

@@ -1,4 +1,4 @@
-package io.nosqlbench.virtdata.processors;
+package io.nosqlbench.virtdata.api.processors;
 
 import java.util.ArrayList;
 import java.util.LinkedHashMap;

virtdata-api/src/main/java/io/nosqlbench/virtdata/api/processors/FuncEnumerator.java

@@ -1,6 +1,6 @@
-package io.nosqlbench.virtdata.processors;
+package io.nosqlbench.virtdata.api.processors;
 
-import io.nosqlbench.virtdata.annotations.Category;
+import io.nosqlbench.virtdata.api.annotations.Category;
 
 import javax.annotation.processing.Filer;
 import javax.lang.model.util.Elements;

virtdata-api/src/main/java/io/nosqlbench/virtdata/api/processors/FunctionDocInfoProcessor.java

@@ -1,7 +1,12 @@
-package io.nosqlbench.virtdata.processors;
-//io.nosqlbench.virtdata.processors.FunctionDocInfoProcessor
-//io.nosqlbench.virtdata.processors.FunctionDocInfoProcessor
-import io.nosqlbench.virtdata.annotations.*;
+package io.nosqlbench.virtdata.api.processors;
+//io.nosqlbench.virtdata.api.processors.FunctionDocInfoProcessor
+
+//io.nosqlbench.virtdata.api.processors.FunctionDocInfoProcessor
+
+
+import io.nosqlbench.virtdata.api.annotations.Categories;
+import io.nosqlbench.virtdata.api.annotations.Category;
+import io.nosqlbench.virtdata.api.annotations.Example;
 
 import javax.annotation.processing.*;
 import javax.lang.model.SourceVersion;
@@ -13,10 +18,8 @@ import java.util.*;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
-import static io.nosqlbench.virtdata.processors.ProcessorClassNames.PerThreadMapper;
-import static io.nosqlbench.virtdata.processors.ProcessorClassNames.ThreadSafeMapper;
-
-/**
+import static io.nosqlbench.virtdata.api.processors.ProcessorClassNames.PerThreadMapper;
+import static io.nosqlbench.virtdata.api.processors.ProcessorClassNames.ThreadSafeMapper;/**
  * This documentation processor is responsible for finding all the enumerated that feed documentation
  * manifests. It simply calls listener interfaces to do the rest of the work.
  */
@@ -61,8 +64,8 @@ public class FunctionDocInfoProcessor extends AbstractProcessor {
 
         List<Element> ts = new ArrayList<>();
 
-        ts.addAll(roundEnv.getElementsAnnotatedWith(ThreadSafeMapper.class));
-        ts.addAll(roundEnv.getElementsAnnotatedWith(PerThreadMapper.class));
+        ts.addAll(roundEnv.getElementsAnnotatedWith(io.nosqlbench.virtdata.api.annotations.ThreadSafeMapper.class));
+        ts.addAll(roundEnv.getElementsAnnotatedWith(io.nosqlbench.virtdata.api.annotations.PerThreadMapper.class));
 
         for (Element classElem : ts) {
 

virtdata-api/src/main/java/io/nosqlbench/virtdata/api/processors/FunctionDocInfoWriter.java

@@ -1,8 +1,8 @@
-package io.nosqlbench.virtdata.processors;
+package io.nosqlbench.virtdata.api.processors;
 
 import com.squareup.javapoet.*;
 import io.nosqlbench.nb.api.annotations.Service;
-import io.nosqlbench.virtdata.annotations.Category;
+import io.nosqlbench.virtdata.api.annotations.Category;
 
 import javax.annotation.processing.Filer;
 import javax.annotation.processing.Messager;
@@ -115,7 +115,7 @@ public class FunctionDocInfoWriter implements FuncEnumerator.Listener {
                 .returns(ArrayTypeName.of(Category.class))
                 .addStatement("return new $T[] { " +
                         Arrays.stream(doc.getCategories()).map(c -> "Category." + c)
-                                .collect(Collectors.joining(","))+" }",Category.class).build();
+                                .collect(Collectors.joining(","))+" }", Category.class).build();
         methods.add(getCategoriesMethod);
 
         MethodSpec getCtorsMethod = MethodSpec.methodBuilder("getCtors")

virtdata-api/src/main/java/io/nosqlbench/virtdata/api/processors/FunctionManifestProcessor.java

@@ -1,4 +1,4 @@
-package io.nosqlbench.virtdata.processors;
+package io.nosqlbench.virtdata.api.processors;
 
 import javax.annotation.processing.*;
 import javax.lang.model.SourceVersion;
@@ -12,14 +12,14 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.Set;
 
-import static io.nosqlbench.virtdata.processors.ProcessorClassNames.PerThreadMapper;
-import static io.nosqlbench.virtdata.processors.ProcessorClassNames.ThreadSafeMapper;
+import static io.nosqlbench.virtdata.api.processors.ProcessorClassNames.PerThreadMapper;
+import static io.nosqlbench.virtdata.api.processors.ProcessorClassNames.ThreadSafeMapper;
 
 /**
  * This annotation processor is responsible for finding all annotated functions and adding
  * them to the manifest file for the current project.
- * Specifically, any class annotated as {@link io.nosqlbench.virtdata.annotations.ThreadSafeMapper}
- * or {@link io.nosqlbench.virtdata.annotations.PerThreadMapper} are recorded in
+ * Specifically, any class annotated as {@link io.nosqlbench.virtdata.api.annotations.ThreadSafeMapper}
+ * or {@link io.nosqlbench.virtdata.api.annotations.PerThreadMapper} are recorded in
  * <pre>classes/META-INF/functions</pre>
  *
  * This operates slightly differently than the service loader facility. The point is to

virtdata-api/src/main/java/io/nosqlbench/virtdata/api/processors/ProcessorClassNames.java

@@ -1,4 +1,4 @@
-package io.nosqlbench.virtdata.processors;
+package io.nosqlbench.virtdata.api.processors;
 
 /**
  * Statically defined names which need to be visible for refactoring

virtdata-core/docs/types.puml

@@ -1,13 +0,0 @@
-@startuml
-scale 350 width
-[*] --> long
-long --> long
-long --> int
-long --> double
-int --> String
-double --> String
-long --> String
-long --> Date
-long --> Bytes
-long --> T
-@enduml

virtdata-core/src/main/java/io/nosqlbench/virtdata/core/bindings/Binder.java

@@ -1,4 +1,4 @@
-package io.nosqlbench.virtdata.api;
+package io.nosqlbench.virtdata.core.bindings;
 
 /***
  * A Binder is a type that knows how to return a result object given a long value

virtdata-core/src/main/java/io/nosqlbench/virtdata/core/bindings/Bindings.java

@@ -16,7 +16,7 @@
  *
  */
 
-package io.nosqlbench.virtdata.api;
+package io.nosqlbench.virtdata.core.bindings;
 
 //
 

virtdata-core/src/main/java/io/nosqlbench/virtdata/core/bindings/BindingsCache.java

@@ -12,7 +12,7 @@
 *   See the License for the specific language governing permissions and
 *   limitations under the License.
 */
-package io.nosqlbench.virtdata.api;
+package io.nosqlbench.virtdata.core.bindings;
 
 import java.util.HashMap;
 import java.util.Map;

virtdata-core/src/main/java/io/nosqlbench/virtdata/core/bindings/BindingsTemplate.java

@@ -16,11 +16,11 @@
  *
  */
 
-package io.nosqlbench.virtdata.api;
+package io.nosqlbench.virtdata.core.bindings;
 
 //
 
-import io.nosqlbench.virtdata.api.templates.BindPoint;
+import io.nosqlbench.virtdata.core.templates.BindPoint;
 import org.apache.logging.log4j.Logger;
 import org.apache.logging.log4j.LogManager;
 

virtdata-core/src/main/java/io/nosqlbench/virtdata/core/bindings/CompatibilityFixups.java

@@ -1,4 +1,4 @@
-package io.nosqlbench.virtdata.api;
+package io.nosqlbench.virtdata.core.bindings;
 
 import org.apache.logging.log4j.Logger;
 import org.apache.logging.log4j.LogManager;

virtdata-core/src/main/java/io/nosqlbench/virtdata/core/bindings/ContextualArrayBindings.java

@@ -1,4 +1,4 @@
-package io.nosqlbench.virtdata.api;
+package io.nosqlbench.virtdata.core.bindings;
 
 /**
  * <p>A thread-local template that describes a set of data mappers, a context object,

virtdata-core/src/main/java/io/nosqlbench/virtdata/core/bindings/ContextualBindings.java

@@ -1,4 +1,4 @@
-package io.nosqlbench.virtdata.api;
+package io.nosqlbench.virtdata.core.bindings;
 
 /**
  * <p>A thread-local template that describes a set of data mappers, a context object, and a method for applying

virtdata-core/src/main/java/io/nosqlbench/virtdata/core/bindings/ContextualBindingsArrayTemplate.java

@@ -1,4 +1,4 @@
-package io.nosqlbench.virtdata.api;
+package io.nosqlbench.virtdata.core.bindings;
 
 /**
  * A template that maps a set of specifiers, a context object, and a method for applying

virtdata-core/src/main/java/io/nosqlbench/virtdata/core/bindings/ContextualBindingsTemplate.java

@@ -1,4 +1,4 @@
-package io.nosqlbench.virtdata.api;
+package io.nosqlbench.virtdata.core.bindings;
 
 /**
  * A template that maps a set of specifiers, a context object, and a method for applying

virtdata-core/src/main/java/io/nosqlbench/virtdata/core/bindings/ContextualMapBindings.java

@@ -1,4 +1,4 @@
-package io.nosqlbench.virtdata.api;
+package io.nosqlbench.virtdata.core.bindings;
 
 import java.util.HashMap;
 import java.util.Map;

virtdata-core/src/main/java/io/nosqlbench/virtdata/core/bindings/DataMapper.java

@@ -1,4 +1,4 @@
-package io.nosqlbench.virtdata.api;
+package io.nosqlbench.virtdata.core.bindings;
 
 public interface DataMapper<R> {
     R get(long input);

virtdata-core/src/main/java/io/nosqlbench/virtdata/core/bindings/DataMapperFunctionMapper.java

@@ -1,7 +1,4 @@
-package io.nosqlbench.virtdata.api;
-
-import io.nosqlbench.virtdata.api.FunctionType;
-import io.nosqlbench.virtdata.api.DataMapper;
+package io.nosqlbench.virtdata.core.bindings;
 
 import java.util.function.*;
 

virtdata-core/src/main/java/io/nosqlbench/virtdata/core/bindings/DataMapperLibrary.java

@@ -1,4 +1,4 @@
-package io.nosqlbench.virtdata.api;
+package io.nosqlbench.virtdata.core.bindings;
 
 import java.util.List;
 import java.util.Optional;

virtdata-core/src/main/java/io/nosqlbench/virtdata/core/bindings/DataMapperLibraryFinder.java

@@ -12,9 +12,8 @@
 *   See the License for the specific language governing permissions and
 *   limitations under the License.
 */
-package io.nosqlbench.virtdata.api;
+package io.nosqlbench.virtdata.core.bindings;
 
-import io.nosqlbench.virtdata.api.DataMapperLibrary;
 import org.apache.logging.log4j.Logger;
 import org.apache.logging.log4j.LogManager;
 

virtdata-core/src/main/java/io/nosqlbench/virtdata/core/bindings/FunctionType.java

@@ -1,4 +1,4 @@
-package io.nosqlbench.virtdata.api;
+package io.nosqlbench.virtdata.core.bindings;
 
 import java.util.function.*;
 

virtdata-core/src/main/java/io/nosqlbench/virtdata/core/bindings/FunctionTyper.java

@@ -1,4 +1,4 @@
-package io.nosqlbench.virtdata.api;
+package io.nosqlbench.virtdata.core.bindings;
 
 import java.lang.reflect.Method;
 import java.util.Arrays;

virtdata-core/src/main/java/io/nosqlbench/virtdata/core/bindings/LazyValuesMap.java

@@ -12,7 +12,7 @@
 *   See the License for the specific language governing permissions and
 *   limitations under the License.
 */
-package io.nosqlbench.virtdata.api;
+package io.nosqlbench.virtdata.core.bindings;
 
 import java.util.*;
 

virtdata-core/src/main/java/io/nosqlbench/virtdata/core/bindings/Named.java

@@ -1,4 +1,4 @@
-package io.nosqlbench.virtdata.api;
+package io.nosqlbench.virtdata.core.bindings;
 
 public interface Named {
     /**

virtdata-core/src/main/java/io/nosqlbench/virtdata/core/bindings/ResolvedFunction.java

@@ -1,4 +1,4 @@
-package io.nosqlbench.virtdata.api;
+package io.nosqlbench.virtdata.core.bindings;
 
 import java.lang.invoke.MethodHandles;
 import java.lang.reflect.Method;

virtdata-core/src/main/java/io/nosqlbench/virtdata/core/bindings/ResolverDiagnostics.java

@@ -1,4 +1,4 @@
-package io.nosqlbench.virtdata.api;
+package io.nosqlbench.virtdata.core.bindings;
 
 import org.apache.logging.log4j.Logger;
 import org.apache.logging.log4j.LogManager;

virtdata-core/src/main/java/io/nosqlbench/virtdata/core/bindings/StringObjectPromoter.java

@@ -1,4 +1,4 @@
-package io.nosqlbench.virtdata.api;
+package io.nosqlbench.virtdata.core.bindings;
 
 import java.math.BigDecimal;
 import java.math.BigInteger;

virtdata-core/src/main/java/io/nosqlbench/virtdata/core/bindings/VALUE.java

@@ -1,4 +1,4 @@
-package io.nosqlbench.virtdata.api;
+package io.nosqlbench.virtdata.core.bindings;
 
 /**
  * A public class which holds global values. This is used for holding