From 574a89e75ab1be6ca055a0252fba0801382b4efa Mon Sep 17 00:00:00 2001 From: Jonathan Shook Date: Fri, 23 Oct 2020 02:36:04 -0500 Subject: [PATCH] pull ConfigAware api up --- .../datamappers/functions/to_tuple/CustomFunc955.java | 10 +++------- .../java/io/nosqlbench/nb/api}/config/ConfigAware.java | 2 +- .../java/io/nosqlbench/nb/api}/config/ConfigData.java | 2 +- .../java/io/nosqlbench/nb/api}/config/ConfigModel.java | 6 +++--- .../nosqlbench/nb/api}/config/MutableConfigModel.java | 2 +- .../core/bindings/VirtDataFunctionResolver.java | 7 ++----- .../virtdata/core/config/ConfigDataTest.java | 1 + .../library/basics/shared/stateful/LoadElement.java | 6 +++--- 8 files changed, 15 insertions(+), 21 deletions(-) rename {virtdata-api/src/main/java/io/nosqlbench/virtdata/core => nb-api/src/main/java/io/nosqlbench/nb/api}/config/ConfigAware.java (75%) rename {virtdata-api/src/main/java/io/nosqlbench/virtdata/core => nb-api/src/main/java/io/nosqlbench/nb/api}/config/ConfigData.java (98%) rename {virtdata-api/src/main/java/io/nosqlbench/virtdata/core => nb-api/src/main/java/io/nosqlbench/nb/api}/config/ConfigModel.java (71%) rename {virtdata-api/src/main/java/io/nosqlbench/virtdata/core => nb-api/src/main/java/io/nosqlbench/nb/api}/config/MutableConfigModel.java (93%) diff --git a/driver-cql-shaded/src/main/java/io/nosqlbench/activitytype/cql/datamappers/functions/to_tuple/CustomFunc955.java b/driver-cql-shaded/src/main/java/io/nosqlbench/activitytype/cql/datamappers/functions/to_tuple/CustomFunc955.java index 1fca59d2a..b3e359c87 100644 --- a/driver-cql-shaded/src/main/java/io/nosqlbench/activitytype/cql/datamappers/functions/to_tuple/CustomFunc955.java +++ b/driver-cql-shaded/src/main/java/io/nosqlbench/activitytype/cql/datamappers/functions/to_tuple/CustomFunc955.java @@ -4,19 +4,15 @@ import com.datastax.driver.core.Cluster; import com.datastax.driver.core.DataType; import com.datastax.driver.core.TupleType; import com.datastax.driver.core.TupleValue; -import io.nosqlbench.nb.api.errors.BasicError; import io.nosqlbench.virtdata.api.annotations.ThreadSafeMapper; -import io.nosqlbench.virtdata.core.config.ConfigAware; -import io.nosqlbench.virtdata.core.config.ConfigModel; -import io.nosqlbench.virtdata.core.config.MutableConfigModel; +import io.nosqlbench.nb.api.config.ConfigAware; +import io.nosqlbench.nb.api.config.ConfigModel; +import io.nosqlbench.nb.api.config.MutableConfigModel; -import java.math.BigInteger; import java.util.*; -import java.util.function.Function; import java.util.function.LongFunction; import java.util.function.LongToIntFunction; import java.util.function.LongUnaryOperator; -import java.util.regex.Pattern; /** * Temporary function to test a specific nested type. This should be replaced diff --git a/virtdata-api/src/main/java/io/nosqlbench/virtdata/core/config/ConfigAware.java b/nb-api/src/main/java/io/nosqlbench/nb/api/config/ConfigAware.java similarity index 75% rename from virtdata-api/src/main/java/io/nosqlbench/virtdata/core/config/ConfigAware.java rename to nb-api/src/main/java/io/nosqlbench/nb/api/config/ConfigAware.java index ce69c5419..de040a6fe 100644 --- a/virtdata-api/src/main/java/io/nosqlbench/virtdata/core/config/ConfigAware.java +++ b/nb-api/src/main/java/io/nosqlbench/nb/api/config/ConfigAware.java @@ -1,4 +1,4 @@ -package io.nosqlbench.virtdata.core.config; +package io.nosqlbench.nb.api.config; import java.util.Map; diff --git a/virtdata-api/src/main/java/io/nosqlbench/virtdata/core/config/ConfigData.java b/nb-api/src/main/java/io/nosqlbench/nb/api/config/ConfigData.java similarity index 98% rename from virtdata-api/src/main/java/io/nosqlbench/virtdata/core/config/ConfigData.java rename to nb-api/src/main/java/io/nosqlbench/nb/api/config/ConfigData.java index fc491c7d4..26d07cfc9 100644 --- a/virtdata-api/src/main/java/io/nosqlbench/virtdata/core/config/ConfigData.java +++ b/nb-api/src/main/java/io/nosqlbench/nb/api/config/ConfigData.java @@ -1,4 +1,4 @@ -package io.nosqlbench.virtdata.core.config; +package io.nosqlbench.nb.api.config; import io.nosqlbench.nb.api.errors.BasicError; diff --git a/virtdata-api/src/main/java/io/nosqlbench/virtdata/core/config/ConfigModel.java b/nb-api/src/main/java/io/nosqlbench/nb/api/config/ConfigModel.java similarity index 71% rename from virtdata-api/src/main/java/io/nosqlbench/virtdata/core/config/ConfigModel.java rename to nb-api/src/main/java/io/nosqlbench/nb/api/config/ConfigModel.java index 8d97a9de9..4a1eff0ce 100644 --- a/virtdata-api/src/main/java/io/nosqlbench/virtdata/core/config/ConfigModel.java +++ b/nb-api/src/main/java/io/nosqlbench/nb/api/config/ConfigModel.java @@ -1,17 +1,17 @@ -package io.nosqlbench.virtdata.core.config; +package io.nosqlbench.nb.api.config; import java.util.List; public interface ConfigModel { List getElements(); - public static class Element { + class Element { public final String name; public final Class type; public Element(String name, Class type) { this.name = name; - this.type =type; + this.type = type; } } } diff --git a/virtdata-api/src/main/java/io/nosqlbench/virtdata/core/config/MutableConfigModel.java b/nb-api/src/main/java/io/nosqlbench/nb/api/config/MutableConfigModel.java similarity index 93% rename from virtdata-api/src/main/java/io/nosqlbench/virtdata/core/config/MutableConfigModel.java rename to nb-api/src/main/java/io/nosqlbench/nb/api/config/MutableConfigModel.java index 04cd1b7f7..18790b595 100644 --- a/virtdata-api/src/main/java/io/nosqlbench/virtdata/core/config/MutableConfigModel.java +++ b/nb-api/src/main/java/io/nosqlbench/nb/api/config/MutableConfigModel.java @@ -1,4 +1,4 @@ -package io.nosqlbench.virtdata.core.config; +package io.nosqlbench.nb.api.config; import java.util.ArrayList; import java.util.Collections; diff --git a/virtdata-api/src/main/java/io/nosqlbench/virtdata/core/bindings/VirtDataFunctionResolver.java b/virtdata-api/src/main/java/io/nosqlbench/virtdata/core/bindings/VirtDataFunctionResolver.java index 1ce09120f..60a94a32f 100644 --- a/virtdata-api/src/main/java/io/nosqlbench/virtdata/core/bindings/VirtDataFunctionResolver.java +++ b/virtdata-api/src/main/java/io/nosqlbench/virtdata/core/bindings/VirtDataFunctionResolver.java @@ -1,7 +1,7 @@ package io.nosqlbench.virtdata.core.bindings; import io.nosqlbench.virtdata.api.annotations.ThreadSafeMapper; -import io.nosqlbench.virtdata.core.config.ConfigAware; +import io.nosqlbench.nb.api.config.ConfigAware; import org.apache.commons.lang3.ClassUtils; import org.apache.logging.log4j.Logger; import org.apache.logging.log4j.LogManager; @@ -64,10 +64,7 @@ public class VirtDataFunctionResolver { return false; } Class componentType = ctypes[ctypes.length - 1].getComponentType(); - if (parameterTypes.length >= ctypes.length && !ClassUtils.isAssignable(parameterTypes[ctypes.length - 1], componentType, true)) { - return false; - } - return true; + return parameterTypes.length < ctypes.length || ClassUtils.isAssignable(parameterTypes[ctypes.length - 1], componentType, true); } else { if (parameterTypes.length!=ctypes.length) { return false; diff --git a/virtdata-api/src/test/java/io/nosqlbench/virtdata/core/config/ConfigDataTest.java b/virtdata-api/src/test/java/io/nosqlbench/virtdata/core/config/ConfigDataTest.java index c57b708f1..a6bd8c30a 100644 --- a/virtdata-api/src/test/java/io/nosqlbench/virtdata/core/config/ConfigDataTest.java +++ b/virtdata-api/src/test/java/io/nosqlbench/virtdata/core/config/ConfigDataTest.java @@ -1,5 +1,6 @@ package io.nosqlbench.virtdata.core.config; +import io.nosqlbench.nb.api.config.ConfigData; import org.junit.Test; import java.util.List; diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/stateful/LoadElement.java b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/stateful/LoadElement.java index 1b018660f..ac810cc8a 100644 --- a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/stateful/LoadElement.java +++ b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/stateful/LoadElement.java @@ -2,9 +2,9 @@ package io.nosqlbench.virtdata.library.basics.shared.stateful; import io.nosqlbench.virtdata.api.annotations.Example; import io.nosqlbench.virtdata.api.annotations.ThreadSafeMapper; -import io.nosqlbench.virtdata.core.config.ConfigAware; -import io.nosqlbench.virtdata.core.config.ConfigModel; -import io.nosqlbench.virtdata.core.config.MutableConfigModel; +import io.nosqlbench.nb.api.config.ConfigAware; +import io.nosqlbench.nb.api.config.ConfigModel; +import io.nosqlbench.nb.api.config.MutableConfigModel; import java.util.Map; import java.util.function.Function;