restructuring

This commit is contained in:
Jonathan Shook
2020-02-24 10:20:00 -06:00
parent 8d0008f28d
commit 95bdc31708
1359 changed files with 3639 additions and 3771 deletions

View File

@@ -2,10 +2,10 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<artifactId>virtdata-defaults</artifactId>
<artifactId>mvn-defaults</artifactId>
<groupId>io.nosqlbench</groupId>
<version>2.12.16-SNAPSHOT</version>
<relativePath>../virtdata-defaults</relativePath>
<version>2.12.66-SNAPSHOT</version>
<relativePath>../mvn-defaults</relativePath>
</parent>
<artifactId>virtdata-userlibs</artifactId>
@@ -17,38 +17,38 @@
<dependency>
<groupId>io.nosqlbench</groupId>
<artifactId>virtdata-realdata</artifactId>
<version>2.12.16-SNAPSHOT</version>
<version>2.12.66-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>io.nosqlbench</groupId>
<artifactId>virtdata-lib-realer</artifactId>
<version>2.12.16-SNAPSHOT</version>
<version>2.12.66-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>io.nosqlbench</groupId>
<artifactId>virtdata-api</artifactId>
<version>2.12.16-SNAPSHOT</version>
<version>2.12.66-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>io.nosqlbench</groupId>
<artifactId>virtdata-lib-random</artifactId>
<version>2.12.16-SNAPSHOT</version>
<version>2.12.66-SNAPSHOT</version>
</dependency>
<dependency>
<artifactId>virtdata-lib-basics</artifactId>
<groupId>io.nosqlbench</groupId>
<version>2.12.16-SNAPSHOT</version>
<version>2.12.66-SNAPSHOT</version>
</dependency>
<dependency>
<artifactId>virtdata-lib-curves4</artifactId>
<groupId>io.nosqlbench</groupId>
<version>2.12.16-SNAPSHOT</version>
<version>2.12.66-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>io.nosqlbench</groupId>
<artifactId>virtdata-docsys</artifactId>
<version>2.12.16-SNAPSHOT</version>
<version>2.12.66-SNAPSHOT</version>
</dependency>
<dependency>
@@ -132,7 +132,7 @@
<configuration>
<transformers combine.children="append">
<transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
<mainClass>io.virtdata.apps.VirtDataMainApp</mainClass>
<mainClass>io.nosqlbench.virtdata.userlibs.apps.VirtDataMainApp</mainClass>
</transformer>
<transformer implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer" />
</transformers>

View File

@@ -1,8 +1,8 @@
package io.virtdata.apps;
package io.nosqlbench.virtdata.userlibs.apps;
import io.virtdata.apps.docsapp.AutoDocsApp;
import io.virtdata.apps.valuesapp.ValuesCheckerApp;
import io.virtdata.docsys.core.DocServerApp;
import io.nosqlbench.virtdata.userlibs.apps.docsapp.AutoDocsApp;
import io.nosqlbench.virtdata.userlibs.apps.valuesapp.ValuesCheckerApp;
import io.nosqlbench.docsys.core.DocServerApp;
import java.util.Arrays;
import java.util.stream.Collectors;

View File

@@ -1,10 +1,10 @@
package io.virtdata.apps;
package io.nosqlbench.virtdata.userlibs.apps;
import io.virtdata.annotations.Service;
import io.virtdata.api.DataMapper;
import io.virtdata.core.ResolverDiagnostics;
import io.virtdata.core.VirtData;
import io.virtdata.docsys.api.WebServiceObject;
import io.nosqlbench.virtdata.annotations.Service;
import io.nosqlbench.virtdata.api.DataMapper;
import io.nosqlbench.virtdata.api.ResolverDiagnostics;
import io.nosqlbench.virtdata.api.VirtData;
import io.nosqlbench.docsys.api.WebServiceObject;
import javax.inject.Singleton;
import javax.ws.rs.GET;

View File

@@ -1,12 +1,12 @@
package io.virtdata.apps.docsapp;
package io.nosqlbench.virtdata.userlibs.apps.docsapp;
import com.google.gson.Gson;
import com.google.gson.GsonBuilder;
import com.vladsch.flexmark.convert.html.FlexmarkHtmlParser;
import io.virtdata.annotations.Category;
import io.virtdata.core.VirtDataDocs;
import io.virtdata.processors.DocCtorData;
import io.virtdata.processors.DocFuncData;
import io.nosqlbench.virtdata.annotations.Category;
import io.nosqlbench.virtdata.api.VirtDataDocs;
import io.nosqlbench.virtdata.processors.DocCtorData;
import io.nosqlbench.virtdata.processors.DocFuncData;
import org.apache.logging.log4j.Logger;
import org.apache.logging.log4j.LogManager;

View File

@@ -1,8 +1,8 @@
package io.virtdata.apps.docsapp;
package io.nosqlbench.virtdata.userlibs.apps.docsapp;
import com.google.gson.Gson;
import com.google.gson.GsonBuilder;
import io.virtdata.processors.DocFuncData;
import io.nosqlbench.virtdata.processors.DocFuncData;
import java.util.List;

View File

@@ -1,11 +1,11 @@
package io.virtdata.apps.docsapp;
package io.nosqlbench.virtdata.userlibs.apps.docsapp;
import com.fasterxml.jackson.databind.SerializationFeature;
import com.fasterxml.jackson.jaxrs.annotation.JacksonFeatures;
import io.virtdata.annotations.Service;
import io.virtdata.core.VirtDataDocs;
import io.virtdata.docsys.api.WebServiceObject;
import io.virtdata.processors.DocFuncData;
import io.nosqlbench.virtdata.annotations.Service;
import io.nosqlbench.virtdata.api.VirtDataDocs;
import io.nosqlbench.docsys.api.WebServiceObject;
import io.nosqlbench.virtdata.processors.DocFuncData;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;

View File

@@ -1,8 +1,7 @@
package io.virtdata.apps.docsapp;
package io.nosqlbench.virtdata.userlibs.apps.docsapp;
import io.virtdata.annotations.Category;
import io.virtdata.api.config.MutableConfigModel;
import io.virtdata.processors.DocCtorData;
import io.nosqlbench.virtdata.annotations.Category;
import io.nosqlbench.virtdata.processors.DocCtorData;
import java.util.*;

View File

@@ -16,7 +16,7 @@
*
*/
package io.virtdata.apps.valuesapp;
package io.nosqlbench.virtdata.userlibs.apps.valuesapp;
import java.util.concurrent.ThreadFactory;
import java.util.concurrent.atomic.AtomicInteger;

View File

@@ -1,4 +1,4 @@
package io.virtdata.apps.valuesapp;
package io.nosqlbench.virtdata.userlibs.apps.valuesapp;
public class LongHistogram implements PostProcessor {

View File

@@ -1,4 +1,4 @@
package io.virtdata.apps.valuesapp;
package io.nosqlbench.virtdata.userlibs.apps.valuesapp;
public interface PostProcessor extends AutoCloseable {
void process(Object[] values);

View File

@@ -1,4 +1,4 @@
package io.virtdata.apps.valuesapp;
package io.nosqlbench.virtdata.userlibs.apps.valuesapp;
public class RunData {
public String spec;

View File

@@ -1,4 +1,4 @@
package io.virtdata.apps.valuesapp;
package io.nosqlbench.virtdata.userlibs.apps.valuesapp;
import org.apache.logging.log4j.Logger;
import org.apache.logging.log4j.LogManager;

View File

@@ -1,7 +1,7 @@
package io.virtdata.apps.valuesapp;
package io.nosqlbench.virtdata.userlibs.apps.valuesapp;
import io.virtdata.api.DataMapper;
import io.virtdata.core.VirtData;
import io.nosqlbench.virtdata.api.DataMapper;
import io.nosqlbench.virtdata.api.VirtData;
import org.apache.logging.log4j.Logger;
import org.apache.logging.log4j.LogManager;

View File

@@ -1,4 +1,4 @@
package io.virtdata.apps.valuesapp;
package io.nosqlbench.virtdata.userlibs.apps.valuesapp;
public class ValuesCheckerExceptionHandler implements Thread.UncaughtExceptionHandler {

View File

@@ -1,7 +1,7 @@
package io.virtdata.apps.valuesapp;
package io.nosqlbench.virtdata.userlibs.apps.valuesapp;
import io.virtdata.api.DataMapper;
import io.virtdata.core.VirtData;
import io.nosqlbench.virtdata.api.DataMapper;
import io.nosqlbench.virtdata.api.VirtData;
import org.apache.logging.log4j.Logger;
import org.apache.logging.log4j.LogManager;

View File

@@ -1,9 +1,9 @@
package io.virtdata.docinfo;
package io.nosqlbench.virtdata.userlibs.docinfo;
import io.virtdata.annotations.Service;
import io.virtdata.docsys.api.Docs;
import io.virtdata.docsys.api.DocsBinder;
import io.virtdata.docsys.api.DocsysDynamicManifest;
import io.nosqlbench.virtdata.annotations.Service;
import io.nosqlbench.docsys.api.Docs;
import io.nosqlbench.docsys.api.DocsBinder;
import io.nosqlbench.docsys.api.DocsysDynamicManifest;
@Service(DocsysDynamicManifest.class)
public class VirtdataMarkdownManifest implements DocsysDynamicManifest {

View File

@@ -1,4 +1,4 @@
package io.virtdata.testing;
package io.nosqlbench.virtdata.userlibs.testing;
public class ARandomPOJO {
private final long value;

View File

@@ -1,4 +1,4 @@
package io.virtdata.testing;
package io.nosqlbench.virtdata.userlibs.testing;
import java.util.function.LongFunction;

View File

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

View File

@@ -1,6 +1,7 @@
package io.virtdata.core;
package io.nosqlbench.virtdata.core;
import io.virtdata.processors.DocFuncData;
import io.nosqlbench.virtdata.api.VirtDataDocs;
import io.nosqlbench.virtdata.processors.DocFuncData;
import org.testng.annotations.Test;
import java.util.List;

View File

@@ -1,8 +1,8 @@
package io.virtdata;
import io.virtdata.libbasics.shared.distributions.DelimFrequencySampler;
import io.virtdata.libbasics.shared.distributions.WeightedStringsFromCSV;
import io.virtdata.libbasics.shared.distributions.CSVFrequencySampler;
import io.nosqlbench.virtdata.library.basics.shared.distributions.DelimFrequencySampler;
import io.nosqlbench.virtdata.library.basics.shared.distributions.WeightedStringsFromCSV;
import io.nosqlbench.virtdata.library.basics.shared.distributions.CSVFrequencySampler;
import org.testng.annotations.Test;
import static org.assertj.core.api.Assertions.assertThat;

View File

@@ -15,9 +15,9 @@
package io.virtdata;
import io.virtdata.api.DataMapper;
import io.virtdata.core.Bindings;
import io.virtdata.core.VirtData;
import io.nosqlbench.virtdata.api.DataMapper;
import io.nosqlbench.virtdata.api.Bindings;
import io.nosqlbench.virtdata.api.VirtData;
import org.testng.annotations.Test;
import java.util.LinkedHashMap;

View File

@@ -15,11 +15,11 @@
package io.virtdata;
import io.virtdata.api.DataMapper;
import io.virtdata.core.Bindings;
import io.virtdata.core.BindingsTemplate;
import io.virtdata.core.ResolverDiagnostics;
import io.virtdata.core.VirtData;
import io.nosqlbench.virtdata.api.DataMapper;
import io.nosqlbench.virtdata.api.Bindings;
import io.nosqlbench.virtdata.api.BindingsTemplate;
import io.nosqlbench.virtdata.api.ResolverDiagnostics;
import io.nosqlbench.virtdata.api.VirtData;
import org.testng.annotations.Test;
import java.util.Optional;

View File

@@ -1,10 +1,10 @@
package io.virtdata;
import io.virtdata.api.DataMapper;
import io.virtdata.core.VirtData;
import io.virtdata.libbasics.shared.from_long.to_long.Identity;
import io.virtdata.libbasics.shared.from_long.to_string.NumberNameToString;
import io.virtdata.libbasics.shared.from_long.to_string.Template;
import io.nosqlbench.virtdata.api.DataMapper;
import io.nosqlbench.virtdata.api.VirtData;
import io.nosqlbench.virtdata.library.basics.shared.from_long.to_long.Identity;
import io.nosqlbench.virtdata.library.basics.shared.from_long.to_string.NumberNameToString;
import io.nosqlbench.virtdata.library.basics.shared.from_long.to_string.Template;
import org.apache.commons.lang3.ClassUtils;
import org.testng.annotations.Test;

View File

@@ -1,7 +1,7 @@
package io.virtdata;
import io.virtdata.api.DataMapper;
import io.virtdata.core.VirtData;
import io.nosqlbench.virtdata.api.DataMapper;
import io.nosqlbench.virtdata.api.VirtData;
import org.apache.commons.math3.stat.descriptive.DescriptiveStatistics;
import org.assertj.core.data.Offset;
import org.testng.annotations.Test;

View File

@@ -1,7 +1,7 @@
package io.virtdata;
import io.virtdata.api.DataMapper;
import io.virtdata.core.VirtData;
import io.nosqlbench.virtdata.api.DataMapper;
import io.nosqlbench.virtdata.api.VirtData;
import org.testng.annotations.Test;
import static org.assertj.core.api.Assertions.assertThat;

View File

@@ -1,8 +1,8 @@
package io.virtdata;
import io.virtdata.core.Bindings;
import io.virtdata.core.BindingsTemplate;
import io.virtdata.templates.StringCompositor;
import io.nosqlbench.virtdata.api.Bindings;
import io.nosqlbench.virtdata.api.BindingsTemplate;
import io.nosqlbench.virtdata.api.templates.StringCompositor;
import org.testng.annotations.BeforeClass;
import org.testng.annotations.Test;

View File

@@ -1,7 +1,7 @@
package io.virtdata;
import io.virtdata.api.DataMapper;
import io.virtdata.core.VirtData;
import io.nosqlbench.virtdata.api.DataMapper;
import io.nosqlbench.virtdata.api.VirtData;
import org.joda.time.DateTime;
import org.joda.time.DateTimeZone;
import org.testng.annotations.Test;