From c67d5a37e366be217abc73258287c5b2e48cdd45 Mon Sep 17 00:00:00 2001 From: t92549 <80890692+t92549@users.noreply.github.com> Date: Fri, 8 Dec 2023 15:15:07 +0000 Subject: [PATCH 1/6] Improved testing of matchedVertex --- .../gchq/gaffer/data/util/ElementUtil.java | 18 +++++ .../handler/function/FilterHandlerTest.java | 8 +- .../function/TransformHandlerTest.java | 4 +- .../gaffer/store/util/AggregatorUtilTest.java | 4 +- .../gaffer/integration/impl/GeneratorsIT.java | 10 +-- .../integration/impl/GetElementsIT.java | 17 +++-- .../integration/impl/SchemaMigrationIT.java | 4 +- .../impl/AccumuloElementsRetriever.java | 6 +- .../AbstractAccumuloElementConverterTest.java | 12 +-- ...ctCoreKeyAccumuloElementConverterTest.java | 4 +- .../FederatedStoreSchemaTest.java | 76 ++++++++++--------- 11 files changed, 97 insertions(+), 66 deletions(-) diff --git a/core/data/src/test/java/uk/gov/gchq/gaffer/data/util/ElementUtil.java b/core/data/src/test/java/uk/gov/gchq/gaffer/data/util/ElementUtil.java index 190685bc8e9..f8cd079b1fe 100644 --- a/core/data/src/test/java/uk/gov/gchq/gaffer/data/util/ElementUtil.java +++ b/core/data/src/test/java/uk/gov/gchq/gaffer/data/util/ElementUtil.java @@ -43,4 +43,22 @@ public static void assertElementEquals(final Iterable expec assertThat(resultCache).containsExactlyInAnyOrderElementsOf(expectedCache); } } + + public static void assertElementEqualsIncludingMatchedVertex(final Iterable expected, final Iterable result) { + assertElementEqualsIncludingMatchedVertex(expected, result, false); + } + + public static void assertElementEqualsIncludingMatchedVertex(final Iterable expected, final Iterable result, final boolean ignoreDuplicates) { + final List expectedCache = Lists.newArrayList(expected); + final List resultCache = Lists.newArrayList(result); + if (ignoreDuplicates) { + assertThat(resultCache) + .usingRecursiveFieldByFieldElementComparator() + .hasSameElementsAs(expectedCache); + } else { + assertThat(resultCache) + .usingRecursiveFieldByFieldElementComparator() + .containsExactlyInAnyOrderElementsOf(expectedCache); + } + } } diff --git a/core/store/src/test/java/uk/gov/gchq/gaffer/store/operation/handler/function/FilterHandlerTest.java b/core/store/src/test/java/uk/gov/gchq/gaffer/store/operation/handler/function/FilterHandlerTest.java index 34b6517e320..abd6a09905b 100644 --- a/core/store/src/test/java/uk/gov/gchq/gaffer/store/operation/handler/function/FilterHandlerTest.java +++ b/core/store/src/test/java/uk/gov/gchq/gaffer/store/operation/handler/function/FilterHandlerTest.java @@ -707,7 +707,7 @@ public void shouldFilterBasedOnMatchedVertex() throws OperationException { final Iterable results = handler.doOperation(filter, context, store); // Then - ElementUtil.assertElementEquals( + ElementUtil.assertElementEqualsIncludingMatchedVertex( Arrays.asList(new Edge.Builder() .group(TestGroups.EDGE) .source("srcVal1") @@ -718,7 +718,7 @@ public void shouldFilterBasedOnMatchedVertex() throws OperationException { .group(TestGroups.EDGE) .source("srcVal3") .dest("destVal3") - .matchedVertex(EdgeId.MatchedVertex.SOURCE) + .matchedVertex(EdgeId.MatchedVertex.DESTINATION) .build()), results); } @@ -774,7 +774,7 @@ public void shouldFilterBasedOnAdjacentMatchedVertex() throws OperationException final Iterable results = handler.doOperation(filter, context, store); // Then - ElementUtil.assertElementEquals( + ElementUtil.assertElementEqualsIncludingMatchedVertex( Arrays.asList(new Edge.Builder() .group(TestGroups.EDGE) .source("srcVal1") @@ -785,7 +785,7 @@ public void shouldFilterBasedOnAdjacentMatchedVertex() throws OperationException .group(TestGroups.EDGE) .source("srcVal3") .dest("destVal3") - .matchedVertex(EdgeId.MatchedVertex.SOURCE) + .matchedVertex(EdgeId.MatchedVertex.DESTINATION) .build()), results); } diff --git a/core/store/src/test/java/uk/gov/gchq/gaffer/store/operation/handler/function/TransformHandlerTest.java b/core/store/src/test/java/uk/gov/gchq/gaffer/store/operation/handler/function/TransformHandlerTest.java index ce841c4e1b8..ab01ce4d46b 100644 --- a/core/store/src/test/java/uk/gov/gchq/gaffer/store/operation/handler/function/TransformHandlerTest.java +++ b/core/store/src/test/java/uk/gov/gchq/gaffer/store/operation/handler/function/TransformHandlerTest.java @@ -470,7 +470,7 @@ public void shouldSelectMatchedVertexForTransform() throws OperationException { .matchedVertex(EdgeId.MatchedVertex.SOURCE) .property(TestPropertyNames.PROP_3, "srcVal") .build(); - ElementUtil.assertElementEquals(Collections.singletonList(expectedEdge), results); + ElementUtil.assertElementEqualsIncludingMatchedVertex(Collections.singletonList(expectedEdge), results); } @Test @@ -505,6 +505,6 @@ public void shouldSelectAdjacentMatchedVertexForTransform() throws OperationExce .matchedVertex(EdgeId.MatchedVertex.SOURCE) .property(TestPropertyNames.PROP_3, "destVal") .build(); - ElementUtil.assertElementEquals(Collections.singletonList(expectedEdge), results); + ElementUtil.assertElementEqualsIncludingMatchedVertex(Collections.singletonList(expectedEdge), results); } } diff --git a/core/store/src/test/java/uk/gov/gchq/gaffer/store/util/AggregatorUtilTest.java b/core/store/src/test/java/uk/gov/gchq/gaffer/store/util/AggregatorUtilTest.java index 6d2e79b8a9d..4662ae387b7 100644 --- a/core/store/src/test/java/uk/gov/gchq/gaffer/store/util/AggregatorUtilTest.java +++ b/core/store/src/test/java/uk/gov/gchq/gaffer/store/util/AggregatorUtilTest.java @@ -55,6 +55,8 @@ import static org.assertj.core.api.Assertions.assertThatExceptionOfType; import static org.assertj.core.api.Assertions.assertThatIllegalArgumentException; import static uk.gov.gchq.gaffer.data.util.ElementUtil.assertElementEquals; +import static uk.gov.gchq.gaffer.data.util.ElementUtil.assertElementEqualsIncludingMatchedVertex; + public class AggregatorUtilTest { @Test @@ -1007,7 +1009,7 @@ public void shouldQueryAggregateDirectedEdgesIncludingMatchedVertexGroupBy() { final Iterable aggregatedElementsIncludingMatchedVertex = AggregatorUtil.queryAggregate(elements, schema, view, true); // then - assertElementEquals(expectedIncludingMatchedVertex, aggregatedElementsIncludingMatchedVertex); + assertElementEqualsIncludingMatchedVertex(expectedIncludingMatchedVertex, aggregatedElementsIncludingMatchedVertex); } @Test diff --git a/integration-test/src/test/java/uk/gov/gchq/gaffer/integration/impl/GeneratorsIT.java b/integration-test/src/test/java/uk/gov/gchq/gaffer/integration/impl/GeneratorsIT.java index 3163a3db4eb..276f0c9c3c6 100644 --- a/integration-test/src/test/java/uk/gov/gchq/gaffer/integration/impl/GeneratorsIT.java +++ b/integration-test/src/test/java/uk/gov/gchq/gaffer/integration/impl/GeneratorsIT.java @@ -88,7 +88,7 @@ public void shouldConvertFromDomainObjects() throws OperationException { .first(new GenerateElements.Builder() .generator(new BasicElementGenerator()) .input(new EntityDomainObject(NEW_VERTEX, "1", null), - new EdgeDomainObject(NEW_SOURCE, NEW_DEST, false, 1, 1L)) + new EdgeDomainObject(NEW_SOURCE, NEW_DEST, true, 1, 1L)) .build()) .then(new AddElements()) .build(); @@ -98,15 +98,15 @@ public void shouldConvertFromDomainObjects() throws OperationException { // Then - check they were added correctly final List results = Lists.newArrayList(graph.execute(new GetElements.Builder() - .input(new EntitySeed(NEW_VERTEX), new EdgeSeed(NEW_SOURCE, NEW_DEST, false)) + .input(new EntitySeed(NEW_VERTEX), new EdgeSeed(NEW_SOURCE, NEW_DEST, true)) .build(), getUser())); final Edge expectedEdge = new Edge.Builder() .group(TestGroups.EDGE) .source(NEW_SOURCE) .dest(NEW_DEST) - .directed(false) - .matchedVertex(EdgeId.MatchedVertex.DESTINATION) + .directed(true) + .matchedVertex(EdgeId.MatchedVertex.SOURCE) .build(); expectedEdge.putProperty(TestPropertyNames.INT, 1); expectedEdge.putProperty(TestPropertyNames.COUNT, 1L); @@ -114,6 +114,6 @@ public void shouldConvertFromDomainObjects() throws OperationException { final Entity expectedEntity = new Entity(TestGroups.ENTITY, NEW_VERTEX); expectedEntity.putProperty(TestPropertyNames.SET, CollectionUtil.treeSet("1")); - ElementUtil.assertElementEquals(Arrays.asList(expectedEntity, expectedEdge), results); + ElementUtil.assertElementEqualsIncludingMatchedVertex(Arrays.asList(expectedEntity, expectedEdge), results); } } diff --git a/integration-test/src/test/java/uk/gov/gchq/gaffer/integration/impl/GetElementsIT.java b/integration-test/src/test/java/uk/gov/gchq/gaffer/integration/impl/GetElementsIT.java index be0e1ec8b89..29212a3a176 100644 --- a/integration-test/src/test/java/uk/gov/gchq/gaffer/integration/impl/GetElementsIT.java +++ b/integration-test/src/test/java/uk/gov/gchq/gaffer/integration/impl/GetElementsIT.java @@ -193,7 +193,7 @@ public void shouldGetAllEdgesWhenFlagSet() throws Exception { final Iterable resultsIncludingAllEdges = graph.execute(opIncludingAllEdges, user); // Then - ElementUtil.assertElementEquals(Arrays.asList( + ElementUtil.assertElementEqualsIncludingMatchedVertex(Arrays.asList( new Edge.Builder() .group(TestGroups.EDGE) .source(SOURCE_1) @@ -238,7 +238,7 @@ public void shouldGetAllEntitiesWhenFlagSet() throws OperationException { final Iterable resultsExcludingAllEntities = graph.execute(opExcludingAllEntities, user); // Then - ElementUtil.assertElementEquals(Arrays.asList( + ElementUtil.assertElementEqualsIncludingMatchedVertex(Arrays.asList( new Edge.Builder() .group(TestGroups.EDGE) .source(SOURCE_1) @@ -297,7 +297,7 @@ public void shouldGetElementsWithMatchedVertex() throws Exception { final Iterable results = graph.execute(op, user); // Then - ElementUtil.assertElementEquals(Arrays.asList( + ElementUtil.assertElementEqualsIncludingMatchedVertex(Arrays.asList( new Edge.Builder() .group(TestGroups.EDGE) .source(SOURCE_DIR_1) @@ -350,7 +350,7 @@ public void shouldGetElementsWithMatchedVertexFilter() throws Exception { final Iterable results = graph.execute(op, user); // Then - ElementUtil.assertElementEquals(Arrays.asList( + ElementUtil.assertElementEqualsIncludingMatchedVertex(Arrays.asList( new Edge.Builder() .group(TestGroups.EDGE) .source(SOURCE_DIR_1) @@ -652,8 +652,13 @@ private void shouldGetElements(final Collection expectedElements, final Iterable resultsElement = graph.execute(opElement, user); // Then - ElementUtil.assertElementEquals(expectedElements, resultsSeed, true); - ElementUtil.assertElementEquals(expectedElements, resultsElement, true); + if (includeEdges && inOutType == IncludeIncomingOutgoingType.INCOMING) { + ElementUtil.assertElementEquals(expectedElements, resultsSeed, true); + ElementUtil.assertElementEquals(expectedElements, resultsElement, true); + } else { + ElementUtil.assertElementEqualsIncludingMatchedVertex(expectedElements, resultsSeed, true); + ElementUtil.assertElementEqualsIncludingMatchedVertex(expectedElements, resultsElement, true); + } } private static Collection getElements(final Collection seeds, final Boolean direction) { diff --git a/integration-test/src/test/java/uk/gov/gchq/gaffer/integration/impl/SchemaMigrationIT.java b/integration-test/src/test/java/uk/gov/gchq/gaffer/integration/impl/SchemaMigrationIT.java index 7f605804e6c..34c0ae94910 100644 --- a/integration-test/src/test/java/uk/gov/gchq/gaffer/integration/impl/SchemaMigrationIT.java +++ b/integration-test/src/test/java/uk/gov/gchq/gaffer/integration/impl/SchemaMigrationIT.java @@ -517,7 +517,7 @@ public void shouldCorrectlyApplyPostAggFiltering() throws OperationException { new User()); // Then - ElementUtil.assertElementEquals( + ElementUtil.assertElementEqualsIncludingMatchedVertex( Arrays.asList( EDGE_OLD_AGGREGATION_ALT_COUNT_MIGRATED_TO_NEW ), @@ -557,7 +557,7 @@ public void shouldApplyPostOpAggregation() throws OperationException { new User()); // Then - ElementUtil.assertElementEquals( + ElementUtil.assertElementEqualsIncludingMatchedVertex( Arrays.asList( EDGE_NEW_POST_OP_AGGREGATION_AGGREGATED ), diff --git a/store-implementation/accumulo-store/src/main/java/uk/gov/gchq/gaffer/accumulostore/retriever/impl/AccumuloElementsRetriever.java b/store-implementation/accumulo-store/src/main/java/uk/gov/gchq/gaffer/accumulostore/retriever/impl/AccumuloElementsRetriever.java index c55bf2c74df..3a85282e9f5 100644 --- a/store-implementation/accumulo-store/src/main/java/uk/gov/gchq/gaffer/accumulostore/retriever/impl/AccumuloElementsRetriever.java +++ b/store-implementation/accumulo-store/src/main/java/uk/gov/gchq/gaffer/accumulostore/retriever/impl/AccumuloElementsRetriever.java @@ -18,7 +18,7 @@ import uk.gov.gchq.gaffer.accumulostore.AccumuloStore; import uk.gov.gchq.gaffer.accumulostore.key.exception.IteratorSettingException; -import uk.gov.gchq.gaffer.data.element.id.EdgeId; +import uk.gov.gchq.gaffer.data.element.id.EntityId; import uk.gov.gchq.gaffer.operation.impl.get.GetElements; import uk.gov.gchq.gaffer.store.StoreException; import uk.gov.gchq.gaffer.user.User; @@ -31,8 +31,8 @@ public AccumuloElementsRetriever(final AccumuloStore store, final User user) throws IteratorSettingException, StoreException { super(store, operation, user, - // includeMatchedVertex if input only contains EntityIds - StreamSupport.stream(operation.getInput().spliterator(), false).noneMatch(input -> EdgeId.class.isInstance(input)), + // includeMatchedVertex if any input are EntityIds + StreamSupport.stream(operation.getInput().spliterator(), false).anyMatch(EntityId.class::isInstance), store.getKeyPackage().getIteratorFactory().getElementPreAggregationFilterIteratorSetting(operation.getView(), store), store.getKeyPackage().getIteratorFactory().getElementPostAggregationFilterIteratorSetting(operation.getView(), store), store.getKeyPackage().getIteratorFactory().getEdgeEntityDirectionFilterIteratorSetting(operation), diff --git a/store-implementation/accumulo-store/src/test/java/uk/gov/gchq/gaffer/accumulostore/key/AbstractAccumuloElementConverterTest.java b/store-implementation/accumulo-store/src/test/java/uk/gov/gchq/gaffer/accumulostore/key/AbstractAccumuloElementConverterTest.java index 40e2f0fc14e..e7286c1de4c 100644 --- a/store-implementation/accumulo-store/src/test/java/uk/gov/gchq/gaffer/accumulostore/key/AbstractAccumuloElementConverterTest.java +++ b/store-implementation/accumulo-store/src/test/java/uk/gov/gchq/gaffer/accumulostore/key/AbstractAccumuloElementConverterTest.java @@ -479,7 +479,7 @@ public void shouldThrowExceptionWhenGetPropertiesFromTimestampWhenGroupIsNotFoun @Test public void shouldSerialiseAndDeserialisePropertiesWhenAllAreEmpty() { - // Given
 + // Given final Schema schema = new Schema.Builder() .entity(TestGroups.ENTITY, new SchemaEntityDefinition.Builder() .vertex("string") @@ -503,7 +503,7 @@ public void shouldSerialiseAndDeserialisePropertiesWhenAllAreEmpty() { .property(TestPropertyNames.PROP_2, new FreqMap()) .build(); - // When 1
 + // When 1 final Value value = converter.getValueFromProperties(TestGroups.ENTITY, entity.getProperties()); // Then 1 @@ -519,7 +519,7 @@ public void shouldSerialiseAndDeserialisePropertiesWhenAllAreEmpty() { @Test public void shouldDeserialiseEntityId() { - // Given
 + // Given final EntityId expectedElementId = new EntitySeed("vertex1"); final Entity entity = new Entity.Builder() .vertex("vertex1") @@ -538,7 +538,7 @@ public void shouldDeserialiseEntityId() { @Test public void shouldDeserialiseEdgeId() { - // Given
 + // Given final EdgeId expectedElementId = new EdgeSeed("source1", "dest1", true); final Edge edge = new Edge.Builder() .source("source1") @@ -559,7 +559,7 @@ public void shouldDeserialiseEdgeId() { @Test public void shouldDeserialiseEdgeIdWithQueriedDestVertex() { - // Given
 + // Given final EdgeId expectedElementId = new EdgeSeed("vertex1", "vertex2", true, EdgeId.MatchedVertex.DESTINATION); final Edge edge = new Edge.Builder() .source("vertex1") @@ -581,7 +581,7 @@ public void shouldDeserialiseEdgeIdWithQueriedDestVertex() { @Test public void shouldDeserialiseEdgeIdWithQueriedSourceVertex() { - // Given
 + // Given final EdgeId expectedElementId = new EdgeSeed("source1", "dest1", true); final Edge edge = new Edge.Builder() .source("source1") diff --git a/store-implementation/accumulo-store/src/test/java/uk/gov/gchq/gaffer/accumulostore/key/core/AbstractCoreKeyAccumuloElementConverterTest.java b/store-implementation/accumulo-store/src/test/java/uk/gov/gchq/gaffer/accumulostore/key/core/AbstractCoreKeyAccumuloElementConverterTest.java index c7a74761f89..3871bd3222b 100644 --- a/store-implementation/accumulo-store/src/test/java/uk/gov/gchq/gaffer/accumulostore/key/core/AbstractCoreKeyAccumuloElementConverterTest.java +++ b/store-implementation/accumulo-store/src/test/java/uk/gov/gchq/gaffer/accumulostore/key/core/AbstractCoreKeyAccumuloElementConverterTest.java @@ -69,7 +69,7 @@ public void shouldReturnOverriddenSerialiseNull() throws Exception { @Test public void shouldDeserialiseSourceDestinationValuesCorrectWayRound() { - // Given
 + // Given final Edge edge = new Edge.Builder() .source("1") .dest("2") @@ -109,7 +109,7 @@ public void shouldDeserialiseSourceDestinationValuesIncorrectWayRound() { @Test public void shouldDeserialiseSourceDestinationValuesUndirected() { - // Given
 + // Given final Edge edge = new Edge.Builder() .source("1") .dest("2") diff --git a/store-implementation/federated-store/src/test/java/uk/gov/gchq/gaffer/federatedstore/FederatedStoreSchemaTest.java b/store-implementation/federated-store/src/test/java/uk/gov/gchq/gaffer/federatedstore/FederatedStoreSchemaTest.java index 622391a47c4..545c57d4644 100644 --- a/store-implementation/federated-store/src/test/java/uk/gov/gchq/gaffer/federatedstore/FederatedStoreSchemaTest.java +++ b/store-implementation/federated-store/src/test/java/uk/gov/gchq/gaffer/federatedstore/FederatedStoreSchemaTest.java @@ -57,6 +57,7 @@ import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatException; import static org.assertj.core.api.Assertions.assertThatExceptionOfType; +import static uk.gov.gchq.gaffer.data.util.ElementUtil.assertElementEqualsIncludingMatchedVertex; import static uk.gov.gchq.gaffer.federatedstore.FederatedStoreTestUtil.ACCUMULO_STORE_SINGLE_USE_PROPERTIES; import static uk.gov.gchq.gaffer.federatedstore.FederatedStoreTestUtil.DEST_BASIC; import static uk.gov.gchq.gaffer.federatedstore.FederatedStoreTestUtil.GRAPH_ID_A; @@ -177,6 +178,7 @@ public void shouldBeAbleToGetElementsWithOverlappingSchemasUsingDefaultMergeFunc .group(GROUP_BASIC_EDGE) .source(SOURCE_BASIC) .dest(DEST_BASIC) + .directed(true) .matchedVertex(EdgeId.MatchedVertex.SOURCE) .build()); // Graph a, element 2: prop2 missing @@ -184,6 +186,7 @@ public void shouldBeAbleToGetElementsWithOverlappingSchemasUsingDefaultMergeFunc .group(GROUP_BASIC_EDGE) .source(SOURCE_BASIC) .dest(DEST_2) + .directed(true) .matchedVertex(EdgeId.MatchedVertex.SOURCE) .build()); // Graph b, element 1: prop2 empty (see below) @@ -191,6 +194,7 @@ public void shouldBeAbleToGetElementsWithOverlappingSchemasUsingDefaultMergeFunc .group(GROUP_BASIC_EDGE) .source(SOURCE_BASIC) .dest(DEST_BASIC) + .directed(true) .matchedVertex(EdgeId.MatchedVertex.SOURCE) // Due to a string serialisation quirk, missing properties (null value) // are deserialised as empty strings @@ -201,13 +205,12 @@ public void shouldBeAbleToGetElementsWithOverlappingSchemasUsingDefaultMergeFunc .group(GROUP_BASIC_EDGE) .source(SOURCE_BASIC) .dest(DEST_2) + .directed(true) .matchedVertex(EdgeId.MatchedVertex.SOURCE) .property(PROPERTY_2, VALUE_2) .build()); - assertThat((Iterable) results) - .isNotNull() - .containsExactlyInAnyOrderElementsOf(expected); + assertElementEqualsIncludingMatchedVertex(expected, results); } @Test @@ -239,6 +242,7 @@ public void shouldBeAbleToGetElementsWithOverlappingSchemas() throws OperationEx .group(GROUP_BASIC_EDGE) .source(SOURCE_BASIC) .dest(DEST_BASIC) + .directed(true) .matchedVertex(EdgeId.MatchedVertex.SOURCE) // Due to a string serialisation quirk, missing properties (null value) // are deserialised as empty strings @@ -249,13 +253,12 @@ public void shouldBeAbleToGetElementsWithOverlappingSchemas() throws OperationEx .group(GROUP_BASIC_EDGE) .source(SOURCE_BASIC) .dest(DEST_2) + .directed(true) .matchedVertex(EdgeId.MatchedVertex.SOURCE) .property(PROPERTY_2, VALUE_2) .build()); - assertThat((Iterable) results) - .isNotNull() - .containsExactlyInAnyOrderElementsOf(expected); + assertElementEqualsIncludingMatchedVertex(expected, results); } @Test @@ -514,6 +517,7 @@ public void shouldBeAbleToIngestAggregateWithOverlappingSchemasUsingDefaultMerge .group(GROUP_BASIC_EDGE) .source(SOURCE_BASIC) .dest(DEST_BASIC) + .directed(true) .matchedVertex(EdgeId.MatchedVertex.SOURCE) .property(PROPERTY_1, "value1,value1") .build()); @@ -522,14 +526,13 @@ public void shouldBeAbleToIngestAggregateWithOverlappingSchemasUsingDefaultMerge .group(GROUP_BASIC_EDGE) .source(SOURCE_BASIC) .dest(DEST_BASIC) + .directed(true) .matchedVertex(EdgeId.MatchedVertex.SOURCE) .property(PROPERTY_1, "value1,value1") .property(PROPERTY_2, "value2,value2") .build()); - assertThat((Iterable) results) - .isNotNull() - .containsExactlyInAnyOrderElementsOf(expected); + assertElementEqualsIncludingMatchedVertex(expected, results); } @Test @@ -563,14 +566,13 @@ public void shouldBeAbleToIngestAggregateWithOverlappingSchemas() throws Operati .group(GROUP_BASIC_EDGE) .source(SOURCE_BASIC) .dest(DEST_BASIC) + .directed(true) .matchedVertex(EdgeId.MatchedVertex.SOURCE) .property(PROPERTY_1, "value1,value1,value1,value1") .property(PROPERTY_2, "value2,value2") .build()); - assertThat((Iterable) results) - .isNotNull() - .containsExactlyInAnyOrderElementsOf(expected); + assertElementEqualsIncludingMatchedVertex(expected, results); } @Test @@ -586,7 +588,7 @@ public void shouldBeAbleToIngestAggregateMissingPropertyWithOverlappingSchemasUs // When // getDefaultMergeFunction specified - behaves like pre 2.0 aggregation - final Iterable elements = (Iterable) federatedStore.execute(new FederatedOperation.Builder() + final Iterable results = (Iterable) federatedStore.execute(new FederatedOperation.Builder() .op(new GetElements.Builder() .input(new EntitySeed(SOURCE_BASIC)) .view(new View.Builder() @@ -602,6 +604,7 @@ public void shouldBeAbleToIngestAggregateMissingPropertyWithOverlappingSchemasUs .group(GROUP_BASIC_EDGE) .source(SOURCE_BASIC) .dest(DEST_BASIC) + .directed(true) .matchedVertex(EdgeId.MatchedVertex.SOURCE) .property(PROPERTY_1, "value1,value1") .build()); @@ -610,6 +613,7 @@ public void shouldBeAbleToIngestAggregateMissingPropertyWithOverlappingSchemasUs .group(GROUP_BASIC_EDGE) .source(SOURCE_BASIC) .dest(DEST_BASIC) + .directed(true) .matchedVertex(EdgeId.MatchedVertex.SOURCE) .property(PROPERTY_1, "value1,value1") // Due to a string serialisation quirk, missing properties (null value) @@ -617,9 +621,7 @@ public void shouldBeAbleToIngestAggregateMissingPropertyWithOverlappingSchemasUs .property(PROPERTY_2, ",") .build()); - assertThat((Iterable) elements) - .isNotNull() - .containsExactlyInAnyOrderElementsOf(expected); + assertElementEqualsIncludingMatchedVertex(expected, results); } @Test @@ -635,7 +637,7 @@ public void shouldBeAbleToIngestAggregateMissingPropertyWithOverlappingSchemas() // When // No merge function specified - ApplyViewToElementsFunction is used - final Iterable elements = federatedStore.execute(new GetElements.Builder() + final Iterable results = federatedStore.execute(new GetElements.Builder() .input(new EntitySeed(SOURCE_BASIC)) .view(new View.Builder() .edge(GROUP_BASIC_EDGE, new ViewElementDefinition.Builder().build()).build()) @@ -649,6 +651,7 @@ public void shouldBeAbleToIngestAggregateMissingPropertyWithOverlappingSchemas() .group(GROUP_BASIC_EDGE) .source(SOURCE_BASIC) .dest(DEST_BASIC) + .directed(true) .matchedVertex(EdgeId.MatchedVertex.SOURCE) .property(PROPERTY_1, "value1,value1,value1,value1") // Due to a string serialisation quirk, missing properties (null value) @@ -656,9 +659,7 @@ public void shouldBeAbleToIngestAggregateMissingPropertyWithOverlappingSchemas() .property(PROPERTY_2, ",") .build()); - assertThat((Iterable) elements) - .isNotNull() - .containsExactlyInAnyOrderElementsOf(expected); + assertElementEqualsIncludingMatchedVertex(expected, results); } @Test @@ -694,6 +695,7 @@ public void shouldBeAbleToViewPropertyWithOverlappingSchemasUsingDefaultMergeFun .group(GROUP_BASIC_EDGE) .source(SOURCE_BASIC) .dest(DEST_BASIC) + .directed(true) .matchedVertex(EdgeId.MatchedVertex.SOURCE) .build()); // Graph a, element 2: prop1 omitted, prop2 missing @@ -701,6 +703,7 @@ public void shouldBeAbleToViewPropertyWithOverlappingSchemasUsingDefaultMergeFun .group(GROUP_BASIC_EDGE) .source(SOURCE_BASIC) .dest(DEST_2) + .directed(true) .matchedVertex(EdgeId.MatchedVertex.SOURCE) .build()); // Graph b, element 1: prop1 omitted, prop2 present @@ -708,6 +711,7 @@ public void shouldBeAbleToViewPropertyWithOverlappingSchemasUsingDefaultMergeFun .group(GROUP_BASIC_EDGE) .source(SOURCE_BASIC) .dest(DEST_BASIC) + .directed(true) .matchedVertex(EdgeId.MatchedVertex.SOURCE) .property(PROPERTY_2, VALUE_2) .build()); @@ -716,13 +720,12 @@ public void shouldBeAbleToViewPropertyWithOverlappingSchemasUsingDefaultMergeFun .group(GROUP_BASIC_EDGE) .source(SOURCE_BASIC) .dest(DEST_2) + .directed(true) .matchedVertex(EdgeId.MatchedVertex.SOURCE) .property(PROPERTY_2, VALUE_2) .build()); - assertThat((Iterable) results) - .isNotNull() - .containsExactlyInAnyOrderElementsOf(expected); + assertElementEqualsIncludingMatchedVertex(expected, results); } @Test @@ -755,6 +758,7 @@ public void shouldBeAbleToViewPropertyWithOverlappingSchemas() throws OperationE .group(GROUP_BASIC_EDGE) .source(SOURCE_BASIC) .dest(DEST_BASIC) + .directed(true) .matchedVertex(EdgeId.MatchedVertex.SOURCE) .property(PROPERTY_2, VALUE_2) .build()); @@ -763,13 +767,12 @@ public void shouldBeAbleToViewPropertyWithOverlappingSchemas() throws OperationE .group(GROUP_BASIC_EDGE) .source(SOURCE_BASIC) .dest(DEST_2) + .directed(true) .matchedVertex(EdgeId.MatchedVertex.SOURCE) .property(PROPERTY_2, VALUE_2) .build()); - assertThat((Iterable) results) - .isNotNull() - .containsExactlyInAnyOrderElementsOf(expected); + assertElementEqualsIncludingMatchedVertex(expected, results); } @Test @@ -804,6 +807,7 @@ public void shouldBeAbleToFilterPropertyWithOverlappingSchemas() throws Operatio .group(GROUP_BASIC_EDGE) .source(SOURCE_BASIC) .dest(DEST_BASIC) + .directed(true) .matchedVertex(EdgeId.MatchedVertex.SOURCE) .property(PROPERTY_1, VALUE_1) .property(PROPERTY_2, VALUE_2) @@ -813,14 +817,13 @@ public void shouldBeAbleToFilterPropertyWithOverlappingSchemas() throws Operatio .group(GROUP_BASIC_EDGE) .source(SOURCE_BASIC) .dest(DEST_2) + .directed(true) .matchedVertex(EdgeId.MatchedVertex.SOURCE) .property(PROPERTY_1, VALUE_1) .property(PROPERTY_2, VALUE_2) .build()); - assertThat((Iterable) results) - .isNotNull() - .containsExactlyInAnyOrderElementsOf(expected); + assertElementEqualsIncludingMatchedVertex(expected, results); } @Test @@ -856,6 +859,7 @@ public void shouldBeAbleToQueryAggregatePropertyWithOverlappingSchemasUsingDefau .group(GROUP_BASIC_EDGE) .source(SOURCE_BASIC) .dest(DEST_BASIC) + .directed(true) .matchedVertex(EdgeId.MatchedVertex.SOURCE) .property(PROPERTY_1, VALUE_1) .build()); @@ -864,6 +868,7 @@ public void shouldBeAbleToQueryAggregatePropertyWithOverlappingSchemasUsingDefau .group(GROUP_BASIC_EDGE) .source(SOURCE_BASIC) .dest(DEST_2) + .directed(true) .matchedVertex(EdgeId.MatchedVertex.SOURCE) .property(PROPERTY_1, VALUE_1) .build()); @@ -872,6 +877,7 @@ public void shouldBeAbleToQueryAggregatePropertyWithOverlappingSchemasUsingDefau .group(GROUP_BASIC_EDGE) .source(SOURCE_BASIC) .dest(DEST_BASIC) + .directed(true) .matchedVertex(EdgeId.MatchedVertex.SOURCE) .property(PROPERTY_1, VALUE_1) .property(PROPERTY_2, VALUE_2) @@ -881,14 +887,13 @@ public void shouldBeAbleToQueryAggregatePropertyWithOverlappingSchemasUsingDefau .group(GROUP_BASIC_EDGE) .source(SOURCE_BASIC) .dest(DEST_2) + .directed(true) .matchedVertex(EdgeId.MatchedVertex.SOURCE) .property(PROPERTY_1, VALUE_1) .property(PROPERTY_2, VALUE_2) .build()); - assertThat((Iterable) results) - .isNotNull() - .containsExactlyInAnyOrderElementsOf(expected); + assertElementEqualsIncludingMatchedVertex(expected, results); } @Test @@ -921,6 +926,7 @@ public void shouldBeAbleToQueryAggregatePropertyWithOverlappingSchemas() throws .group(GROUP_BASIC_EDGE) .source(SOURCE_BASIC) .dest(DEST_BASIC) + .directed(true) .matchedVertex(EdgeId.MatchedVertex.SOURCE) .property(PROPERTY_1, "value1,value1") .property(PROPERTY_2, VALUE_2) @@ -930,14 +936,13 @@ public void shouldBeAbleToQueryAggregatePropertyWithOverlappingSchemas() throws .group(GROUP_BASIC_EDGE) .source(SOURCE_BASIC) .dest(DEST_2) + .directed(true) .matchedVertex(EdgeId.MatchedVertex.SOURCE) .property(PROPERTY_1, "value1,value1") .property(PROPERTY_2, VALUE_2) .build()); - assertThat((Iterable) results) - .isNotNull() - .containsExactlyInAnyOrderElementsOf(expected); + assertElementEqualsIncludingMatchedVertex(expected, results); } private void addGroupCollisionGraphs() throws OperationException { @@ -996,6 +1001,7 @@ private Edge edgeBasicWith(final String destination, final Integer... propertyVa .group(GROUP_BASIC_EDGE) .source(SOURCE_BASIC) .dest(destination) + .directed(true) .properties(Arrays.stream(propertyValues).collect(Collectors.toMap(FederatedStoreTestUtil::property, FederatedStoreTestUtil::value))).build(); } } From 4092add657eb742533b978f100914ac9a585e2b9 Mon Sep 17 00:00:00 2001 From: t92549 <80890692+t92549@users.noreply.github.com> Date: Fri, 8 Dec 2023 15:55:15 +0000 Subject: [PATCH 2/6] Spotless apply --- .../store/operation/handler/function/FilterHandlerTest.java | 3 ++- .../store/operation/handler/function/TransformHandlerTest.java | 3 ++- .../java/uk/gov/gchq/gaffer/store/util/AggregatorUtilTest.java | 2 +- .../retriever/impl/AccumuloElementsRetriever.java | 2 +- .../key/AbstractAccumuloElementConverterTest.java | 3 ++- .../key/core/AbstractCoreKeyAccumuloElementConverterTest.java | 3 ++- 6 files changed, 10 insertions(+), 6 deletions(-) diff --git a/core/store/src/test/java/uk/gov/gchq/gaffer/store/operation/handler/function/FilterHandlerTest.java b/core/store/src/test/java/uk/gov/gchq/gaffer/store/operation/handler/function/FilterHandlerTest.java index abd6a09905b..921314b8a93 100644 --- a/core/store/src/test/java/uk/gov/gchq/gaffer/store/operation/handler/function/FilterHandlerTest.java +++ b/core/store/src/test/java/uk/gov/gchq/gaffer/store/operation/handler/function/FilterHandlerTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2017-2021 Crown Copyright + * 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. @@ -13,6 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + package uk.gov.gchq.gaffer.store.operation.handler.function; import com.google.common.collect.Lists; diff --git a/core/store/src/test/java/uk/gov/gchq/gaffer/store/operation/handler/function/TransformHandlerTest.java b/core/store/src/test/java/uk/gov/gchq/gaffer/store/operation/handler/function/TransformHandlerTest.java index ab01ce4d46b..d7a1550ec6e 100644 --- a/core/store/src/test/java/uk/gov/gchq/gaffer/store/operation/handler/function/TransformHandlerTest.java +++ b/core/store/src/test/java/uk/gov/gchq/gaffer/store/operation/handler/function/TransformHandlerTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2017-2021 Crown Copyright + * 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. @@ -13,6 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + package uk.gov.gchq.gaffer.store.operation.handler.function; import com.google.common.collect.Lists; diff --git a/core/store/src/test/java/uk/gov/gchq/gaffer/store/util/AggregatorUtilTest.java b/core/store/src/test/java/uk/gov/gchq/gaffer/store/util/AggregatorUtilTest.java index 4662ae387b7..73f0a868771 100644 --- a/core/store/src/test/java/uk/gov/gchq/gaffer/store/util/AggregatorUtilTest.java +++ b/core/store/src/test/java/uk/gov/gchq/gaffer/store/util/AggregatorUtilTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2017-2021 Crown Copyright + * 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. diff --git a/store-implementation/accumulo-store/src/main/java/uk/gov/gchq/gaffer/accumulostore/retriever/impl/AccumuloElementsRetriever.java b/store-implementation/accumulo-store/src/main/java/uk/gov/gchq/gaffer/accumulostore/retriever/impl/AccumuloElementsRetriever.java index 3a85282e9f5..f683cd252be 100644 --- a/store-implementation/accumulo-store/src/main/java/uk/gov/gchq/gaffer/accumulostore/retriever/impl/AccumuloElementsRetriever.java +++ b/store-implementation/accumulo-store/src/main/java/uk/gov/gchq/gaffer/accumulostore/retriever/impl/AccumuloElementsRetriever.java @@ -1,5 +1,5 @@ /* - * Copyright 2016-2020 Crown Copyright + * Copyright 2016-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. diff --git a/store-implementation/accumulo-store/src/test/java/uk/gov/gchq/gaffer/accumulostore/key/AbstractAccumuloElementConverterTest.java b/store-implementation/accumulo-store/src/test/java/uk/gov/gchq/gaffer/accumulostore/key/AbstractAccumuloElementConverterTest.java index e7286c1de4c..d247ebb37b7 100644 --- a/store-implementation/accumulo-store/src/test/java/uk/gov/gchq/gaffer/accumulostore/key/AbstractAccumuloElementConverterTest.java +++ b/store-implementation/accumulo-store/src/test/java/uk/gov/gchq/gaffer/accumulostore/key/AbstractAccumuloElementConverterTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2016-2021 Crown Copyright + * Copyright 2016-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. @@ -13,6 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + package uk.gov.gchq.gaffer.accumulostore.key; import org.apache.accumulo.core.data.Key; diff --git a/store-implementation/accumulo-store/src/test/java/uk/gov/gchq/gaffer/accumulostore/key/core/AbstractCoreKeyAccumuloElementConverterTest.java b/store-implementation/accumulo-store/src/test/java/uk/gov/gchq/gaffer/accumulostore/key/core/AbstractCoreKeyAccumuloElementConverterTest.java index 3871bd3222b..18b8fd47fff 100644 --- a/store-implementation/accumulo-store/src/test/java/uk/gov/gchq/gaffer/accumulostore/key/core/AbstractCoreKeyAccumuloElementConverterTest.java +++ b/store-implementation/accumulo-store/src/test/java/uk/gov/gchq/gaffer/accumulostore/key/core/AbstractCoreKeyAccumuloElementConverterTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2017-2020 Crown Copyright + * 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. @@ -13,6 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + package uk.gov.gchq.gaffer.accumulostore.key.core; import com.google.common.primitives.Bytes; From c8acad4dbf86bfab88ea3ec64cb23fc4581fc574 Mon Sep 17 00:00:00 2001 From: t92549 <80890692+t92549@users.noreply.github.com> Date: Mon, 18 Dec 2023 13:24:57 +0000 Subject: [PATCH 3/6] Improve ElementUtil --- .../gov/gchq/gaffer/data/util/ElementUtil.java | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/core/data/src/test/java/uk/gov/gchq/gaffer/data/util/ElementUtil.java b/core/data/src/test/java/uk/gov/gchq/gaffer/data/util/ElementUtil.java index f8cd079b1fe..b34ca6310ed 100644 --- a/core/data/src/test/java/uk/gov/gchq/gaffer/data/util/ElementUtil.java +++ b/core/data/src/test/java/uk/gov/gchq/gaffer/data/util/ElementUtil.java @@ -35,12 +35,10 @@ public static void assertElementEquals(final Iterable expec } public static void assertElementEquals(final Iterable expected, final Iterable result, final boolean ignoreDuplicates) { - final List expectedCache = Lists.newArrayList(expected); - final List resultCache = Lists.newArrayList(result); if (ignoreDuplicates) { - assertThat(resultCache).hasSameElementsAs(expectedCache); + assertThat(result).asList().hasSameElementsAs(expected); } else { - assertThat(resultCache).containsExactlyInAnyOrderElementsOf(expectedCache); + assertThat(result).asList().containsExactlyInAnyOrderElementsOf(expected); } } @@ -49,16 +47,16 @@ public static void assertElementEqualsIncludingMatchedVertex(final Iterable expected, final Iterable result, final boolean ignoreDuplicates) { - final List expectedCache = Lists.newArrayList(expected); - final List resultCache = Lists.newArrayList(result); if (ignoreDuplicates) { - assertThat(resultCache) + assertThat(result) + .asList() .usingRecursiveFieldByFieldElementComparator() - .hasSameElementsAs(expectedCache); + .hasSameElementsAs(expected); } else { - assertThat(resultCache) + assertThat(result) + .asList() .usingRecursiveFieldByFieldElementComparator() - .containsExactlyInAnyOrderElementsOf(expectedCache); + .containsExactlyInAnyOrderElementsOf(expected); } } } From b1c3712897485fe3fa24b74f64b4b15bb731efb9 Mon Sep 17 00:00:00 2001 From: t92549 <80890692+t92549@users.noreply.github.com> Date: Mon, 18 Dec 2023 13:32:11 +0000 Subject: [PATCH 4/6] Revert "Improve ElementUtil" This reverts commit c8acad4dbf86bfab88ea3ec64cb23fc4581fc574. --- .../gov/gchq/gaffer/data/util/ElementUtil.java | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/core/data/src/test/java/uk/gov/gchq/gaffer/data/util/ElementUtil.java b/core/data/src/test/java/uk/gov/gchq/gaffer/data/util/ElementUtil.java index b34ca6310ed..f8cd079b1fe 100644 --- a/core/data/src/test/java/uk/gov/gchq/gaffer/data/util/ElementUtil.java +++ b/core/data/src/test/java/uk/gov/gchq/gaffer/data/util/ElementUtil.java @@ -35,10 +35,12 @@ public static void assertElementEquals(final Iterable expec } public static void assertElementEquals(final Iterable expected, final Iterable result, final boolean ignoreDuplicates) { + final List expectedCache = Lists.newArrayList(expected); + final List resultCache = Lists.newArrayList(result); if (ignoreDuplicates) { - assertThat(result).asList().hasSameElementsAs(expected); + assertThat(resultCache).hasSameElementsAs(expectedCache); } else { - assertThat(result).asList().containsExactlyInAnyOrderElementsOf(expected); + assertThat(resultCache).containsExactlyInAnyOrderElementsOf(expectedCache); } } @@ -47,16 +49,16 @@ public static void assertElementEqualsIncludingMatchedVertex(final Iterable expected, final Iterable result, final boolean ignoreDuplicates) { + final List expectedCache = Lists.newArrayList(expected); + final List resultCache = Lists.newArrayList(result); if (ignoreDuplicates) { - assertThat(result) - .asList() + assertThat(resultCache) .usingRecursiveFieldByFieldElementComparator() - .hasSameElementsAs(expected); + .hasSameElementsAs(expectedCache); } else { - assertThat(result) - .asList() + assertThat(resultCache) .usingRecursiveFieldByFieldElementComparator() - .containsExactlyInAnyOrderElementsOf(expected); + .containsExactlyInAnyOrderElementsOf(expectedCache); } } } From bbe7dcb455b1c46a1342ebed5e44330da33df28c Mon Sep 17 00:00:00 2001 From: t92549 <80890692+t92549@users.noreply.github.com> Date: Tue, 2 Jan 2024 14:24:54 +0000 Subject: [PATCH 5/6] Change ElementUtil to cast --- .../uk/gov/gchq/gaffer/data/util/ElementUtil.java | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/core/data/src/test/java/uk/gov/gchq/gaffer/data/util/ElementUtil.java b/core/data/src/test/java/uk/gov/gchq/gaffer/data/util/ElementUtil.java index f8cd079b1fe..d1d4dcf5a9a 100644 --- a/core/data/src/test/java/uk/gov/gchq/gaffer/data/util/ElementUtil.java +++ b/core/data/src/test/java/uk/gov/gchq/gaffer/data/util/ElementUtil.java @@ -48,17 +48,16 @@ public static void assertElementEqualsIncludingMatchedVertex(final Iterable expected, final Iterable result, final boolean ignoreDuplicates) { - final List expectedCache = Lists.newArrayList(expected); - final List resultCache = Lists.newArrayList(result); if (ignoreDuplicates) { - assertThat(resultCache) + assertThat((Iterable) result) .usingRecursiveFieldByFieldElementComparator() - .hasSameElementsAs(expectedCache); + .hasSameElementsAs((Iterable) expected); } else { - assertThat(resultCache) + assertThat((Iterable) result) .usingRecursiveFieldByFieldElementComparator() - .containsExactlyInAnyOrderElementsOf(expectedCache); + .containsExactlyInAnyOrderElementsOf((Iterable) expected); } } } From f01f1c1f56e1078ba88b8829708b6bd7ac83b72b Mon Sep 17 00:00:00 2001 From: t92549 <80890692+t92549@users.noreply.github.com> Date: Tue, 2 Jan 2024 14:32:15 +0000 Subject: [PATCH 6/6] Spotless apply --- .../src/test/java/uk/gov/gchq/gaffer/data/util/ElementUtil.java | 2 +- .../store/operation/handler/function/FilterHandlerTest.java | 2 +- .../store/operation/handler/function/TransformHandlerTest.java | 2 +- .../java/uk/gov/gchq/gaffer/store/util/AggregatorUtilTest.java | 2 +- .../java/uk/gov/gchq/gaffer/integration/impl/GeneratorsIT.java | 2 +- .../java/uk/gov/gchq/gaffer/integration/impl/GetElementsIT.java | 2 +- .../uk/gov/gchq/gaffer/integration/impl/SchemaMigrationIT.java | 2 +- .../accumulostore/retriever/impl/AccumuloElementsRetriever.java | 2 +- .../accumulostore/key/AbstractAccumuloElementConverterTest.java | 2 +- .../key/core/AbstractCoreKeyAccumuloElementConverterTest.java | 2 +- .../gchq/gaffer/federatedstore/FederatedStoreSchemaTest.java | 2 +- 11 files changed, 11 insertions(+), 11 deletions(-) diff --git a/core/data/src/test/java/uk/gov/gchq/gaffer/data/util/ElementUtil.java b/core/data/src/test/java/uk/gov/gchq/gaffer/data/util/ElementUtil.java index d1d4dcf5a9a..ca3aa50f800 100644 --- a/core/data/src/test/java/uk/gov/gchq/gaffer/data/util/ElementUtil.java +++ b/core/data/src/test/java/uk/gov/gchq/gaffer/data/util/ElementUtil.java @@ -1,5 +1,5 @@ /* - * Copyright 2016-2023 Crown Copyright + * Copyright 2016-2024 Crown Copyright * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/core/store/src/test/java/uk/gov/gchq/gaffer/store/operation/handler/function/FilterHandlerTest.java b/core/store/src/test/java/uk/gov/gchq/gaffer/store/operation/handler/function/FilterHandlerTest.java index 921314b8a93..1897ec10c8c 100644 --- a/core/store/src/test/java/uk/gov/gchq/gaffer/store/operation/handler/function/FilterHandlerTest.java +++ b/core/store/src/test/java/uk/gov/gchq/gaffer/store/operation/handler/function/FilterHandlerTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2017-2023 Crown Copyright + * Copyright 2017-2024 Crown Copyright * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/core/store/src/test/java/uk/gov/gchq/gaffer/store/operation/handler/function/TransformHandlerTest.java b/core/store/src/test/java/uk/gov/gchq/gaffer/store/operation/handler/function/TransformHandlerTest.java index d7a1550ec6e..c7e194f78d5 100644 --- a/core/store/src/test/java/uk/gov/gchq/gaffer/store/operation/handler/function/TransformHandlerTest.java +++ b/core/store/src/test/java/uk/gov/gchq/gaffer/store/operation/handler/function/TransformHandlerTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2017-2023 Crown Copyright + * Copyright 2017-2024 Crown Copyright * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/core/store/src/test/java/uk/gov/gchq/gaffer/store/util/AggregatorUtilTest.java b/core/store/src/test/java/uk/gov/gchq/gaffer/store/util/AggregatorUtilTest.java index 73f0a868771..dd2b2f4300a 100644 --- a/core/store/src/test/java/uk/gov/gchq/gaffer/store/util/AggregatorUtilTest.java +++ b/core/store/src/test/java/uk/gov/gchq/gaffer/store/util/AggregatorUtilTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2017-2023 Crown Copyright + * Copyright 2017-2024 Crown Copyright * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/integration-test/src/test/java/uk/gov/gchq/gaffer/integration/impl/GeneratorsIT.java b/integration-test/src/test/java/uk/gov/gchq/gaffer/integration/impl/GeneratorsIT.java index 276f0c9c3c6..eae8f49d0eb 100644 --- a/integration-test/src/test/java/uk/gov/gchq/gaffer/integration/impl/GeneratorsIT.java +++ b/integration-test/src/test/java/uk/gov/gchq/gaffer/integration/impl/GeneratorsIT.java @@ -1,5 +1,5 @@ /* - * Copyright 2016-2023 Crown Copyright + * Copyright 2016-2024 Crown Copyright * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/integration-test/src/test/java/uk/gov/gchq/gaffer/integration/impl/GetElementsIT.java b/integration-test/src/test/java/uk/gov/gchq/gaffer/integration/impl/GetElementsIT.java index 29212a3a176..403e3d52803 100644 --- a/integration-test/src/test/java/uk/gov/gchq/gaffer/integration/impl/GetElementsIT.java +++ b/integration-test/src/test/java/uk/gov/gchq/gaffer/integration/impl/GetElementsIT.java @@ -1,5 +1,5 @@ /* - * Copyright 2016-2023 Crown Copyright + * Copyright 2016-2024 Crown Copyright * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/integration-test/src/test/java/uk/gov/gchq/gaffer/integration/impl/SchemaMigrationIT.java b/integration-test/src/test/java/uk/gov/gchq/gaffer/integration/impl/SchemaMigrationIT.java index 34c0ae94910..87317eea6b1 100644 --- a/integration-test/src/test/java/uk/gov/gchq/gaffer/integration/impl/SchemaMigrationIT.java +++ b/integration-test/src/test/java/uk/gov/gchq/gaffer/integration/impl/SchemaMigrationIT.java @@ -1,5 +1,5 @@ /* - * Copyright 2018-2023 Crown Copyright + * Copyright 2018-2024 Crown Copyright * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/store-implementation/accumulo-store/src/main/java/uk/gov/gchq/gaffer/accumulostore/retriever/impl/AccumuloElementsRetriever.java b/store-implementation/accumulo-store/src/main/java/uk/gov/gchq/gaffer/accumulostore/retriever/impl/AccumuloElementsRetriever.java index f683cd252be..2d1cf1609ea 100644 --- a/store-implementation/accumulo-store/src/main/java/uk/gov/gchq/gaffer/accumulostore/retriever/impl/AccumuloElementsRetriever.java +++ b/store-implementation/accumulo-store/src/main/java/uk/gov/gchq/gaffer/accumulostore/retriever/impl/AccumuloElementsRetriever.java @@ -1,5 +1,5 @@ /* - * Copyright 2016-2023 Crown Copyright + * Copyright 2016-2024 Crown Copyright * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/store-implementation/accumulo-store/src/test/java/uk/gov/gchq/gaffer/accumulostore/key/AbstractAccumuloElementConverterTest.java b/store-implementation/accumulo-store/src/test/java/uk/gov/gchq/gaffer/accumulostore/key/AbstractAccumuloElementConverterTest.java index d247ebb37b7..5757a2c58cc 100644 --- a/store-implementation/accumulo-store/src/test/java/uk/gov/gchq/gaffer/accumulostore/key/AbstractAccumuloElementConverterTest.java +++ b/store-implementation/accumulo-store/src/test/java/uk/gov/gchq/gaffer/accumulostore/key/AbstractAccumuloElementConverterTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2016-2023 Crown Copyright + * Copyright 2016-2024 Crown Copyright * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/store-implementation/accumulo-store/src/test/java/uk/gov/gchq/gaffer/accumulostore/key/core/AbstractCoreKeyAccumuloElementConverterTest.java b/store-implementation/accumulo-store/src/test/java/uk/gov/gchq/gaffer/accumulostore/key/core/AbstractCoreKeyAccumuloElementConverterTest.java index 18b8fd47fff..4e5acb655c2 100644 --- a/store-implementation/accumulo-store/src/test/java/uk/gov/gchq/gaffer/accumulostore/key/core/AbstractCoreKeyAccumuloElementConverterTest.java +++ b/store-implementation/accumulo-store/src/test/java/uk/gov/gchq/gaffer/accumulostore/key/core/AbstractCoreKeyAccumuloElementConverterTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2017-2023 Crown Copyright + * Copyright 2017-2024 Crown Copyright * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/store-implementation/federated-store/src/test/java/uk/gov/gchq/gaffer/federatedstore/FederatedStoreSchemaTest.java b/store-implementation/federated-store/src/test/java/uk/gov/gchq/gaffer/federatedstore/FederatedStoreSchemaTest.java index 545c57d4644..55c4d9eb44e 100644 --- a/store-implementation/federated-store/src/test/java/uk/gov/gchq/gaffer/federatedstore/FederatedStoreSchemaTest.java +++ b/store-implementation/federated-store/src/test/java/uk/gov/gchq/gaffer/federatedstore/FederatedStoreSchemaTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2017-2023 Crown Copyright + * Copyright 2017-2024 Crown Copyright * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License.