values = new ArrayList<>();
- for (final String item : s.split(",")) {
- values.add(Double.parseDouble(item));
- }
- return values.stream().mapToDouble(Double::doubleValue).toArray();
- }
-
- public void loadTestProperties(final String pathStr) {
- loadTestProperties(Paths.get(pathStr));
- }
-
- public void loadTestProperties(final Path testPropertiesPath) {
- try {
- super.load(Files.newInputStream(testPropertiesPath));
- } catch (final IOException e) {
- throw new RuntimeException("Failed to load test properties file: " + e.getMessage(), e);
- }
- }
-}
diff --git a/performance-testing/performance-testing-core/src/main/java/uk/gov/gchq/gaffer/performancetesting/ingest/ElementIngestTest.java b/performance-testing/performance-testing-core/src/main/java/uk/gov/gchq/gaffer/performancetesting/ingest/ElementIngestTest.java
deleted file mode 100644
index b3854c6e..00000000
--- a/performance-testing/performance-testing-core/src/main/java/uk/gov/gchq/gaffer/performancetesting/ingest/ElementIngestTest.java
+++ /dev/null
@@ -1,170 +0,0 @@
-/*
- * Copyright 2017-2023 Crown Copyright
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package uk.gov.gchq.gaffer.performancetesting.ingest;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import uk.gov.gchq.gaffer.data.element.Element;
-import uk.gov.gchq.gaffer.graph.Graph;
-import uk.gov.gchq.gaffer.graph.GraphConfig;
-import uk.gov.gchq.gaffer.operation.OperationException;
-import uk.gov.gchq.gaffer.operation.impl.add.AddElements;
-import uk.gov.gchq.gaffer.performancetesting.MetricsListener;
-import uk.gov.gchq.gaffer.randomelementgeneration.supplier.ElementsSupplier;
-import uk.gov.gchq.gaffer.randomelementgeneration.supplier.RmatElementSupplier;
-import uk.gov.gchq.gaffer.store.StoreProperties;
-import uk.gov.gchq.gaffer.store.schema.Schema;
-import uk.gov.gchq.gaffer.user.User;
-
-import java.io.File;
-import java.util.function.Supplier;
-import java.util.stream.Stream;
-
-/**
- * This class measures the time taken to add some elements to the provided {@link Graph}.
- *
- * The test is configured using a {@link ElementIngestTestProperties}. This specifies the class to be
- * used to generate the random elements and the number of random elements.
- */
-public class ElementIngestTest {
- private static final Logger LOGGER = LoggerFactory.getLogger(ElementIngestTest.class);
-
- private final Graph graph;
- private final ElementIngestTestProperties testProperties;
- private MetricsListener metricsListener;
-
- public ElementIngestTest(final Graph graph,
- final ElementIngestTestProperties testProperties) {
- this.graph = graph;
- this.testProperties = testProperties;
- if (null != testProperties.getMetricsListenerClass()) {
- try {
- metricsListener = Class.forName(testProperties.getMetricsListenerClass())
- .asSubclass(MetricsListener.class).newInstance();
- metricsListener.initialise(testProperties);
- LOGGER.info("Initialised MetricsListener of {}", metricsListener);
- } catch (final ClassNotFoundException | InstantiationException | IllegalAccessException e) {
- throw new IllegalArgumentException("MetricsListener could not be created: "
- + testProperties.getMetricsListenerClass(), e);
- }
- }
- }
-
- /**
- * Runs a test of adding elements in batches.
- *
- * @return The rate at which elements were added (number of elements per second).
- */
- public double run() {
- final long numElements = testProperties.getNumElements();
- final long batchSize = testProperties.getBatchSize();
- final Supplier elementSupplier = new ElementSupplierFactory(testProperties).get();
- long totalAdded = 0L;
- long batchNumber = 0L;
- final long startTime = System.currentTimeMillis();
- while (totalAdded < numElements) {
- batchNumber++;
- addBatch(elementSupplier, batchSize, batchNumber);
- totalAdded += batchSize;
- }
- final long endTime = System.currentTimeMillis();
- final double durationInSeconds = (endTime - startTime) / 1000.0;
- final double rate = (double) numElements / durationInSeconds;
- LOGGER.info("Test result: " + numElements + " elements added in " + durationInSeconds + " seconds (rate was "
- + rate + " per second)");
- log(numElements, true);
- if (null != metricsListener) {
- metricsListener.close();
- }
- return rate;
- }
-
- private void addBatch(final Supplier elementSupplier, final long batchSize, final long batchNumber) {
- final Iterable elements = Stream.generate(elementSupplier).limit(batchSize)::iterator;
- final AddElements addElements = new AddElements.Builder()
- .input(elements)
- .validate(false)
- .build();
- final long startTime = System.currentTimeMillis();
- try {
- graph.execute(addElements, new User());
- } catch (final OperationException e) {
- LOGGER.error("OperationException thrown after " + (System.currentTimeMillis() - startTime) / 1000.0
- + " seconds");
- throw new RuntimeException("Exception thrown adding elements", e);
- }
- final long endTime = System.currentTimeMillis();
- final double durationInSeconds = (endTime - startTime) / 1000.0;
- final double rate = batchSize / durationInSeconds;
- LOGGER.info("Batch number = " + batchNumber + ": " + batchSize + " elements added in " + durationInSeconds
- + " seconds (rate was " + rate + " per second)");
- log(rate, false);
- }
-
- private void log(final double elementsPerSecond, final boolean finalResult) {
- if (null != metricsListener) {
- final IngestMetrics metrics = new IngestMetrics();
- if (finalResult) {
- metrics.putMetric(IngestMetrics.ELEMENTS_PER_SECOND_OVERALL, elementsPerSecond);
- } else {
- metrics.putMetric(IngestMetrics.ELEMENTS_PER_SECOND_BATCH, elementsPerSecond);
- }
- metricsListener.update(metrics);
- }
- }
-
- public static class ElementSupplierFactory {
- private final ElementIngestTestProperties testProperties;
-
- public ElementSupplierFactory(final ElementIngestTestProperties testProperties) {
- this.testProperties = testProperties;
- }
-
- public Supplier get() {
- final String elementSupplierClass = testProperties.getElementSupplierClass();
- if (elementSupplierClass.equals(RmatElementSupplier.class.getName())) {
- final double[] rmatProbabilities = testProperties.getRmatProbabilities();
- final long maxNodeId = testProperties.getRmatMaxNodeId();
- final boolean includeEntities = testProperties.getRmatIncludeEntities();
- return new ElementsSupplier(new RmatElementSupplier(rmatProbabilities, maxNodeId, includeEntities));
- } else {
- throw new RuntimeException("Unknown ElementSupplier class of " + elementSupplierClass);
- }
- }
- }
-
- public static void main(final String[] args) {
- if (args.length != 3) {
- throw new RuntimeException("Usage: ");
- }
- final Schema schema = Schema.fromJson(new File(args[0]).toPath());
- final StoreProperties storeProperties = StoreProperties.loadStoreProperties(args[1]);
- final ElementIngestTestProperties testProperties = new ElementIngestTestProperties();
- testProperties.loadTestProperties(args[2]);
- final Graph graph = new Graph.Builder()
- .config(new GraphConfig.Builder()
- .graphId(testProperties.getGraphId())
- .build())
- .storeProperties(storeProperties)
- .addSchema(schema)
- .build();
- final ElementIngestTest test = new ElementIngestTest(graph, testProperties);
- final double result = test.run();
- LOGGER.info("Test result: elements were added at a rate of " + result + " per second");
- }
-}
diff --git a/performance-testing/performance-testing-core/src/main/java/uk/gov/gchq/gaffer/performancetesting/ingest/ElementIngestTestProperties.java b/performance-testing/performance-testing-core/src/main/java/uk/gov/gchq/gaffer/performancetesting/ingest/ElementIngestTestProperties.java
deleted file mode 100644
index 72ba0615..00000000
--- a/performance-testing/performance-testing-core/src/main/java/uk/gov/gchq/gaffer/performancetesting/ingest/ElementIngestTestProperties.java
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
- * Copyright 2017-2023 Crown Copyright
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package uk.gov.gchq.gaffer.performancetesting.ingest;
-
-import uk.gov.gchq.gaffer.performancetesting.TestProperties;
-import uk.gov.gchq.gaffer.randomelementgeneration.supplier.RmatElementSupplier;
-
-/**
- * These properties are used to specify a {@link uk.gov.gchq.gaffer.performancetesting.ingest.IngestMetrics}.
- */
-public class ElementIngestTestProperties extends TestProperties {
- private static final long serialVersionUID = 8594474188709038747L;
- private static final String ELEMENT_SUPPLIER_CLASS = "gaffer.performancetesting.ingest.elementSupplierClass";
- private static final String NUMBER_OF_ELEMENTS = "gaffer.performancetesting.ingest.numberOfElements";
-
- public ElementIngestTestProperties() {
-
- }
-
- public String getElementSupplierClass() {
- return getProperty(ELEMENT_SUPPLIER_CLASS, RmatElementSupplier.class.getName());
- }
-
- public void setElementSupplierClass(final String elementSupplierClass) {
- setProperty(ELEMENT_SUPPLIER_CLASS, elementSupplierClass);
- }
-
- public long getNumElements() {
- return Long.parseLong(getProperty(NUMBER_OF_ELEMENTS));
- }
-
- public void setNumElements(final long numEdges) {
- if (numEdges <= 0L) {
- throw new IllegalArgumentException("The number of edges must be greater than 0.");
- }
- setProperty(NUMBER_OF_ELEMENTS, String.valueOf(numEdges));
- }
-}
diff --git a/performance-testing/performance-testing-core/src/main/java/uk/gov/gchq/gaffer/performancetesting/ingest/IngestMetrics.java b/performance-testing/performance-testing-core/src/main/java/uk/gov/gchq/gaffer/performancetesting/ingest/IngestMetrics.java
deleted file mode 100644
index 58819c2c..00000000
--- a/performance-testing/performance-testing-core/src/main/java/uk/gov/gchq/gaffer/performancetesting/ingest/IngestMetrics.java
+++ /dev/null
@@ -1,62 +0,0 @@
-/*
- * Copyright 2017-2019 Crown Copyright
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package uk.gov.gchq.gaffer.performancetesting.ingest;
-
-import uk.gov.gchq.gaffer.performancetesting.Metrics;
-
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.SortedSet;
-import java.util.TreeSet;
-
-/**
- * This class contains the results from a {@link uk.gov.gchq.gaffer.performancetesting.ingest.ElementIngestTest}. It
- * provides the number of {@link uk.gov.gchq.gaffer.data.element.Element}s ingested per second.
- */
-public class IngestMetrics implements Metrics {
- public static final String ELEMENTS_PER_SECOND_BATCH = "elements_per_second_batch";
- public static final String ELEMENTS_PER_SECOND_OVERALL = "elements_per_second_overall";
- private static final SortedSet METRIC_NAMES = Collections.unmodifiableSortedSet(new TreeSet<>(
- Arrays.asList(ELEMENTS_PER_SECOND_BATCH, ELEMENTS_PER_SECOND_OVERALL)));
- private final Map metrics;
-
- public IngestMetrics() {
- this.metrics = new HashMap<>();
- }
-
- @Override
- public SortedSet getMetricNames() {
- return METRIC_NAMES;
- }
-
- @Override
- public Object getMetric(final String metricName) {
- return metrics.get(metricName);
- }
-
- @Override
- public void putMetric(final String metricName, final Object metric) {
- if (!METRIC_NAMES.contains(metricName)) {
- throw new IllegalArgumentException("Unrecognised metric " + metricName);
- }
- if (!(metric instanceof Double)) {
- throw new IllegalArgumentException("Metric must be a double (got " + metricName.getClass().getName() + ")");
- }
- metrics.put(metricName, (Double) metric);
- }
-}
diff --git a/performance-testing/performance-testing-core/src/main/java/uk/gov/gchq/gaffer/performancetesting/query/QueryMetrics.java b/performance-testing/performance-testing-core/src/main/java/uk/gov/gchq/gaffer/performancetesting/query/QueryMetrics.java
deleted file mode 100644
index ea58de60..00000000
--- a/performance-testing/performance-testing-core/src/main/java/uk/gov/gchq/gaffer/performancetesting/query/QueryMetrics.java
+++ /dev/null
@@ -1,64 +0,0 @@
-/*
- * Copyright 2017-2019 Crown Copyright
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package uk.gov.gchq.gaffer.performancetesting.query;
-
-import uk.gov.gchq.gaffer.performancetesting.Metrics;
-
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.SortedSet;
-import java.util.TreeSet;
-
-/**
- * This class contains the results from a {@link uk.gov.gchq.gaffer.performancetesting.query.QueryTest}. It provides
- * the number of seeds queried for per second and the number of results per second.
- */
-public class QueryMetrics implements Metrics {
- public static final String SEEDS_PER_SECOND = "seeds_per_second";
- public static final String RESULTS_PER_SECOND = "results_per_second";
- private static final SortedSet METRIC_NAMES = Collections.unmodifiableSortedSet(
- new TreeSet<>(Arrays.asList(SEEDS_PER_SECOND, RESULTS_PER_SECOND)));
- private final Map metrics;
-
- public QueryMetrics(final double seedsPerSecond, final double resultsPerSecond) {
- this.metrics = new HashMap<>();
- metrics.put(SEEDS_PER_SECOND, seedsPerSecond);
- metrics.put(RESULTS_PER_SECOND, resultsPerSecond);
- }
-
- @Override
- public SortedSet getMetricNames() {
- return METRIC_NAMES;
- }
-
- @Override
- public Object getMetric(final String metricName) {
- return metrics.get(metricName);
- }
-
- @Override
- public void putMetric(final String metricName, final Object metric) {
- if (!METRIC_NAMES.contains(metricName)) {
- throw new IllegalArgumentException("Unrecognised metric " + metricName);
- }
- if (!(metric instanceof Double)) {
- throw new IllegalArgumentException("Metric must be a double (got " + metricName.getClass().getName() + ")");
- }
- metrics.put(metricName, (Double) metric);
- }
-}
diff --git a/performance-testing/performance-testing-core/src/main/java/uk/gov/gchq/gaffer/performancetesting/query/QueryTest.java b/performance-testing/performance-testing-core/src/main/java/uk/gov/gchq/gaffer/performancetesting/query/QueryTest.java
deleted file mode 100644
index 4b4a42af..00000000
--- a/performance-testing/performance-testing-core/src/main/java/uk/gov/gchq/gaffer/performancetesting/query/QueryTest.java
+++ /dev/null
@@ -1,181 +0,0 @@
-/*
- * Copyright 2017-2023 Crown Copyright
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package uk.gov.gchq.gaffer.performancetesting.query;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import uk.gov.gchq.gaffer.data.element.Element;
-import uk.gov.gchq.gaffer.graph.Graph;
-import uk.gov.gchq.gaffer.graph.GraphConfig;
-import uk.gov.gchq.gaffer.operation.OperationException;
-import uk.gov.gchq.gaffer.operation.data.ElementSeed;
-import uk.gov.gchq.gaffer.operation.impl.get.GetElements;
-import uk.gov.gchq.gaffer.performancetesting.MetricsListener;
-import uk.gov.gchq.gaffer.randomelementgeneration.supplier.EdgeSeedSupplier;
-import uk.gov.gchq.gaffer.randomelementgeneration.supplier.EntitySeedSupplier;
-import uk.gov.gchq.gaffer.store.StoreProperties;
-import uk.gov.gchq.gaffer.store.schema.Schema;
-import uk.gov.gchq.gaffer.user.User;
-
-import java.io.File;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.function.Supplier;
-import java.util.stream.StreamSupport;
-
-/**
- * This class measures the time taken to query for a given number of {@link ElementSeed}s. The query is broken up into
- * batches of a user specified size. For every batch, the number of seeds queried for per second and the number of
- * results returned per second are recorded.
- *
- * The test is configured using a {@link QueryTestProperties}. This specifies the class to be
- * used to generate the random seeds and the number of seeds to be queried for.
- *
- *
Optionally, a {@link MetricsListener} can be provided. This will receive an update of the performance at the end
- * of every batch. This update is an instance of {@link QueryMetrics}.
- */
-public class QueryTest {
- private static final Logger LOGGER = LoggerFactory.getLogger(QueryTest.class);
-
- private final Graph graph;
- private final QueryTestProperties testProperties;
- private MetricsListener metricsListener;
-
- public QueryTest(final Graph graph,
- final QueryTestProperties testProperties) {
- this.graph = graph;
- this.testProperties = testProperties;
- if (null != testProperties.getMetricsListenerClass()) {
- try {
- metricsListener = Class.forName(testProperties.getMetricsListenerClass())
- .asSubclass(MetricsListener.class).newInstance();
- metricsListener.initialise(testProperties);
- LOGGER.info("Initialised MetricsListener of {}", metricsListener);
- } catch (final ClassNotFoundException | InstantiationException | IllegalAccessException e) {
- throw new IllegalArgumentException("MetricsListener could not be created: "
- + testProperties.getMetricsListenerClass(), e);
- }
- }
- }
-
- /**
- * Runs a test of querying for the seeds in batches.
- *
- * @return The rate at which seeds were queried for (number of seeds per second).
- */
- public double run() {
- final long numSeeds = testProperties.getNumSeeds();
- final long batchSize = testProperties.getBatchSize();
- final Supplier elementIdSupplier = new ElementIdSupplierFactory(testProperties).get();
- long totalQueried = 0L;
- long batchNumber = 0L;
- final long startTime = System.currentTimeMillis();
- while (totalQueried < numSeeds) {
- batchNumber++;
- queryBatch(elementIdSupplier, batchSize, batchNumber);
- totalQueried += batchSize;
- }
- final long endTime = System.currentTimeMillis();
- final double durationInSeconds = (endTime - startTime) / 1000.0;
- final double rate = (double) totalQueried / durationInSeconds;
- LOGGER.info("Test result: " + totalQueried + " ids queried for in " + durationInSeconds + " seconds (rate was "
- + rate + " per second)");
- if (null != metricsListener) {
- metricsListener.close();
- }
- return rate;
- }
-
- private void queryBatch(final Supplier elementSeedSupplier, final long batchSize,
- final long batchNumber) {
- // Create an in-memory list of seeds, so that expense of creating random seeds is not included in the test results
- final List seeds = new ArrayList<>();
- for (int i = 0; i < batchSize; i++) {
- seeds.add(elementSeedSupplier.get());
- }
- final GetElements getElements = new GetElements.Builder()
- .input(seeds)
- .build();
- final long startTime = System.currentTimeMillis();
- final long numResults;
- try {
- final Iterable results = graph.execute(getElements, new User());
- numResults = StreamSupport.stream(results.spliterator(), false).count();
- } catch (final OperationException e) {
- LOGGER.error("OperationException thrown after " + (System.currentTimeMillis() - startTime) / 1000.0
- + " seconds");
- throw new RuntimeException("Exception thrown getting elements", e);
- }
- final long endTime = System.currentTimeMillis();
- final double durationInSeconds = (endTime - startTime) / 1000.0;
- final double seedRate = batchSize / durationInSeconds;
- final double resultsRate = numResults / durationInSeconds;
- LOGGER.info("Batch number = " + batchNumber + ": " + batchSize + " ids queried for in " + durationInSeconds
- + " seconds (rate was " + seedRate + " per second), " + numResults + " results were returned "
- + "(rate was " + resultsRate + " per second)");
- log(seedRate, resultsRate);
- }
-
- private void log(final double seedsPerSecond, final double resultsPerSecond) {
- if (null != metricsListener) {
- final QueryMetrics metrics = new QueryMetrics(seedsPerSecond, resultsPerSecond);
- metricsListener.update(metrics);
- }
- }
-
- public static class ElementIdSupplierFactory {
- private final QueryTestProperties testProperties;
-
- public ElementIdSupplierFactory(final QueryTestProperties testProperties) {
- this.testProperties = testProperties;
- }
-
- public Supplier get() {
- final String elementIdSupplierClass = testProperties.getElementIdSupplierClass();
- if (elementIdSupplierClass.equals(EntitySeedSupplier.class.getName())) {
- final long maxNodeId = testProperties.getRmatMaxNodeId();
- return new EntitySeedSupplier(maxNodeId);
- } else if (elementIdSupplierClass.equals(EdgeSeedSupplier.class.getName())) {
- final long maxNodeId = testProperties.getRmatMaxNodeId();
- return new EdgeSeedSupplier(maxNodeId);
- } else {
- throw new RuntimeException("Unknown ElementIdSupplier class of " + elementIdSupplierClass);
- }
- }
- }
-
- public static void main(final String[] args) {
- if (args.length != 3) {
- throw new RuntimeException("Usage: ");
- }
- final Schema schema = Schema.fromJson(new File(args[0]).toPath());
- final StoreProperties storeProperties = StoreProperties.loadStoreProperties(args[1]);
- final QueryTestProperties testProperties = new QueryTestProperties();
- testProperties.loadTestProperties(args[2]);
- final Graph graph = new Graph.Builder()
- .config(new GraphConfig.Builder()
- .graphId(testProperties.getGraphId())
- .build())
- .storeProperties(storeProperties)
- .addSchema(schema)
- .build();
- final QueryTest test = new QueryTest(graph, testProperties);
- final double result = test.run();
- LOGGER.info("Test result: seeds were queried for at a rate of " + result + " per second");
- }
-}
diff --git a/performance-testing/performance-testing-core/src/main/java/uk/gov/gchq/gaffer/performancetesting/query/QueryTestProperties.java b/performance-testing/performance-testing-core/src/main/java/uk/gov/gchq/gaffer/performancetesting/query/QueryTestProperties.java
deleted file mode 100644
index 70953183..00000000
--- a/performance-testing/performance-testing-core/src/main/java/uk/gov/gchq/gaffer/performancetesting/query/QueryTestProperties.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- * Copyright 2017-2023 Crown Copyright
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package uk.gov.gchq.gaffer.performancetesting.query;
-
-import uk.gov.gchq.gaffer.performancetesting.TestProperties;
-import uk.gov.gchq.gaffer.randomelementgeneration.supplier.EntitySeedSupplier;
-
-/**
- * These properties are used to specify a {@link uk.gov.gchq.gaffer.performancetesting.query.QueryTest}.
- */
-public class QueryTestProperties extends TestProperties {
- private static final long serialVersionUID = 3639506677531571597L;
- private static final String ID_SUPPLIER_CLASS = "gaffer.performancetesting.query.idSupplierClass";
- private static final String NUM_SEEDS = "gaffer.performancetesting.query.numSeeds";
-
- public QueryTestProperties() {
- }
-
- public String getElementIdSupplierClass() {
- return getProperty(ID_SUPPLIER_CLASS, EntitySeedSupplier.class.getName());
- }
-
- public void setElementIdSupplierClass(final String elementSupplierClass) {
- setProperty(ID_SUPPLIER_CLASS, elementSupplierClass);
- }
-
- public long getNumSeeds() {
- return Long.parseLong(getProperty(NUM_SEEDS, String.valueOf(1000L)));
- }
-
- public void setNumSeeds(final Long numSeeds) {
- setProperty(NUM_SEEDS, numSeeds.toString());
- }
-}
diff --git a/performance-testing/performance-testing-core/src/test/java/uk/gov/gchq/gaffer/performancetesting/ingest/TestElementIngestTest.java b/performance-testing/performance-testing-core/src/test/java/uk/gov/gchq/gaffer/performancetesting/ingest/TestElementIngestTest.java
deleted file mode 100644
index 1847abed..00000000
--- a/performance-testing/performance-testing-core/src/test/java/uk/gov/gchq/gaffer/performancetesting/ingest/TestElementIngestTest.java
+++ /dev/null
@@ -1,116 +0,0 @@
-/*
- * Copyright 2017-2019 Crown Copyright
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package uk.gov.gchq.gaffer.performancetesting.ingest;
-
-import org.apache.commons.io.FileUtils;
-import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.io.TempDir;
-
-import uk.gov.gchq.gaffer.accumulostore.AccumuloProperties;
-import uk.gov.gchq.gaffer.accumulostore.MiniAccumuloStore;
-import uk.gov.gchq.gaffer.commonutil.StreamUtil;
-import uk.gov.gchq.gaffer.graph.Graph;
-import uk.gov.gchq.gaffer.graph.GraphConfig;
-import uk.gov.gchq.gaffer.performancetesting.FileWriterMetricsListener;
-import uk.gov.gchq.gaffer.randomelementgeneration.Constants;
-import uk.gov.gchq.gaffer.randomelementgeneration.supplier.RmatElementSupplier;
-
-import java.io.File;
-import java.io.IOException;
-import java.util.List;
-
-import static org.assertj.core.api.Assertions.assertThat;
-
-public class TestElementIngestTest {
-
- @TempDir
- public File folder;
-
- @Test
- public void testElementIngestTestRuns() {
- // Given
- final ElementIngestTestProperties testProperties = new ElementIngestTestProperties();
- testProperties.setNumElements(100L);
- testProperties.setBatchSize(10);
- testProperties.setElementSupplierClass(RmatElementSupplier.class.getName());
- testProperties.setRmatProbabilities(Constants.RMAT_PROBABILITIES);
- testProperties.setRmatMaxNodeId(100L);
- final AccumuloProperties storeProperties = AccumuloProperties.loadStoreProperties(
- StreamUtil.openStream(Constants.class, "accumuloStore.properties")
- );
- storeProperties.setStoreClass(MiniAccumuloStore.class.getName());
- final Graph graph = new Graph.Builder()
- .config(new GraphConfig.Builder().graphId("id").build())
- .storeProperties(storeProperties)
- .addSchemas(StreamUtil.schemas(Constants.class))
- .build();
-
- // When
- final ElementIngestTest test = new ElementIngestTest(graph, testProperties);
- final double result = test.run();
-
- // Then
- assertThat(result > 0.0D).isTrue();
- }
-
- @Test
- public void testElementIngestTestOutputsToListener() throws IOException {
- // Given
- final ElementIngestTestProperties testProperties = new ElementIngestTestProperties();
- testProperties.setNumElements(100L);
- testProperties.setBatchSize(10);
- testProperties.setElementSupplierClass(RmatElementSupplier.class.getName());
- testProperties.setRmatProbabilities(Constants.RMAT_PROBABILITIES);
- testProperties.setRmatMaxNodeId(100L);
- testProperties.setMetricsListenerClass(FileWriterMetricsListener.class.getName());
- final File metricsResults = new File(folder, "metricsResults.txt");
- final String metricsResultsFilename = metricsResults.getPath();
- testProperties.setProperty(FileWriterMetricsListener.FILENAME, metricsResultsFilename);
- final AccumuloProperties storeProperties = AccumuloProperties.loadStoreProperties(
- StreamUtil.openStream(Constants.class, "accumuloStore.properties")
- );
- storeProperties.setStoreClass(MiniAccumuloStore.class.getName());
- final Graph graph = new Graph.Builder()
- .config(new GraphConfig.Builder().graphId("id").build())
- .storeProperties(storeProperties)
- .addSchemas(StreamUtil.schemas(Constants.class))
- .build();
-
- // When
- final ElementIngestTest test = new ElementIngestTest(graph, testProperties);
- test.run();
- final List lines = FileUtils.readLines(new File(metricsResultsFilename));
-
- // Then
- assertThat(lines.size() > 0).isTrue();
- final int offsetBatch = IngestMetrics.ELEMENTS_PER_SECOND_BATCH.length() + 1;
- final int offsetOverall = IngestMetrics.ELEMENTS_PER_SECOND_OVERALL.length() + 1;
- for (int i = 0; i < lines.size() - 2; i++) {
- final String[] tokens = lines.get(i).split(",");
- assertThat(tokens[0].replaceAll(" ", "").startsWith(IngestMetrics.ELEMENTS_PER_SECOND_BATCH + ":")).isTrue();
- assertThat(nullOrPositive(tokens[0].substring(offsetBatch))).isTrue();
- assertThat(tokens[1].replaceAll(" ", "").startsWith(IngestMetrics.ELEMENTS_PER_SECOND_OVERALL + ":")).isTrue();
- assertThat(nullOrPositive(tokens[1].substring(offsetOverall))).isTrue();
- }
- }
-
- private boolean nullOrPositive(final String string) {
- if (string.equals(": null")) {
- return true;
- }
- return Double.parseDouble(string) > 0.0D;
- }
-}
diff --git a/performance-testing/performance-testing-core/src/test/java/uk/gov/gchq/gaffer/performancetesting/ingest/TestQueryTest.java b/performance-testing/performance-testing-core/src/test/java/uk/gov/gchq/gaffer/performancetesting/ingest/TestQueryTest.java
deleted file mode 100644
index 937e927c..00000000
--- a/performance-testing/performance-testing-core/src/test/java/uk/gov/gchq/gaffer/performancetesting/ingest/TestQueryTest.java
+++ /dev/null
@@ -1,126 +0,0 @@
-/*
- * Copyright 2017-2019 Crown Copyright
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package uk.gov.gchq.gaffer.performancetesting.ingest;
-
-import org.apache.commons.io.FileUtils;
-import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.io.TempDir;
-
-import uk.gov.gchq.gaffer.accumulostore.AccumuloProperties;
-import uk.gov.gchq.gaffer.accumulostore.MiniAccumuloStore;
-import uk.gov.gchq.gaffer.commonutil.StreamUtil;
-import uk.gov.gchq.gaffer.graph.Graph;
-import uk.gov.gchq.gaffer.graph.GraphConfig;
-import uk.gov.gchq.gaffer.operation.OperationException;
-import uk.gov.gchq.gaffer.operation.impl.add.AddElements;
-import uk.gov.gchq.gaffer.performancetesting.FileWriterMetricsListener;
-import uk.gov.gchq.gaffer.performancetesting.query.QueryMetrics;
-import uk.gov.gchq.gaffer.performancetesting.query.QueryTest;
-import uk.gov.gchq.gaffer.performancetesting.query.QueryTestProperties;
-import uk.gov.gchq.gaffer.randomelementgeneration.Constants;
-import uk.gov.gchq.gaffer.randomelementgeneration.supplier.ElementsSupplier;
-import uk.gov.gchq.gaffer.randomelementgeneration.supplier.EntitySeedSupplier;
-import uk.gov.gchq.gaffer.randomelementgeneration.supplier.RmatElementSupplier;
-import uk.gov.gchq.gaffer.user.User;
-
-import java.io.File;
-import java.io.IOException;
-import java.util.List;
-import java.util.stream.Stream;
-
-import static org.assertj.core.api.Assertions.assertThat;
-
-public class TestQueryTest {
-
- @TempDir
- public File folder;
-
- @Test
- public void testQueryTestRuns() throws OperationException {
- // Given
- final QueryTestProperties testProperties = new QueryTestProperties();
- testProperties.setNumSeeds(100L);
- testProperties.setBatchSize(10);
- testProperties.setElementIdSupplierClass(EntitySeedSupplier.class.getName());
- testProperties.setRmatProbabilities(Constants.RMAT_PROBABILITIES);
- testProperties.setRmatMaxNodeId(100L);
- final AccumuloProperties storeProperties = AccumuloProperties.loadStoreProperties(
- StreamUtil.openStream(Constants.class, "accumuloStore.properties")
- );
- storeProperties.setStoreClass(MiniAccumuloStore.class.getName());
- final Graph graph = new Graph.Builder()
- .config(new GraphConfig.Builder().graphId("id").build())
- .storeProperties(storeProperties)
- .addSchemas(StreamUtil.schemas(Constants.class))
- .build();
- graph.execute(new AddElements.Builder()
- .input(Stream
- .generate(new ElementsSupplier(new RmatElementSupplier(Constants.RMAT_PROBABILITIES, 100L, true)))
- .limit(1000L)::iterator)
- .build(), new User());
-
- // When
- final QueryTest test = new QueryTest(graph, testProperties);
- final double result = test.run();
-
- // Then
- assertThat(result > 0.0D).isTrue();
- }
-
- @Test
- public void testQueryTestOutputsToListener() throws IOException, OperationException {
- // Given
- final QueryTestProperties testProperties = new QueryTestProperties();
- testProperties.setNumSeeds(100L);
- testProperties.setBatchSize(10);
- testProperties.setElementIdSupplierClass(EntitySeedSupplier.class.getName());
- testProperties.setRmatProbabilities(Constants.RMAT_PROBABILITIES);
- testProperties.setRmatMaxNodeId(100L);
- testProperties.setMetricsListenerClass(FileWriterMetricsListener.class.getName());
- final File metricsResults = new File(folder, "metricsResults.txt");
- final String metricsResultsFilename = metricsResults.getPath();
- testProperties.setProperty(FileWriterMetricsListener.FILENAME, metricsResultsFilename);
- final AccumuloProperties storeProperties = AccumuloProperties.loadStoreProperties(
- StreamUtil.openStream(Constants.class, "accumuloStore.properties")
- );
- storeProperties.setStoreClass(MiniAccumuloStore.class.getName());
- final Graph graph = new Graph.Builder()
- .config(new GraphConfig.Builder().graphId("id").build())
- .storeProperties(storeProperties)
- .addSchemas(StreamUtil.schemas(Constants.class))
- .build();
- graph.execute(new AddElements.Builder()
- .input(Stream
- .generate(new ElementsSupplier(new RmatElementSupplier(Constants.RMAT_PROBABILITIES, 100L, true)))
- .limit(1000L)::iterator)
- .build(), new User());
-
- // When
- final QueryTest test = new QueryTest(graph, testProperties);
- test.run();
- final List lines = FileUtils.readLines(new File(metricsResultsFilename));
-
- // Then
- assertThat(lines.size() > 0).isTrue();
- lines.forEach(line -> {
- final String[] fields = line.split(", ");
- assertThat(fields[0].startsWith(QueryMetrics.RESULTS_PER_SECOND)).isTrue();
- assertThat(Double.parseDouble(fields[0].split(":")[1]) > 0.0D).isTrue();
- assertThat(fields[1].startsWith(QueryMetrics.SEEDS_PER_SECOND)).isTrue();
- assertThat(Double.parseDouble(fields[1].split(":")[1]) > 0.0D).isTrue();
- });
- }
-}
diff --git a/performance-testing/performance-testing-core/src/test/resources/log4j.xml b/performance-testing/performance-testing-core/src/test/resources/log4j.xml
deleted file mode 100644
index 2bcf2626..00000000
--- a/performance-testing/performance-testing-core/src/test/resources/log4j.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/performance-testing/pom.xml b/performance-testing/pom.xml
deleted file mode 100644
index 51457b1b..00000000
--- a/performance-testing/pom.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-
-
-
- uk.gov.gchq.gaffer
- gaffer-tools
- 2.0.0
-
- 4.0.0
-
- performance-testing
- pom
-
-
- performance-testing-core
- performance-testing-accumulo-store
- performance-testing-aws
-
-
-
diff --git a/pom.xml b/pom.xml
deleted file mode 100755
index a53c4436..00000000
--- a/pom.xml
+++ /dev/null
@@ -1,241 +0,0 @@
-
-
-
-
- 4.0.0
-
-
- uk.gov.gchq.gaffer
- gaffer2
- 2.0.0
-
-
- gaffer-tools
- 2.0.0
- pom
-
-
-
-
- 2.0.0
-
- https://github.com/gchq/gaffer-tools
-
-
- scm:git:https://github.com/gchq/gaffer-tools.git
-
-
- scm:git:https://github.com/gchq/gaffer-tools.git
-
-
-
-
-
- GafferDevelopers
- GCHQ
- https://github.com/gchq
-
-
-
-
- ${scm.url}
- ${scm.connection}
- ${scm.developer.connection}
- HEAD
-
-
-
-
- Apache License, Version 2.0
- http://www.apache.org/licenses/LICENSE-2.0.txt
-
-
-
-
-
-
- org.apache.maven.plugins
- maven-checkstyle-plugin
-
- code-style/checkstyle.xml
-
- code-style/checkstyle-suppressions.xml
-
- checkstyle.suppressions.file
-
- UTF-8
- true
- true
- **/generated/**/*
-
- ${project.build.sourceDirectory}
-
- ${project.build.testSourceDirectory}
-
-
-
-
-
- validate
- test
-
- code-style/checkstyle.xml
-
- UTF-8
- true
- true
-
-
- check
-
-
-
-
-
-
-
-
-
- sign
-
-
-
- org.apache.maven.plugins
- maven-gpg-plugin
- ${gpg.plugin.version}
-
-
- sign-artifacts
- verify
-
- sign
-
-
-
-
-
-
-
-
-
-
-
- default
-
- true
-
-
-
- mini-accumulo-cluster
- performance-testing
- random-element-generation
-
-
-
- road-traffic-demo
-
-
- true
- true
- true
- true
- rest
- 8080
-
-
-
- uk.gov.gchq.gaffer
- road-traffic-rest
- ${gaffer.version}
- war
- test
-
-
-
-
-
- org.codehaus.cargo
- cargo-maven3-plugin
- ${cargo.plugin.version}
-
-
-
- uk.gov.gchq.gaffer
- road-traffic-rest
- war
-
- /${standalone-rest-path}
-
-
-
-
- tomcat9x
-
-
- uk.gov.gchq.gaffer
- road-traffic-rest
- war
-
-
-
-
- Road Traffic Example
-
-
- ${standalone-rest-path}
-
-
- ${project.basedir}/cd/road-traffic-example/graphConfig.json
-
-
- ${project.basedir}/cd/road-traffic-example/schema
-
-
- ${project.basedir}/cd/road-traffic-example/store.properties
-
-
- ${project.basedir}/cd/road-traffic-example/roadTrafficSampleData.csv
-
-
- ${project.basedir}/cd/road-traffic-example/addOperationsToChain.json
-
-
- false
-
-
-
-
-
- ${standalone-port}
-
-
-
-
-
- deploy
- integration-test
-
- run
-
-
-
-
-
-
-
-
-
diff --git a/python-shell/LICENSE b/python-shell/LICENSE
deleted file mode 100755
index d6456956..00000000
--- a/python-shell/LICENSE
+++ /dev/null
@@ -1,202 +0,0 @@
-
- Apache License
- Version 2.0, January 2004
- http://www.apache.org/licenses/
-
- TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
- 1. Definitions.
-
- "License" shall mean the terms and conditions for use, reproduction,
- and distribution as defined by Sections 1 through 9 of this document.
-
- "Licensor" shall mean the copyright owner or entity authorized by
- the copyright owner that is granting the License.
-
- "Legal Entity" shall mean the union of the acting entity and all
- other entities that control, are controlled by, or are under common
- control with that entity. For the purposes of this definition,
- "control" means (i) the power, direct or indirect, to cause the
- direction or management of such entity, whether by contract or
- otherwise, or (ii) ownership of fifty percent (50%) or more of the
- outstanding shares, or (iii) beneficial ownership of such entity.
-
- "You" (or "Your") shall mean an individual or Legal Entity
- exercising permissions granted by this License.
-
- "Source" form shall mean the preferred form for making modifications,
- including but not limited to software source code, documentation
- source, and configuration files.
-
- "Object" form shall mean any form resulting from mechanical
- transformation or translation of a Source form, including but
- not limited to compiled object code, generated documentation,
- and conversions to other media types.
-
- "Work" shall mean the work of authorship, whether in Source or
- Object form, made available under the License, as indicated by a
- copyright notice that is included in or attached to the work
- (an example is provided in the Appendix below).
-
- "Derivative Works" shall mean any work, whether in Source or Object
- form, that is based on (or derived from) the Work and for which the
- editorial revisions, annotations, elaborations, or other modifications
- represent, as a whole, an original work of authorship. For the purposes
- of this License, Derivative Works shall not include works that remain
- separable from, or merely link (or bind by name) to the interfaces of,
- the Work and Derivative Works thereof.
-
- "Contribution" shall mean any work of authorship, including
- the original version of the Work and any modifications or additions
- to that Work or Derivative Works thereof, that is intentionally
- submitted to Licensor for inclusion in the Work by the copyright owner
- or by an individual or Legal Entity authorized to submit on behalf of
- the copyright owner. For the purposes of this definition, "submitted"
- means any form of electronic, verbal, or written communication sent
- to the Licensor or its representatives, including but not limited to
- communication on electronic mailing lists, source code control systems,
- and issue tracking systems that are managed by, or on behalf of, the
- Licensor for the purpose of discussing and improving the Work, but
- excluding communication that is conspicuously marked or otherwise
- designated in writing by the copyright owner as "Not a Contribution."
-
- "Contributor" shall mean Licensor and any individual or Legal Entity
- on behalf of whom a Contribution has been received by Licensor and
- subsequently incorporated within the Work.
-
- 2. Grant of Copyright License. Subject to the terms and conditions of
- this License, each Contributor hereby grants to You a perpetual,
- worldwide, non-exclusive, no-charge, royalty-free, irrevocable
- copyright license to reproduce, prepare Derivative Works of,
- publicly display, publicly perform, sublicense, and distribute the
- Work and such Derivative Works in Source or Object form.
-
- 3. Grant of Patent License. Subject to the terms and conditions of
- this License, each Contributor hereby grants to You a perpetual,
- worldwide, non-exclusive, no-charge, royalty-free, irrevocable
- (except as stated in this section) patent license to make, have made,
- use, offer to sell, sell, import, and otherwise transfer the Work,
- where such license applies only to those patent claims licensable
- by such Contributor that are necessarily infringed by their
- Contribution(s) alone or by combination of their Contribution(s)
- with the Work to which such Contribution(s) was submitted. If You
- institute patent litigation against any entity (including a
- cross-claim or counterclaim in a lawsuit) alleging that the Work
- or a Contribution incorporated within the Work constitutes direct
- or contributory patent infringement, then any patent licenses
- granted to You under this License for that Work shall terminate
- as of the date such litigation is filed.
-
- 4. Redistribution. You may reproduce and distribute copies of the
- Work or Derivative Works thereof in any medium, with or without
- modifications, and in Source or Object form, provided that You
- meet the following conditions:
-
- (a) You must give any other recipients of the Work or
- Derivative Works a copy of this License; and
-
- (b) You must cause any modified files to carry prominent notices
- stating that You changed the files; and
-
- (c) You must retain, in the Source form of any Derivative Works
- that You distribute, all copyright, patent, trademark, and
- attribution notices from the Source form of the Work,
- excluding those notices that do not pertain to any part of
- the Derivative Works; and
-
- (d) If the Work includes a "NOTICE" text file as part of its
- distribution, then any Derivative Works that You distribute must
- include a readable copy of the attribution notices contained
- within such NOTICE file, excluding those notices that do not
- pertain to any part of the Derivative Works, in at least one
- of the following places: within a NOTICE text file distributed
- as part of the Derivative Works; within the Source form or
- documentation, if provided along with the Derivative Works; or,
- within a display generated by the Derivative Works, if and
- wherever such third-party notices normally appear. The contents
- of the NOTICE file are for informational purposes only and
- do not modify the License. You may add Your own attribution
- notices within Derivative Works that You distribute, alongside
- or as an addendum to the NOTICE text from the Work, provided
- that such additional attribution notices cannot be construed
- as modifying the License.
-
- You may add Your own copyright statement to Your modifications and
- may provide additional or different license terms and conditions
- for use, reproduction, or distribution of Your modifications, or
- for any such Derivative Works as a whole, provided Your use,
- reproduction, and distribution of the Work otherwise complies with
- the conditions stated in this License.
-
- 5. Submission of Contributions. Unless You explicitly state otherwise,
- any Contribution intentionally submitted for inclusion in the Work
- by You to the Licensor shall be under the terms and conditions of
- this License, without any additional terms or conditions.
- Notwithstanding the above, nothing herein shall supersede or modify
- the terms of any separate license agreement you may have executed
- with Licensor regarding such Contributions.
-
- 6. Trademarks. This License does not grant permission to use the trade
- names, trademarks, service marks, or product names of the Licensor,
- except as required for reasonable and customary use in describing the
- origin of the Work and reproducing the content of the NOTICE file.
-
- 7. Disclaimer of Warranty. Unless required by applicable law or
- agreed to in writing, Licensor provides the Work (and each
- Contributor provides its Contributions) on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
- implied, including, without limitation, any warranties or conditions
- of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
- PARTICULAR PURPOSE. You are solely responsible for determining the
- appropriateness of using or redistributing the Work and assume any
- risks associated with Your exercise of permissions under this License.
-
- 8. Limitation of Liability. In no event and under no legal theory,
- whether in tort (including negligence), contract, or otherwise,
- unless required by applicable law (such as deliberate and grossly
- negligent acts) or agreed to in writing, shall any Contributor be
- liable to You for damages, including any direct, indirect, special,
- incidental, or consequential damages of any character arising as a
- result of this License or out of the use or inability to use the
- Work (including but not limited to damages for loss of goodwill,
- work stoppage, computer failure or malfunction, or any and all
- other commercial damages or losses), even if such Contributor
- has been advised of the possibility of such damages.
-
- 9. Accepting Warranty or Additional Liability. While redistributing
- the Work or Derivative Works thereof, You may choose to offer,
- and charge a fee for, acceptance of support, warranty, indemnity,
- or other liability obligations and/or rights consistent with this
- License. However, in accepting such obligations, You may act only
- on Your own behalf and on Your sole responsibility, not on behalf
- of any other Contributor, and only if You agree to indemnify,
- defend, and hold each Contributor harmless for any liability
- incurred by, or claims asserted against, such Contributor by reason
- of your accepting any such warranty or additional liability.
-
- END OF TERMS AND CONDITIONS
-
- APPENDIX: How to apply the Apache License to your work.
-
- To apply the Apache License to your work, attach the following
- boilerplate notice, with the fields enclosed by brackets "[]"
- replaced with your own identifying information. (Don't include
- the brackets!) The text should be enclosed in the appropriate
- comment syntax for the file format. We also recommend that a
- file or class name and description of purpose be included on the
- same "printed page" as the copyright notice for easier
- identification within third-party archives.
-
- Copyright [yyyy] [name of copyright owner]
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
diff --git a/python-shell/README.md b/python-shell/README.md
deleted file mode 100644
index fb1c596d..00000000
--- a/python-shell/README.md
+++ /dev/null
@@ -1,98 +0,0 @@
-
-
-# Gaffer Python Client
-
-
-[
](https://gchq.github.io/gaffer-doc/latest/)
-
-## Features
-
-- Persistently connect to a Gaffer rest api to run operations
-- Connect using PKI certificates and SSL
-- Generate Python client code for custom Operations, Predicates, Binary Operators and Functions
-- Turn existing json queries into Python objects
-
-## Installation
-
-Gafferpy requires Python 3.6+. We don't currently release gafferpy on pypi, but you can install it over ssh with:
-
-```bash
-pip install git+https://github.com/gchq/gaffer-tools.git#subdirectory=python-shell
-```
-
-Or if you have the source code locally and want any changes you make reflected in your installation, you can go to the python-shell directory and run:
-
-```bash
-pip install -e .
-```
-
-## Quick Start
-
-The python shell connects to a running Gaffer REST API. You can start the Gaffer road-traffic-demo rest server using the command:
-
-```bash
-mvn verify -Proad-traffic-demo
-```
-
-```python
-# Import the client library and connector
-from gafferpy import gaffer as g
-from gafferpy import gaffer_connector
-
-# Instantiate a connector
-gc = gaffer_connector.GafferConnector("http://localhost:8080/rest/latest")
-
-# You can use the connector to perform get requests
-schema = gc.execute_get(g.GetSchema())
-
-# And also run operations
-elements = gc.execute_operation(
- operation=g.GetAllElements()
-)
-
-# Multiple operations
-elements = gc.execute_operations(
- operations=[
- g.GetAllElements(),
- g.Limit(result_limit=3)
- ]
-)
-
-# And operation chains
-elements = gc.execute_operation_chain(
- operation_chain=g.OperationChain(
- operations=[
- g.GetAllElements(),
- g.Limit(
- truncate=True,
- result_limit=3
- )
- ]
- )
-)
-```
-
-See [operation examples](https://gchq.github.io/gaffer-doc/v1docs/getting-started/operations/contents) for more examples of operations in python.
-
-## Coding Style
-Please ensure that your coding style is consistent with the rest of the Gaffer project. Guides on the coding style for Gaffer can be found [here](https://gchq.github.io/gaffer-doc/latest/ways-of-working/#coding-style)
-
-## Testing
-
-```bash
-# To run all of the tests, first deploy the road traffic example
-mvn verify -Proad-traffic-demo
-
-# Then from within the python-shell folder run
-python -m unittest discover
-```
-
-## License
-
-Copyright 2016-2022 Crown Copyright
-
-Licensed under the Apache License, Version 2.0 \(the "License"\); you may not use this file except in compliance with the License. You may obtain a copy of the License at
-
-[http://www.apache.org/licenses/LICENSE-2.0](http://www.apache.org/licenses/LICENSE-2.0)
-
-Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License.
diff --git a/python-shell/src/test/__init__.py b/python-shell/src/test/__init__.py
deleted file mode 100644
index 1091487b..00000000
--- a/python-shell/src/test/__init__.py
+++ /dev/null
@@ -1,11 +0,0 @@
-__version__ = "2.0.0-alpha-0.6"
-
-__title__ = "gafferpy"
-__description__ = "Gaffer Python Shell"
-__uri__ = "https://github.com/gchq/gaffer-tools"
-__doc__ = __description__ + " <" + __uri__ + ">"
-
-__author__ = "GCHQ"
-
-__license__ = "Apache 2.0"
-__copyright__ = "Crown Copyright (c) 2016-2022"
diff --git a/random-element-generation/README.md b/random-element-generation/README.md
deleted file mode 100644
index b760a48d..00000000
--- a/random-element-generation/README.md
+++ /dev/null
@@ -1,22 +0,0 @@
-
-
-Random element generation
-=========================
-
-This module allows the creation of randomly generated large-scale graphs. It is extensible in that new random element generation techniques can be used. Currently it provides an implementation of the [RMAT](http://www.cs.cmu.edu/~christos/PUBLICATIONS/siam04.pdf) graph generation technique. The user specifies the number of elements the graph should have. The nodes are longs between 0 and the number of nodes specified. Edges are generated at random between nodes. The RMAT technique ensures that the degree distribution is roughly power-law. The Edges have a simple count. The Entities also have a count and a HyperLogLogPlusPlus sketch which gives an approximation of the degree.
-
-The class `RandomElementGenerator` can be used to produce an `Iterable` of random elements.
diff --git a/random-element-generation/pom.xml b/random-element-generation/pom.xml
deleted file mode 100644
index 0bf24421..00000000
--- a/random-element-generation/pom.xml
+++ /dev/null
@@ -1,64 +0,0 @@
-
-
-
- uk.gov.gchq.gaffer
- gaffer-tools
- 2.0.0
-
- 4.0.0
-
- random-element-generation
-
-
-
- uk.gov.gchq.gaffer
- data
- ${gaffer.version}
-
-
- uk.gov.gchq.gaffer
- graph
- ${gaffer.version}
-
-
- uk.gov.gchq.gaffer
- accumulo-store
- ${gaffer.version}
-
-
-
-
-
-
- maven-shade-plugin
- ${shade.plugin.version}
-
-
- full
- package
-
- shade
-
-
- true
-
- full
-
-
-
- *:*
-
- META-INF/*.SF
- META-INF/*.DSA
- META-INF/*.RSA
-
-
-
-
-
-
-
-
-
-
-
diff --git a/random-element-generation/src/main/java/uk/gov/gchq/gaffer/randomelementgeneration/Constants.java b/random-element-generation/src/main/java/uk/gov/gchq/gaffer/randomelementgeneration/Constants.java
deleted file mode 100644
index d071adb6..00000000
--- a/random-element-generation/src/main/java/uk/gov/gchq/gaffer/randomelementgeneration/Constants.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * Copyright 2017-2023 Crown Copyright
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package uk.gov.gchq.gaffer.randomelementgeneration;
-
-import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
-
-/**
- *
- */
-public final class Constants {
-
- /**
- * These values are taken from @see
- * the Graph500 specifications.
- */
- @SuppressFBWarnings("MS_MUTABLE_ARRAY")
- public static final double[] RMAT_PROBABILITIES = {0.57, 0.19, 0.19, 1.0 - 0.57 - 0.19 - 0.19};
-
- private Constants() {
-
- }
-}
diff --git a/random-element-generation/src/main/java/uk/gov/gchq/gaffer/randomelementgeneration/cache/Cache.java b/random-element-generation/src/main/java/uk/gov/gchq/gaffer/randomelementgeneration/cache/Cache.java
deleted file mode 100644
index 2eb0874b..00000000
--- a/random-element-generation/src/main/java/uk/gov/gchq/gaffer/randomelementgeneration/cache/Cache.java
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
- * Copyright 2017-2019 Crown Copyright
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package uk.gov.gchq.gaffer.randomelementgeneration.cache;
-
-public interface Cache {
-
- void add(T t);
-
- T get();
-}
diff --git a/random-element-generation/src/main/java/uk/gov/gchq/gaffer/randomelementgeneration/cache/PreferentialAttachmentCache.java b/random-element-generation/src/main/java/uk/gov/gchq/gaffer/randomelementgeneration/cache/PreferentialAttachmentCache.java
deleted file mode 100644
index 97b92b0e..00000000
--- a/random-element-generation/src/main/java/uk/gov/gchq/gaffer/randomelementgeneration/cache/PreferentialAttachmentCache.java
+++ /dev/null
@@ -1,130 +0,0 @@
-/*
- * Copyright 2017-2023 Crown Copyright
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package uk.gov.gchq.gaffer.randomelementgeneration.cache;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.Map;
-import java.util.Random;
-import java.util.Set;
-import java.util.TreeMap;
-
-/**
- * A {@link Cache} that has a maximum size. Each item is associated with a count. As an item is added that count is
- * incremented. If more than the maximum number of items are added then the one with the smallest count is removed.
- * When the get() method is called, one of the items is returned at random. The probability of each item
- * being returned is proportional to its count - items with large counts are more likely to be returned. When the
- * get() method is called the count of that item is incremented. The result is that the rich grow richer
- * --- items that are returned become more likely to be returned, and over time some items in the cache will be
- * returned much more often than others.
- *
- * This can be used to generate graphs which are power-law in the number of times elements are added, i.e. by
- * adding elements to both a graph and this cache, and repeatedly also adding the result of calling get()
- * on this cache, then some elements will be added many more times that others. This can be used to test the performance
- * when the same element is added multiple times causing many aggregations.
- */
-public class PreferentialAttachmentCache implements Cache {
- private static final Logger LOGGER = LoggerFactory.getLogger(PreferentialAttachmentCache.class);
-
- private final Random random = new Random();
- private final TreeMap> mapFreqToItems;
- private final TreeMap itemsToFreq;
- private final int maxSize;
-
- public PreferentialAttachmentCache(final int maxSize) {
- this.mapFreqToItems = new TreeMap<>(Collections.reverseOrder());
- this.itemsToFreq = new TreeMap<>();
- this.maxSize = maxSize;
- }
-
- @Override
- public void add(final T t) {
- if (!itemsToFreq.containsKey(t)) {
- itemsToFreq.put(t, 1L);
- if (mapFreqToItems.containsKey(1L)) {
- mapFreqToItems.get(1L).add(t);
- } else {
- mapFreqToItems.put(1L, new HashSet<>(Arrays.asList(t)));
- }
- if (itemsToFreq.keySet().size() > maxSize) {
- final Set items = mapFreqToItems.get(mapFreqToItems.lastKey()); // Last key as stored in reverse order
- final int itemToRemove = random.nextInt(items.size());
- int count = 0;
- final Iterator it = items.iterator();
- while (it.hasNext()) {
- T x = it.next();
- if (count == itemToRemove) {
- items.remove(x);
- itemsToFreq.remove(x);
- }
- count++;
- if (count > itemToRemove) {
- break;
- }
- }
- }
- } else {
- incrementFrequency(t);
- }
- }
-
- private void incrementFrequency(final T t) {
- long currentFreq = itemsToFreq.get(t);
- long newFreq = currentFreq + 1L;
- itemsToFreq.put(t, newFreq);
- mapFreqToItems.get(currentFreq).remove(t);
- if (mapFreqToItems.get(currentFreq).size() == 0) {
- mapFreqToItems.remove(currentFreq);
- }
- if (!mapFreqToItems.containsKey(newFreq)) {
- mapFreqToItems.put(newFreq, new HashSet<>());
- }
- mapFreqToItems.get(newFreq).add(t);
- }
-
- /**
- * Returns a random element in proportion to the frequencies. The frequency of the returned item is increased by 1.
- *
- * @return A random element from the cache with probability proportional to the frequency with which it has been returned.
- */
- @Override
- public T get() {
- final long totalCount = getNumberOfElements();
- if (totalCount == 0) {
- LOGGER.warn("get() called on empty cache");
- return null;
- }
- final ProbabilityGenerator generator = new ProbabilityGenerator<>(itemsToFreq);
- final T sample = generator.sample();
- // Increment current count for the sample
- itemsToFreq.put(sample, itemsToFreq.get(sample) + 1L);
- return sample;
- }
-
- public long getNumberOfElements() {
- return itemsToFreq.values().stream().mapToLong(Long::longValue).sum();
- }
-
- public Map getItemsAndFrequencies() {
- return Collections.unmodifiableMap(itemsToFreq);
- }
-}
diff --git a/random-element-generation/src/main/java/uk/gov/gchq/gaffer/randomelementgeneration/cache/ProbabilityGenerator.java b/random-element-generation/src/main/java/uk/gov/gchq/gaffer/randomelementgeneration/cache/ProbabilityGenerator.java
deleted file mode 100644
index 94339cae..00000000
--- a/random-element-generation/src/main/java/uk/gov/gchq/gaffer/randomelementgeneration/cache/ProbabilityGenerator.java
+++ /dev/null
@@ -1,66 +0,0 @@
-/*
- * Copyright 2017-2023 Crown Copyright
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package uk.gov.gchq.gaffer.randomelementgeneration.cache;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Random;
-import java.util.SortedMap;
-
-public class ProbabilityGenerator {
- private final Random random = new Random();
- private final T[] items;
- private final long totalCount;
- private final List probabilities;
- private final List cumulativeProbabilities;
-
- public ProbabilityGenerator(final SortedMap itemsToFrequency) {
- this.items = (T[]) new Object[itemsToFrequency.size()];
- int i = 0;
- for (final T item : itemsToFrequency.keySet()) {
- items[i++] = item;
- }
- this.totalCount = itemsToFrequency.values().stream().mapToLong(Long::longValue).sum();
- // Probability of choosing an item x is itemsToFrequency(x) / totalCount
- this.probabilities = new ArrayList<>(itemsToFrequency.size());
- itemsToFrequency.entrySet()
- .forEach(entry -> {
- probabilities.add(((double) entry.getValue()) / totalCount);
- });
- // Create cumulative probability distribution
- this.cumulativeProbabilities = new ArrayList<>(itemsToFrequency.size());
- double cumulative = 0.0D;
- for (final double p : probabilities) {
- cumulative += p;
- cumulativeProbabilities.add(cumulative);
- }
- }
-
- public T sample() {
- // Generate a random number between 0 and 1
- final double sample = random.nextDouble();
- // Iterate through the cumulative probabilities until find the first value greater than the sample
- int i = 0;
- for (final double p : cumulativeProbabilities) {
- if (sample < p) {
- return items[i];
- }
- i++;
- }
- return items[items.length - 1];
- }
-}
diff --git a/random-element-generation/src/main/java/uk/gov/gchq/gaffer/randomelementgeneration/generator/ElementGeneratorFromSupplier.java b/random-element-generation/src/main/java/uk/gov/gchq/gaffer/randomelementgeneration/generator/ElementGeneratorFromSupplier.java
deleted file mode 100644
index f2fc2a51..00000000
--- a/random-element-generation/src/main/java/uk/gov/gchq/gaffer/randomelementgeneration/generator/ElementGeneratorFromSupplier.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * Copyright 2017-2019 Crown Copyright
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package uk.gov.gchq.gaffer.randomelementgeneration.generator;
-
-import uk.gov.gchq.gaffer.data.element.Element;
-import uk.gov.gchq.gaffer.data.generator.OneToManyElementGenerator;
-
-import java.util.function.Supplier;
-import java.util.stream.Stream;
-
-/**
- * Given a {@link Supplier} of {@link Element}s, this class generates an {@link Iterable} of {@link Element}s, limited
- * in size to the specified maximum number.
- */
-public class ElementGeneratorFromSupplier implements OneToManyElementGenerator {
- protected long maximumNumberOfElements;
- protected Supplier elementSupplier;
-
- public ElementGeneratorFromSupplier(final long maximumNumberOfElements,
- final Supplier elementSupplier) {
- this.maximumNumberOfElements = maximumNumberOfElements;
- this.elementSupplier = elementSupplier;
- }
-
- @Override
- public Iterable _apply(final String domainObject) {
- return Stream.generate(elementSupplier)
- .limit(maximumNumberOfElements)
- ::iterator;
- }
-}
diff --git a/random-element-generation/src/main/java/uk/gov/gchq/gaffer/randomelementgeneration/supplier/EdgeSeedSupplier.java b/random-element-generation/src/main/java/uk/gov/gchq/gaffer/randomelementgeneration/supplier/EdgeSeedSupplier.java
deleted file mode 100644
index 3770d3f8..00000000
--- a/random-element-generation/src/main/java/uk/gov/gchq/gaffer/randomelementgeneration/supplier/EdgeSeedSupplier.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * Copyright 2017-2019 Crown Copyright
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package uk.gov.gchq.gaffer.randomelementgeneration.supplier;
-
-import uk.gov.gchq.gaffer.data.element.id.DirectedType;
-import uk.gov.gchq.gaffer.operation.data.EdgeSeed;
-
-import java.util.Random;
-
-public class EdgeSeedSupplier implements ElementSeedSupplier {
- protected final Random random = new Random();
- private final EntitySeedSupplier entitySeedSupplier;
-
- public EdgeSeedSupplier(final long maxNodeId) {
- this.entitySeedSupplier = new EntitySeedSupplier(maxNodeId);
- }
-
- @Override
- public EdgeSeed get() {
- return new EdgeSeed(entitySeedSupplier.get(), entitySeedSupplier.get(), DirectedType.EITHER);
- }
-}
diff --git a/random-element-generation/src/main/java/uk/gov/gchq/gaffer/randomelementgeneration/supplier/ElementSeedSupplier.java b/random-element-generation/src/main/java/uk/gov/gchq/gaffer/randomelementgeneration/supplier/ElementSeedSupplier.java
deleted file mode 100644
index f3deaadc..00000000
--- a/random-element-generation/src/main/java/uk/gov/gchq/gaffer/randomelementgeneration/supplier/ElementSeedSupplier.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright 2017-2019 Crown Copyright
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package uk.gov.gchq.gaffer.randomelementgeneration.supplier;
-
-import uk.gov.gchq.gaffer.operation.data.ElementSeed;
-
-import java.util.function.Supplier;
-
-public interface ElementSeedSupplier extends Supplier {
-
-}
diff --git a/random-element-generation/src/main/java/uk/gov/gchq/gaffer/randomelementgeneration/supplier/ElementsSupplier.java b/random-element-generation/src/main/java/uk/gov/gchq/gaffer/randomelementgeneration/supplier/ElementsSupplier.java
deleted file mode 100644
index 19dacb98..00000000
--- a/random-element-generation/src/main/java/uk/gov/gchq/gaffer/randomelementgeneration/supplier/ElementsSupplier.java
+++ /dev/null
@@ -1,78 +0,0 @@
-/*
- * Copyright 2017-2023 Crown Copyright
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package uk.gov.gchq.gaffer.randomelementgeneration.supplier;
-
-import uk.gov.gchq.gaffer.data.element.Element;
-
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-import java.util.NoSuchElementException;
-import java.util.Set;
-import java.util.function.Supplier;
-
-/**
- * This class is a {@link Supplier} of {@link Element}s. It is formed from a {@link Supplier} of {@link Set}s of
- * {@link Element}s by repeatedly calling that {@link Supplier}'s get() method.
- */
-public class ElementsSupplier implements Supplier {
- private final Iterator elementIterator;
-
- public ElementsSupplier(final Supplier> elementSupplier) {
- this.elementIterator = new ElementIterator(elementSupplier);
- }
-
- @Override
- public Element get() {
- if (elementIterator.hasNext()) {
- return elementIterator.next();
- }
- return null;
- }
-
- protected static class ElementIterator implements Iterator {
- private final Supplier> elementSupplier;
- private final List cache;
-
- ElementIterator(final Supplier> elementSupplier) {
- this.elementSupplier = elementSupplier;
- this.cache = new ArrayList<>();
- }
-
- @Override
- public boolean hasNext() {
- if (cache.isEmpty()) {
- final Set fromSupplier = elementSupplier.get();
- if (null == fromSupplier || 0 == fromSupplier.size()) {
- return false;
- }
- cache.addAll(fromSupplier);
- }
- return true;
- }
-
- @Override
- public Element next() {
- if (!hasNext()) {
- throw new NoSuchElementException("Supplier is exhausted");
- }
- final Element elementToReturn = cache.get(0);
- cache.remove(0);
- return elementToReturn;
- }
- }
-}
diff --git a/random-element-generation/src/main/java/uk/gov/gchq/gaffer/randomelementgeneration/supplier/ElementsSupplierWithRepeats.java b/random-element-generation/src/main/java/uk/gov/gchq/gaffer/randomelementgeneration/supplier/ElementsSupplierWithRepeats.java
deleted file mode 100644
index 3575e7b4..00000000
--- a/random-element-generation/src/main/java/uk/gov/gchq/gaffer/randomelementgeneration/supplier/ElementsSupplierWithRepeats.java
+++ /dev/null
@@ -1,83 +0,0 @@
-/*
- * Copyright 2017-2023 Crown Copyright
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package uk.gov.gchq.gaffer.randomelementgeneration.supplier;
-
-import uk.gov.gchq.gaffer.data.element.Element;
-import uk.gov.gchq.gaffer.randomelementgeneration.cache.Cache;
-
-import java.util.Iterator;
-import java.util.Random;
-import java.util.Set;
-import java.util.function.Supplier;
-
-/**
- * This class extends {@link ElementsSupplier} by maintaining a cache of some of the {@link Element}s
- * that have previously been output, and with a certain probability, reoutputting an {@link Element} that has
- * previously been output.
- */
-public class ElementsSupplierWithRepeats extends ElementsSupplier {
- private final Iterator elementIterator;
-
- public ElementsSupplierWithRepeats(final Supplier> elementSupplier,
- final double repeatProb,
- final Cache cache) {
- super(elementSupplier);
- this.elementIterator = new ElementIteratorWithRepeats(new ElementIterator(elementSupplier), repeatProb, cache);
- }
-
- @Override
- public Element get() {
- if (elementIterator.hasNext()) {
- return elementIterator.next();
- }
- return null;
- }
-
- protected static class ElementIteratorWithRepeats implements Iterator {
- private final Random random = new Random();
- private final Iterator elementIterator;
- private final double repeatProb;
- private final Cache cache;
-
- ElementIteratorWithRepeats(final Iterator elementIterator,
- final double repeatProb,
- final Cache cache) {
- this.elementIterator = elementIterator;
- this.repeatProb = repeatProb;
- this.cache = cache;
- }
-
- @Override
- public boolean hasNext() {
- return elementIterator.hasNext();
- }
-
- @Override
- public Element next() {
- final double prob = random.nextDouble();
- if (prob < repeatProb) {
- final Element element = cache.get();
- return element == null ? elementIterator.next() : element;
- }
- final Element element = elementIterator.next();
- final Element clonedElement = element.emptyClone();
- clonedElement.copyProperties(element.getProperties());
- cache.add(clonedElement);
- return element;
- }
- }
-}
diff --git a/random-element-generation/src/main/java/uk/gov/gchq/gaffer/randomelementgeneration/supplier/EntitySeedSupplier.java b/random-element-generation/src/main/java/uk/gov/gchq/gaffer/randomelementgeneration/supplier/EntitySeedSupplier.java
deleted file mode 100644
index 929ac407..00000000
--- a/random-element-generation/src/main/java/uk/gov/gchq/gaffer/randomelementgeneration/supplier/EntitySeedSupplier.java
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * Copyright 2017-2023 Crown Copyright
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package uk.gov.gchq.gaffer.randomelementgeneration.supplier;
-
-import uk.gov.gchq.gaffer.operation.data.EntitySeed;
-
-import java.util.Random;
-
-public class EntitySeedSupplier implements ElementSeedSupplier {
- protected final Random random = new Random();
- private final int numBits;
-
- public EntitySeedSupplier(final long maxNodeId) {
- this.numBits = (int) (Math.log(maxNodeId) / Math.log(2));
- }
-
- @Override
- public EntitySeed get() {
- // Random number in range 0 to 1 << (numBits - 1)
- long id = 0L;
- for (int i = 0; i < numBits; i++) {
- if (random.nextDouble() < 0.5D) {
- id = id ^ (1 << i);
- }
- }
- return new EntitySeed(id);
- }
-}
diff --git a/random-element-generation/src/main/java/uk/gov/gchq/gaffer/randomelementgeneration/supplier/RmatElementSupplier.java b/random-element-generation/src/main/java/uk/gov/gchq/gaffer/randomelementgeneration/supplier/RmatElementSupplier.java
deleted file mode 100644
index 4b85689b..00000000
--- a/random-element-generation/src/main/java/uk/gov/gchq/gaffer/randomelementgeneration/supplier/RmatElementSupplier.java
+++ /dev/null
@@ -1,145 +0,0 @@
-/*
- * Copyright 2017-2023 Crown Copyright
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package uk.gov.gchq.gaffer.randomelementgeneration.supplier;
-
-import com.clearspring.analytics.stream.cardinality.HyperLogLogPlus;
-
-import uk.gov.gchq.gaffer.data.element.Edge;
-import uk.gov.gchq.gaffer.data.element.Element;
-import uk.gov.gchq.gaffer.data.element.Entity;
-import uk.gov.gchq.gaffer.randomelementgeneration.Constants;
-
-import java.util.Arrays;
-import java.util.HashSet;
-import java.util.Random;
-import java.util.Set;
-import java.util.function.Supplier;
-
-/**
- * This class uses the RMAT random graph generation method (http://www.cs.cmu.edu/~christos/PUBLICATIONS/siam04.pdf)
- * to generate random {@link Element}s. The vertices are {@link java.lang.Long}s in the range 0 to a user defined
- * maximum value.
- *
- * Each call to get() returns a {@link Set} of {@link Element}s. If the includeEntities
- * option is true, then the set will contain a single {@link Edge} and an {@link Entity} for each vertex in the
- * {@link Edge}. If the includeEntities option is false, then the set will contain a single {@link Edge}.
- *
- *
By default, the probabilities used for the generation of the edges are the same as those specified in the
- * Graph500 challenge, but other probabilities can be specified if desired.
- */
-public class RmatElementSupplier implements Supplier> {
- protected final Random random = new Random();
- private double[] cumulativeProbs;
- private final int numBits;
- private final boolean includeEntities;
-
- public RmatElementSupplier(final double[] probabilities, final long maxNodeId, final boolean includeEntities) {
- validateProbabilities(probabilities);
- setCumulativeProbs(probabilities);
- this.numBits = (int) (Math.log(maxNodeId) / Math.log(2));
- this.includeEntities = includeEntities;
- }
-
- public RmatElementSupplier(final long maxNodeId, final boolean includeEntities) {
- this(Constants.RMAT_PROBABILITIES, maxNodeId, includeEntities);
- }
-
- /**
- * destination
- * +---+---+
- * | 0 | 1 |
- * source +---+---+
- * | 2 | 3 |
- * +---+---+
- */
- @Override
- public Set get() {
- // Generate random source and destination nodes
- long source = 0L;
- long destination = 0L;
- for (int i = 0; i < numBits; i++) {
- final int quadrant = generateRandomQuadrant();
- // Do nothing if quadrant == 0
- if (quadrant == 1) {
- destination = destination ^ (1 << i);
- } else if (quadrant == 2) {
- source = source ^ (1 << i);
- } else {
- source = source ^ (1 << i);
- destination = destination ^ (1 << i);
- }
- }
- final Set results = new HashSet<>();
- // Create edge, and source and destination entities
- final Edge edge = new Edge("edgeGroup", source, destination, true);
- edge.putProperty("count", 1L);
- results.add(edge);
- if (includeEntities) {
- final Entity sourceEntity = new Entity("entityGroup", source);
- sourceEntity.putProperty("count", 1L);
- final HyperLogLogPlus sourceHLLPP = new HyperLogLogPlus(5, 5);
- sourceHLLPP.offer(destination);
- sourceEntity.putProperty("approxDegree", sourceHLLPP);
- results.add(sourceEntity);
- final Entity destinationEntity = new Entity("entityGroup", destination);
- destinationEntity.putProperty("count", 1L);
- final HyperLogLogPlus destinationHLLPP = new HyperLogLogPlus(5, 5);
- destinationHLLPP.offer(destination);
- destinationEntity.putProperty("approxDegree", destinationHLLPP);
- results.add(destinationEntity);
- }
- return results;
- }
-
- private int generateRandomQuadrant() {
- final double d = random.nextDouble();
- if (d < cumulativeProbs[0]) {
- return 0;
- }
- if (d < cumulativeProbs[1]) {
- return 1;
- }
- if (d < cumulativeProbs[2]) {
- return 2;
- }
- return 3;
- }
-
- private void validateProbabilities(final double... probabilities) {
- // There should be 4 probabilities, they should all be greater than 0 and they should sum to 1.
- if (probabilities == null || probabilities.length != 4) {
- throw new IllegalArgumentException("Probabilities should be non-null and of length 4.");
- }
- final double min = Arrays.stream(probabilities).min().getAsDouble();
- if (min <= 0.0) {
- throw new IllegalArgumentException("Every entry in probabilities must be strictly positive.");
- }
- final double sum = Arrays.stream(probabilities).sum();
- if (sum < 0.999999999 || sum > 1.00000001) {
- throw new IllegalArgumentException("The entries in probabilities must sum to 1.");
- }
- }
-
- private void setCumulativeProbs(final double... probabilities) {
- // Should probably check the array has length 4?
- this.cumulativeProbs = new double[4];
- this.cumulativeProbs[0] = probabilities[0];
- this.cumulativeProbs[1] = probabilities[1] + this.cumulativeProbs[0];
- this.cumulativeProbs[2] = probabilities[2] + this.cumulativeProbs[1];
- this.cumulativeProbs[3] = probabilities[3] + this.cumulativeProbs[2];
- }
-}
diff --git a/random-element-generation/src/main/resources/accumuloStore.properties b/random-element-generation/src/main/resources/accumuloStore.properties
deleted file mode 100644
index ed9e01c9..00000000
--- a/random-element-generation/src/main/resources/accumuloStore.properties
+++ /dev/null
@@ -1,21 +0,0 @@
-#
-# Copyright 2020 Crown Copyright
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-gaffer.store.class=uk.gov.gchq.gaffer.accumulostore.MiniAccumuloStore
-gaffer.store.properties.class=uk.gov.gchq.gaffer.accumulostore.AccumuloProperties
-accumulo.instance=someInstanceName
-accumulo.zookeepers=localhost
-accumulo.user=user01
-accumulo.password=password
diff --git a/random-element-generation/src/main/resources/log4j.xml b/random-element-generation/src/main/resources/log4j.xml
deleted file mode 100755
index 3e702d7b..00000000
--- a/random-element-generation/src/main/resources/log4j.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/random-element-generation/src/main/resources/randomIngestTest.properties b/random-element-generation/src/main/resources/randomIngestTest.properties
deleted file mode 100644
index 39977974..00000000
--- a/random-element-generation/src/main/resources/randomIngestTest.properties
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# Copyright 2017 Crown Copyright
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-gaffer.performancetesting.ingest.elementSupplierClass=uk.gov.gchq.gaffer.randomelementgeneration.supplier.RmatElementSupplier
-gaffer.performancetesting.ingest.numberOfElements=1000
-gaffer.performancetesting.rmat.includeEntities=true
-gaffer.performancetesting.rmat.maxNodeId=10000
-gaffer.accumulostore.performancetesting.ingest.tempDirectory=/tmp/performancetesting
-gaffer.accumulostore.performancetesting.ingest.numElementsForSplitEstimation=1000000
-gaffer.accumulostore.performancetesting.ingest.numTabletServers=5
diff --git a/random-element-generation/src/main/resources/schema/elements.json b/random-element-generation/src/main/resources/schema/elements.json
deleted file mode 100644
index cf3f7c86..00000000
--- a/random-element-generation/src/main/resources/schema/elements.json
+++ /dev/null
@@ -1,21 +0,0 @@
-{
- "entities": {
- "entityGroup": {
- "vertex": "long",
- "properties": {
- "count": "count.long",
- "approxDegree": "hllp"
- }
- }
- },
- "edges": {
- "edgeGroup": {
- "source": "long",
- "destination": "long",
- "directed": "true",
- "properties": {
- "count": "count.long"
- }
- }
- }
-}
\ No newline at end of file
diff --git a/random-element-generation/src/main/resources/schema/types.json b/random-element-generation/src/main/resources/schema/types.json
deleted file mode 100644
index a0d9e374..00000000
--- a/random-element-generation/src/main/resources/schema/types.json
+++ /dev/null
@@ -1,39 +0,0 @@
-{
- "types": {
- "long": {
- "class": "java.lang.Long",
- "validateFunctions": [
- {
- "class": "uk.gov.gchq.koryphe.impl.predicate.Exists"
- }
- ]
- },
- "count.long": {
- "class": "java.lang.Long",
- "aggregateFunction": {
- "class": "uk.gov.gchq.koryphe.impl.binaryoperator.Sum"
- }
- },
- "hllp": {
- "class": "com.clearspring.analytics.stream.cardinality.HyperLogLogPlus",
- "validateFunctions": [
- {
- "class": "uk.gov.gchq.koryphe.impl.predicate.Exists"
- }
- ],
- "aggregateFunction": {
- "class": "uk.gov.gchq.gaffer.sketches.clearspring.cardinality.binaryoperator.HyperLogLogPlusAggregator"
- },
- "serialiserClass": "uk.gov.gchq.gaffer.sketches.clearspring.cardinality.serialisation.HyperLogLogPlusSerialiser"
- },
- "true": {
- "class": "java.lang.Boolean",
- "validateFunctions": [
- {
- "class": "uk.gov.gchq.koryphe.impl.predicate.Exists"
- }
- ]
- }
- },
- "vertexSerialiserClass": "uk.gov.gchq.gaffer.serialisation.implementation.raw.CompactRawLongSerialiser"
-}
\ No newline at end of file
diff --git a/random-element-generation/src/test/java/uk/gov/gchq/gaffer/randomelementgeneration/cache/TestPreferentialAttachmentCache.java b/random-element-generation/src/test/java/uk/gov/gchq/gaffer/randomelementgeneration/cache/TestPreferentialAttachmentCache.java
deleted file mode 100644
index 10fd0dce..00000000
--- a/random-element-generation/src/test/java/uk/gov/gchq/gaffer/randomelementgeneration/cache/TestPreferentialAttachmentCache.java
+++ /dev/null
@@ -1,87 +0,0 @@
-/*
- * Copyright 2017-2019 Crown Copyright
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package uk.gov.gchq.gaffer.randomelementgeneration.cache;
-
-import org.junit.jupiter.api.Test;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.stream.IntStream;
-
-import static org.assertj.core.api.Assertions.assertThat;
-
-public class TestPreferentialAttachmentCache {
-
- @Test
- public void testGetReturnsOneOfTheElementsAdded() {
- // Given
- final PreferentialAttachmentCache cache = new PreferentialAttachmentCache<>(10);
- final Set data = new HashSet<>();
- IntStream.range(0, 5).forEach(i -> data.add("" + i));
- data.forEach(cache::add);
-
- // When
- final List results = new ArrayList<>();
- IntStream.range(0, 100).forEach(i -> results.add(cache.get()));
-
- // Then
- results.forEach(i -> assertThat(data.contains(i)).isTrue());
- }
-
- @Test
- public void testMaxSizeIsRespected() {
- // Given
- final PreferentialAttachmentCache cache = new PreferentialAttachmentCache<>(10);
- IntStream.range(0, 20).forEach(i -> cache.add("A" + i));
-
- // When
- final long numberOfElements = cache.getNumberOfElements();
-
- // Then
- assertThat(numberOfElements).isEqualTo(10);
- }
-
- /**
- * This test could be made sophisticated, e.g. checking that the exponent of the power-law lies within a certain
- * range. Currently, this test simply checks that the frequency of the most popular item is several orders of
- * magnitude greater than the least frequent item.
- */
- @Test
- public void testPowerLaw() {
- // Given
- final PreferentialAttachmentCache cache = new PreferentialAttachmentCache<>(10);
- IntStream.range(0, 10).forEach(i -> cache.add("A" + i));
- final Map itemToCount = new HashMap<>();
-
- // When
- IntStream.range(0, 1000000).forEach(i -> {
- final String item = cache.get();
- if (!itemToCount.containsKey(item)) {
- itemToCount.put(item, 0L);
- }
- itemToCount.put(item, itemToCount.get(item) + 1L);
- });
- final long maxFrequency = itemToCount.values().stream().mapToLong(Long::longValue).max().getAsLong();
- final long minFrequency = itemToCount.values().stream().mapToLong(Long::longValue).min().getAsLong();
-
- // Then
- assertThat(maxFrequency / minFrequency > 5).isTrue();
- }
-}
diff --git a/random-element-generation/src/test/java/uk/gov/gchq/gaffer/randomelementgeneration/cache/TestProbabilityGenerator.java b/random-element-generation/src/test/java/uk/gov/gchq/gaffer/randomelementgeneration/cache/TestProbabilityGenerator.java
deleted file mode 100644
index 3777da4a..00000000
--- a/random-element-generation/src/test/java/uk/gov/gchq/gaffer/randomelementgeneration/cache/TestProbabilityGenerator.java
+++ /dev/null
@@ -1,73 +0,0 @@
-/*
- * Copyright 2017-2019 Crown Copyright
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package uk.gov.gchq.gaffer.randomelementgeneration.cache;
-
-import org.junit.jupiter.api.Test;
-
-import java.util.Map;
-import java.util.SortedMap;
-import java.util.TreeMap;
-import java.util.concurrent.ConcurrentHashMap;
-import java.util.stream.IntStream;
-
-import static org.assertj.core.api.Assertions.assertThat;
-
-public class TestProbabilityGenerator {
-
- @Test
- public void testWhenUniform() {
- // Given
- final SortedMap itemsToFrequency = new TreeMap<>();
- itemsToFrequency.put("A", 100L);
- itemsToFrequency.put("B", 100L);
- final ProbabilityGenerator generator = new ProbabilityGenerator<>(itemsToFrequency);
-
- // When
- final Map counts = new ConcurrentHashMap<>();
- counts.put("A", 0L);
- counts.put("B", 0L);
- IntStream.range(0, 1000000).asDoubleStream().forEach(i -> {
- final String sample = generator.sample();
- counts.put(sample, counts.get(sample) + 1L);
- });
-
- // Then
- final double ratio = ((double) counts.get("A")) / counts.get("B");
- assertThat(0.99D < ratio && ratio < 1.01D).isTrue();
- }
-
- @Test
- public void testWhenUnbalanced() {
- // Given
- final SortedMap itemsToFrequency = new TreeMap<>();
- itemsToFrequency.put("A", 10000L);
- itemsToFrequency.put("B", 10L);
- final ProbabilityGenerator generator = new ProbabilityGenerator<>(itemsToFrequency);
-
- // When
- final Map counts = new ConcurrentHashMap<>();
- counts.put("A", 0L);
- counts.put("B", 0L);
- IntStream.range(0, 10000000).forEach(i -> {
- final String sample = generator.sample();
- counts.put(sample, counts.get(sample) + 1L);
- });
-
- // Then
- final double ratio = ((double) counts.get("A")) / counts.get("B");
- assertThat(ratio > 100.0D).isTrue();
- }
-}
diff --git a/random-element-generation/src/test/resources/log4j.xml b/random-element-generation/src/test/resources/log4j.xml
deleted file mode 100644
index 2bcf2626..00000000
--- a/random-element-generation/src/test/resources/log4j.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/python-shell/requirements.txt b/requirements.txt
similarity index 100%
rename from python-shell/requirements.txt
rename to requirements.txt
diff --git a/python-shell/setup.cfg b/setup.cfg
similarity index 100%
rename from python-shell/setup.cfg
rename to setup.cfg
diff --git a/python-shell/setup.py b/setup.py
similarity index 100%
rename from python-shell/setup.py
rename to setup.py
diff --git a/python-shell/src/__init__.py b/src/__init__.py
similarity index 82%
rename from python-shell/src/__init__.py
rename to src/__init__.py
index 8ca7547d..d04722b9 100644
--- a/python-shell/src/__init__.py
+++ b/src/__init__.py
@@ -2,7 +2,7 @@
__title__ = "gafferpy"
__description__ = "Gaffer Python Shell"
-__uri__ = "https://github.com/gchq/gaffer-tools"
+__uri__ = "https://github.com/gchq/gafferpy"
__doc__ = __description__ + " <" + __uri__ + ">"
__author__ = "GCHQ"
diff --git a/python-shell/src/fishbowl/README.md b/src/fishbowl/README.md
similarity index 100%
rename from python-shell/src/fishbowl/README.md
rename to src/fishbowl/README.md
diff --git a/python-shell/src/fishbowl/__init__.py b/src/fishbowl/__init__.py
similarity index 72%
rename from python-shell/src/fishbowl/__init__.py
rename to src/fishbowl/__init__.py
index 9f302242..4757cd70 100644
--- a/python-shell/src/fishbowl/__init__.py
+++ b/src/fishbowl/__init__.py
@@ -1,8 +1,8 @@
-__version__ = "2.0.0-alpha-0.6"
+__version__ = "2.0.0"
__title__ = "fishbowl"
__description__ = "Gaffer Python Shell"
-__uri__ = "https://github.com/gchq/gaffer-tools"
+__uri__ = "https://github.com/gchq/gafferpy"
__doc__ = __description__ + " <" + __uri__ + ">"
__author__ = "GCHQ"
diff --git a/python-shell/src/fishbowl/fishbowl.py b/src/fishbowl/fishbowl.py
similarity index 100%
rename from python-shell/src/fishbowl/fishbowl.py
rename to src/fishbowl/fishbowl.py
diff --git a/python-shell/src/fishbowl/templates/base.py.j2 b/src/fishbowl/templates/base.py.j2
similarity index 100%
rename from python-shell/src/fishbowl/templates/base.py.j2
rename to src/fishbowl/templates/base.py.j2
diff --git a/python-shell/src/fishbowl/templates/config.py.j2 b/src/fishbowl/templates/config.py.j2
similarity index 100%
rename from python-shell/src/fishbowl/templates/config.py.j2
rename to src/fishbowl/templates/config.py.j2
diff --git a/python-shell/src/fishbowl/templates/functions.py.j2 b/src/fishbowl/templates/functions.py.j2
similarity index 100%
rename from python-shell/src/fishbowl/templates/functions.py.j2
rename to src/fishbowl/templates/functions.py.j2
diff --git a/python-shell/src/fishbowl/templates/operations.py.j2 b/src/fishbowl/templates/operations.py.j2
similarity index 100%
rename from python-shell/src/fishbowl/templates/operations.py.j2
rename to src/fishbowl/templates/operations.py.j2
diff --git a/python-shell/src/gafferpy/__init__.py b/src/gafferpy/__init__.py
similarity index 82%
rename from python-shell/src/gafferpy/__init__.py
rename to src/gafferpy/__init__.py
index 8ca7547d..d04722b9 100644
--- a/python-shell/src/gafferpy/__init__.py
+++ b/src/gafferpy/__init__.py
@@ -2,7 +2,7 @@
__title__ = "gafferpy"
__description__ = "Gaffer Python Shell"
-__uri__ = "https://github.com/gchq/gaffer-tools"
+__uri__ = "https://github.com/gchq/gafferpy"
__doc__ = __description__ + " <" + __uri__ + ">"
__author__ = "GCHQ"
diff --git a/python-shell/src/gafferpy/client/__init__.py b/src/gafferpy/client/__init__.py
similarity index 100%
rename from python-shell/src/gafferpy/client/__init__.py
rename to src/gafferpy/client/__init__.py
diff --git a/python-shell/src/gafferpy/client/base_client.py b/src/gafferpy/client/base_client.py
similarity index 100%
rename from python-shell/src/gafferpy/client/base_client.py
rename to src/gafferpy/client/base_client.py
diff --git a/python-shell/src/gafferpy/client/pki_client.py b/src/gafferpy/client/pki_client.py
similarity index 100%
rename from python-shell/src/gafferpy/client/pki_client.py
rename to src/gafferpy/client/pki_client.py
diff --git a/python-shell/src/gafferpy/client/requests_client.py b/src/gafferpy/client/requests_client.py
similarity index 100%
rename from python-shell/src/gafferpy/client/requests_client.py
rename to src/gafferpy/client/requests_client.py
diff --git a/python-shell/src/gafferpy/client/urllib_client.py b/src/gafferpy/client/urllib_client.py
similarity index 100%
rename from python-shell/src/gafferpy/client/urllib_client.py
rename to src/gafferpy/client/urllib_client.py
diff --git a/python-shell/src/gafferpy/fromJson.py b/src/gafferpy/fromJson.py
similarity index 100%
rename from python-shell/src/gafferpy/fromJson.py
rename to src/gafferpy/fromJson.py
diff --git a/python-shell/src/gafferpy/gaffer.py b/src/gafferpy/gaffer.py
similarity index 100%
rename from python-shell/src/gafferpy/gaffer.py
rename to src/gafferpy/gaffer.py
diff --git a/python-shell/src/gafferpy/gaffer_binaryoperators.py b/src/gafferpy/gaffer_binaryoperators.py
similarity index 100%
rename from python-shell/src/gafferpy/gaffer_binaryoperators.py
rename to src/gafferpy/gaffer_binaryoperators.py
diff --git a/python-shell/src/gafferpy/gaffer_config.py b/src/gafferpy/gaffer_config.py
similarity index 100%
rename from python-shell/src/gafferpy/gaffer_config.py
rename to src/gafferpy/gaffer_config.py
diff --git a/python-shell/src/gafferpy/gaffer_connector.py b/src/gafferpy/gaffer_connector.py
similarity index 100%
rename from python-shell/src/gafferpy/gaffer_connector.py
rename to src/gafferpy/gaffer_connector.py
diff --git a/python-shell/src/gafferpy/gaffer_connector_pki.py b/src/gafferpy/gaffer_connector_pki.py
similarity index 100%
rename from python-shell/src/gafferpy/gaffer_connector_pki.py
rename to src/gafferpy/gaffer_connector_pki.py
diff --git a/python-shell/src/gafferpy/gaffer_core.py b/src/gafferpy/gaffer_core.py
similarity index 100%
rename from python-shell/src/gafferpy/gaffer_core.py
rename to src/gafferpy/gaffer_core.py
diff --git a/python-shell/src/gafferpy/gaffer_functions.py b/src/gafferpy/gaffer_functions.py
similarity index 100%
rename from python-shell/src/gafferpy/gaffer_functions.py
rename to src/gafferpy/gaffer_functions.py
diff --git a/python-shell/src/gafferpy/gaffer_operations.py b/src/gafferpy/gaffer_operations.py
similarity index 100%
rename from python-shell/src/gafferpy/gaffer_operations.py
rename to src/gafferpy/gaffer_operations.py
diff --git a/python-shell/src/gafferpy/gaffer_predicates.py b/src/gafferpy/gaffer_predicates.py
similarity index 100%
rename from python-shell/src/gafferpy/gaffer_predicates.py
rename to src/gafferpy/gaffer_predicates.py
diff --git a/python-shell/src/gafferpy/gaffer_types.py b/src/gafferpy/gaffer_types.py
similarity index 100%
rename from python-shell/src/gafferpy/gaffer_types.py
rename to src/gafferpy/gaffer_types.py
diff --git a/python-shell/src/gafferpy/generated_api/__init__.py b/src/gafferpy/generated_api/__init__.py
similarity index 100%
rename from python-shell/src/gafferpy/generated_api/__init__.py
rename to src/gafferpy/generated_api/__init__.py
diff --git a/python-shell/src/gafferpy/generated_api/binary_operators.py b/src/gafferpy/generated_api/binary_operators.py
similarity index 100%
rename from python-shell/src/gafferpy/generated_api/binary_operators.py
rename to src/gafferpy/generated_api/binary_operators.py
diff --git a/python-shell/src/gafferpy/generated_api/config.py b/src/gafferpy/generated_api/config.py
similarity index 100%
rename from python-shell/src/gafferpy/generated_api/config.py
rename to src/gafferpy/generated_api/config.py
diff --git a/python-shell/src/gafferpy/generated_api/functions.py b/src/gafferpy/generated_api/functions.py
similarity index 100%
rename from python-shell/src/gafferpy/generated_api/functions.py
rename to src/gafferpy/generated_api/functions.py
diff --git a/python-shell/src/gafferpy/generated_api/operations.py b/src/gafferpy/generated_api/operations.py
similarity index 100%
rename from python-shell/src/gafferpy/generated_api/operations.py
rename to src/gafferpy/generated_api/operations.py
diff --git a/python-shell/src/gafferpy/generated_api/predicates.py b/src/gafferpy/generated_api/predicates.py
similarity index 100%
rename from python-shell/src/gafferpy/generated_api/predicates.py
rename to src/gafferpy/generated_api/predicates.py
diff --git a/python-shell/src/gafferpy_examples/Gaffer-Python-Demo.ipynb b/src/gafferpy_examples/Gaffer-Python-Demo.ipynb
similarity index 100%
rename from python-shell/src/gafferpy_examples/Gaffer-Python-Demo.ipynb
rename to src/gafferpy_examples/Gaffer-Python-Demo.ipynb
diff --git a/python-shell/src/gafferpy_examples/__init__.py b/src/gafferpy_examples/__init__.py
similarity index 73%
rename from python-shell/src/gafferpy_examples/__init__.py
rename to src/gafferpy_examples/__init__.py
index 8f798dee..4e1dab15 100644
--- a/python-shell/src/gafferpy_examples/__init__.py
+++ b/src/gafferpy_examples/__init__.py
@@ -1,8 +1,8 @@
-__version__ = "2.0.0-alpha-0.6"
+__version__ = "2.0.0"
__title__ = "gafferpy_examples"
__description__ = "Gaffer Python Shell"
-__uri__ = "https://github.com/gchq/gaffer-tools"
+__uri__ = "https://github.com/gchq/gafferpy"
__doc__ = __description__ + " <" + __uri__ + ">"
__author__ = "GCHQ"
diff --git a/python-shell/src/gafferpy_examples/example.py b/src/gafferpy_examples/example.py
similarity index 100%
rename from python-shell/src/gafferpy_examples/example.py
rename to src/gafferpy_examples/example.py
diff --git a/python-shell/src/gafferpy_examples/example_map.py b/src/gafferpy_examples/example_map.py
similarity index 100%
rename from python-shell/src/gafferpy_examples/example_map.py
rename to src/gafferpy_examples/example_map.py
diff --git a/python-shell/src/gafferpy_examples/example_map_pki.py b/src/gafferpy_examples/example_map_pki.py
similarity index 100%
rename from python-shell/src/gafferpy_examples/example_map_pki.py
rename to src/gafferpy_examples/example_map_pki.py
diff --git a/python-shell/src/gafferpy_examples/example_pki.py b/src/gafferpy_examples/example_pki.py
similarity index 100%
rename from python-shell/src/gafferpy_examples/example_pki.py
rename to src/gafferpy_examples/example_pki.py
diff --git a/python-shell/src/generate.py b/src/generate.py
similarity index 100%
rename from python-shell/src/generate.py
rename to src/generate.py
diff --git a/python-shell/__init__.py b/src/test/__init__.py
similarity index 72%
rename from python-shell/__init__.py
rename to src/test/__init__.py
index 1091487b..d04722b9 100644
--- a/python-shell/__init__.py
+++ b/src/test/__init__.py
@@ -1,8 +1,8 @@
-__version__ = "2.0.0-alpha-0.6"
+__version__ = "2.0.0"
__title__ = "gafferpy"
__description__ = "Gaffer Python Shell"
-__uri__ = "https://github.com/gchq/gaffer-tools"
+__uri__ = "https://github.com/gchq/gafferpy"
__doc__ = __description__ + " <" + __uri__ + ">"
__author__ = "GCHQ"
diff --git a/cd/road-traffic-example/addOperationsToChain.json b/src/test/road-traffic-example/addOperationsToChain.json
similarity index 100%
rename from cd/road-traffic-example/addOperationsToChain.json
rename to src/test/road-traffic-example/addOperationsToChain.json
diff --git a/cd/road-traffic-example/federatedGraphConfig.json b/src/test/road-traffic-example/federatedGraphConfig.json
similarity index 100%
rename from cd/road-traffic-example/federatedGraphConfig.json
rename to src/test/road-traffic-example/federatedGraphConfig.json
diff --git a/cd/road-traffic-example/federatedStore.properties b/src/test/road-traffic-example/federatedStore.properties
similarity index 100%
rename from cd/road-traffic-example/federatedStore.properties
rename to src/test/road-traffic-example/federatedStore.properties
diff --git a/cd/road-traffic-example/graphConfig.json b/src/test/road-traffic-example/graphConfig.json
similarity index 100%
rename from cd/road-traffic-example/graphConfig.json
rename to src/test/road-traffic-example/graphConfig.json
diff --git a/cd/road-traffic-example/roadTrafficSampleData.csv b/src/test/road-traffic-example/roadTrafficSampleData.csv
similarity index 100%
rename from cd/road-traffic-example/roadTrafficSampleData.csv
rename to src/test/road-traffic-example/roadTrafficSampleData.csv
diff --git a/cd/road-traffic-example/schema/elements.json b/src/test/road-traffic-example/schema/elements.json
similarity index 100%
rename from cd/road-traffic-example/schema/elements.json
rename to src/test/road-traffic-example/schema/elements.json
diff --git a/cd/road-traffic-example/schema/types.json b/src/test/road-traffic-example/schema/types.json
similarity index 100%
rename from cd/road-traffic-example/schema/types.json
rename to src/test/road-traffic-example/schema/types.json
diff --git a/cd/road-traffic-example/store.properties b/src/test/road-traffic-example/store.properties
similarity index 100%
rename from cd/road-traffic-example/store.properties
rename to src/test/road-traffic-example/store.properties
diff --git a/python-shell/src/test/test_connector.py b/src/test/test_connector.py
similarity index 100%
rename from python-shell/src/test/test_connector.py
rename to src/test/test_connector.py
diff --git a/python-shell/src/test/test_example.py b/src/test/test_example.py
similarity index 100%
rename from python-shell/src/test/test_example.py
rename to src/test/test_example.py
diff --git a/python-shell/src/test/test_example_map.py b/src/test/test_example_map.py
similarity index 100%
rename from python-shell/src/test/test_example_map.py
rename to src/test/test_example_map.py
diff --git a/python-shell/src/test/test_gaffer_functions.py b/src/test/test_gaffer_functions.py
similarity index 100%
rename from python-shell/src/test/test_gaffer_functions.py
rename to src/test/test_gaffer_functions.py
diff --git a/python-shell/src/test/test_gaffer_functions_it.py b/src/test/test_gaffer_functions_it.py
similarity index 100%
rename from python-shell/src/test/test_gaffer_functions_it.py
rename to src/test/test_gaffer_functions_it.py
diff --git a/python-shell/src/test/test_gaffer_operations.py b/src/test/test_gaffer_operations.py
similarity index 100%
rename from python-shell/src/test/test_gaffer_operations.py
rename to src/test/test_gaffer_operations.py
diff --git a/python-shell/src/test/test_gaffer_operations_it.py b/src/test/test_gaffer_operations_it.py
similarity index 100%
rename from python-shell/src/test/test_gaffer_operations_it.py
rename to src/test/test_gaffer_operations_it.py
diff --git a/python-shell/src/test/test_gaffer_predicates.py b/src/test/test_gaffer_predicates.py
similarity index 100%
rename from python-shell/src/test/test_gaffer_predicates.py
rename to src/test/test_gaffer_predicates.py
diff --git a/python-shell/src/test/test_gaffer_predicates_it.py b/src/test/test_gaffer_predicates_it.py
similarity index 100%
rename from python-shell/src/test/test_gaffer_predicates_it.py
rename to src/test/test_gaffer_predicates_it.py
diff --git a/python-shell/src/test/test_json_converter.py b/src/test/test_json_converter.py
similarity index 100%
rename from python-shell/src/test/test_json_converter.py
rename to src/test/test_json_converter.py