Repository: gchq/Gaffer (java)

Issue:
Relocate code from main to test in integration-test
**Describe the bug**
In a previous PR the core part of the `integration-test` module code was relocated to `main` from `test`. However this code depends on imports which are still part of `test`. This causes problems with code highlighting in some IDEs and prevents the Javadoc from being generated correctly. This is because the javadoc plugin only compiles `main` code and not `test` code (behaviour which cannot be changed), causing some imports to not be found.

**To Reproduce**
Steps to reproduce the bug:
1. Run `javadoc:aggregate`

**Expected behavior**
There should be no conflicts or improper dependencies between code in `main` and `test`.

Pull request:
Gh-2942: Relocate code from main to test in integration-test
Due to rename, various file have copyright updated. This difficult to avoid.

# Related Issue

- Resolve #2942

Patch:
diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
index 33e9a5ed8e..4e7df5fcb8 100644
--- a/.github/workflows/release.yaml
+++ b/.github/workflows/release.yaml
@@ -157,7 +157,6 @@ jobs:
         git remote set-branches --add origin gh-pages
         git pull
         mvn -q clean install -Pquick -Dskip.jar-with-dependencies=true -Dshaded.jar.phase=true
-        rm -rf integration-test/src/main/*
         mvn -q javadoc:aggregate
         git checkout gh-pages
         rm -rf uk
diff --git a/integration-test/src/main/java/uk/gov/gchq/gaffer/integration/impl/loader/schemas/AggregationSchemaLoader.java b/integration-test/src/test/java/uk/gov/gchq/gaffer/integration/impl/loader/schemas/AggregationSchemaLoader.java
similarity index 100%
rename from integration-test/src/main/java/uk/gov/gchq/gaffer/integration/impl/loader/schemas/AggregationSchemaLoader.java
rename to integration-test/src/test/java/uk/gov/gchq/gaffer/integration/impl/loader/schemas/AggregationSchemaLoader.java
diff --git a/integration-test/src/main/java/uk/gov/gchq/gaffer/integration/impl/loader/schemas/BasicSchemaLoader.java b/integration-test/src/test/java/uk/gov/gchq/gaffer/integration/impl/loader/schemas/BasicSchemaLoader.java
similarity index 100%
rename from integration-test/src/main/java/uk/gov/gchq/gaffer/integration/impl/loader/schemas/BasicSchemaLoader.java
rename to integration-test/src/test/java/uk/gov/gchq/gaffer/integration/impl/loader/schemas/BasicSchemaLoader.java
diff --git a/integration-test/src/main/java/uk/gov/gchq/gaffer/integration/impl/loader/schemas/FullSchemaLoader.java b/integration-test/src/test/java/uk/gov/gchq/gaffer/integration/impl/loader/schemas/FullSchemaLoader.java
similarity index 100%
rename from integration-test/src/main/java/uk/gov/gchq/gaffer/integration/impl/loader/schemas/FullSchemaLoader.java
rename to integration-test/src/test/java/uk/gov/gchq/gaffer/integration/impl/loader/schemas/FullSchemaLoader.java
diff --git a/integration-test/src/main/java/uk/gov/gchq/gaffer/integration/impl/loader/schemas/SchemaLoader.java b/integration-test/src/test/java/uk/gov/gchq/gaffer/integration/impl/loader/schemas/SchemaLoader.java
similarity index 100%
rename from integration-test/src/main/java/uk/gov/gchq/gaffer/integration/impl/loader/schemas/SchemaLoader.java
rename to integration-test/src/test/java/uk/gov/gchq/gaffer/integration/impl/loader/schemas/SchemaLoader.java
diff --git a/integration-test/src/main/java/uk/gov/gchq/gaffer/integration/impl/loader/schemas/VisibilitySchemaLoader.java b/integration-test/src/test/java/uk/gov/gchq/gaffer/integration/impl/loader/schemas/VisibilitySchemaLoader.java
similarity index 100%
rename from integration-test/src/main/java/uk/gov/gchq/gaffer/integration/impl/loader/schemas/VisibilitySchemaLoader.java
rename to integration-test/src/test/java/uk/gov/gchq/gaffer/integration/impl/loader/schemas/VisibilitySchemaLoader.java
diff --git a/integration-test/src/main/resources/NeptuneEntitiesAndEdgesWithProperties.csv b/integration-test/src/test/resources/NeptuneEntitiesAndEdgesWithProperties.csv
similarity index 100%
rename from integration-test/src/main/resources/NeptuneEntitiesAndEdgesWithProperties.csv
rename to integration-test/src/test/resources/NeptuneEntitiesAndEdgesWithProperties.csv
diff --git a/integration-test/src/main/resources/getWalksWithPruningDeclaration.json b/integration-test/src/test/resources/getWalksWithPruningDeclaration.json
similarity index 100%
rename from integration-test/src/main/resources/getWalksWithPruningDeclaration.json
rename to integration-test/src/test/resources/getWalksWithPruningDeclaration.json
diff --git a/integration-test/src/main/resources/migrations.json b/integration-test/src/test/resources/migrations.json
similarity index 100%
rename from integration-test/src/main/resources/migrations.json
rename to integration-test/src/test/resources/migrations.json
diff --git a/library/hdfs-library/pom.xml b/library/hdfs-library/pom.xml
index c690125235..fe81432399 100644
--- a/library/hdfs-library/pom.xml
+++ b/library/hdfs-library/pom.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  ~ Copyright 2016-2022 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.
@@ -98,6 +98,7 @@
         <dependency>
             <groupId>uk.gov.gchq.gaffer</groupId>
             <artifactId>integration-test</artifactId>
+            <type>test-jar</type>
             <version>${project.parent.version}</version>
             <scope>test</scope>
         </dependency>
diff --git a/store-implementation/accumulo-store/README.md b/store-implementation/accumulo-store/README.md
index 29bb28f01e..d686c5443c 100644
--- a/store-implementation/accumulo-store/README.md
+++ b/store-implementation/accumulo-store/README.md
@@ -556,10 +556,10 @@ Ensure that when running an Accumulo instance, the user specified by the `accumu
 
 | Authorisation     | Required by |
 | ----------------- | ----------- |
-| vis1              | [VisibilityIT](../../integration-test/src/main/java/uk/gov/gchq/gaffer/integration/impl/VisibilityIT.java) |
-| vis2              | [VisibilityIT](../../integration-test/src/main/java/uk/gov/gchq/gaffer/integration/impl/VisibilityIT.java) |
+| vis1              | [VisibilityIT](../../integration-test/src/test/java/uk/gov/gchq/gaffer/integration/impl/VisibilityIT.java) |
+| vis2              | [VisibilityIT](../../integration-test/src/test/java/uk/gov/gchq/gaffer/integration/impl/VisibilityIT.java) |
 | public            | [SchemaHidingIT](../../core/graph/src/test/java/uk/gov/gchq/gaffer/integration/graph/SchemaHidingIT.java) |
-| private           | [ParameterizedLoaderIT](../../integration-test/src/main/java/uk/gov/gchq/gaffer/integration/impl/loader/ParameterizedLoaderIT.java#L63)
+| private           | [ParameterizedLoaderIT](../../integration-test/src/test/java/uk/gov/gchq/gaffer/integration/impl/loader/ParameterizedLoaderIT.java#L63)
 | publicVisibility  | [AccumuloAggregationIT](src/test/java/uk/gov/gchq/gaffer/accumulostore/integration/AccumuloAggregationIT.java) |
 | privateVisibility | [AccumuloAggregationIT](src/test/java/uk/gov/gchq/gaffer/accumulostore/integration/AccumuloAggregationIT.java) |
 
diff --git a/store-implementation/accumulo-store/pom.xml b/store-implementation/accumulo-store/pom.xml
index 65f0134452..0fc6d6d2f3 100644
--- a/store-implementation/accumulo-store/pom.xml
+++ b/store-implementation/accumulo-store/pom.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  ~ Copyright 2016-2022 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.
@@ -136,6 +136,13 @@
             <type>test-jar</type>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>uk.gov.gchq.gaffer</groupId>
+            <artifactId>integration-test</artifactId>
+            <version>${project.parent.version}</version>
+            <type>test-jar</type>
+            <scope>test</scope>
+        </dependency>
         <dependency>
             <groupId>uk.gov.gchq.gaffer</groupId>
             <artifactId>integration-test</artifactId>
diff --git a/store-implementation/federated-store/pom.xml b/store-implementation/federated-store/pom.xml
index 9a0358a179..64aef0ce4d 100644
--- a/store-implementation/federated-store/pom.xml
+++ b/store-implementation/federated-store/pom.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  ~ Copyright 2016-2022 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.
@@ -96,6 +96,13 @@
             <version>${project.parent.version}</version>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>uk.gov.gchq.gaffer</groupId>
+            <artifactId>integration-test</artifactId>
+            <version>${project.parent.version}</version>
+            <scope>test</scope>
+            <type>test-jar</type>
+        </dependency>
         <dependency>
             <groupId>uk.gov.gchq.gaffer</groupId>
             <artifactId>serialisation</artifactId>
diff --git a/store-implementation/map-store/pom.xml b/store-implementation/map-store/pom.xml
index 35fc31e998..396eb94656 100755
--- a/store-implementation/map-store/pom.xml
+++ b/store-implementation/map-store/pom.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  ~ Copyright 2016-2022 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.
@@ -95,6 +95,13 @@
             <type>test-jar</type>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>uk.gov.gchq.gaffer</groupId>
+            <artifactId>integration-test</artifactId>
+            <version>${project.parent.version}</version>
+            <type>test-jar</type>
+            <scope>test</scope>
+        </dependency>
         <dependency>
             <groupId>uk.gov.gchq.gaffer</groupId>
             <artifactId>integration-test</artifactId>
diff --git a/store-implementation/proxy-store/pom.xml b/store-implementation/proxy-store/pom.xml
index 2492fc5381..f73bc3b8d1 100644
--- a/store-implementation/proxy-store/pom.xml
+++ b/store-implementation/proxy-store/pom.xml
@@ -59,6 +59,13 @@
             <type>test-jar</type>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>uk.gov.gchq.gaffer</groupId>
+            <artifactId>integration-test</artifactId>
+            <version>${project.parent.version}</version>
+            <type>test-jar</type>
+            <scope>test</scope>
+        </dependency>
         <dependency>
             <groupId>uk.gov.gchq.gaffer</groupId>
             <artifactId>integration-test</artifactId>


Test patch:
diff --git a/integration-test/pom.xml b/integration-test/pom.xml
index 47604a6e6b..7830b7d0a9 100644
--- a/integration-test/pom.xml
+++ b/integration-test/pom.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  ~ Copyright 2016-2022 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.
@@ -26,6 +26,11 @@
 
     <artifactId>integration-test</artifactId>
 
+    <properties>
+        <!-- ITs are designed to be extended by other classes, cannot be run standalone -->
+        <skip.failsafe.tests>true</skip.failsafe.tests>
+    </properties>
+
     <dependencies>
         <!-- Gaffer dependencies -->
         <dependency>
diff --git a/integration-test/src/main/resources/log4j.xml b/integration-test/src/main/resources/log4j.xml
deleted file mode 100644
index 09ec9393c3..0000000000
--- a/integration-test/src/main/resources/log4j.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version='1.0' encoding='UTF-8' ?>
-<!--
-  ~ Copyright 2017-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.
-  -->
-
-<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
-<log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/"
-                     debug="false">
-    <appender name="console" class="org.apache.log4j.ConsoleAppender">
-        <layout class="org.apache.log4j.PatternLayout">
-            <param name="ConversionPattern" value="%c{3} %p %x - %m%n"/>
-        </layout>
-    </appender>
-    <root>
-        <priority value="warn" />
-        <appender-ref ref="console" />
-    </root>
-</log4j:configuration>
diff --git a/integration-test/src/main/java/uk/gov/gchq/gaffer/integration/AbstractStoreIT.java b/integration-test/src/test/java/uk/gov/gchq/gaffer/integration/AbstractStoreIT.java
similarity index 100%
rename from integration-test/src/main/java/uk/gov/gchq/gaffer/integration/AbstractStoreIT.java
rename to integration-test/src/test/java/uk/gov/gchq/gaffer/integration/AbstractStoreIT.java
diff --git a/integration-test/src/main/java/uk/gov/gchq/gaffer/integration/AbstractStoreITs.java b/integration-test/src/test/java/uk/gov/gchq/gaffer/integration/AbstractStoreITs.java
similarity index 97%
rename from integration-test/src/main/java/uk/gov/gchq/gaffer/integration/AbstractStoreITs.java
rename to integration-test/src/test/java/uk/gov/gchq/gaffer/integration/AbstractStoreITs.java
index 3074b0eaed..2b22e42c50 100644
--- a/integration-test/src/main/java/uk/gov/gchq/gaffer/integration/AbstractStoreITs.java
+++ b/integration-test/src/test/java/uk/gov/gchq/gaffer/integration/AbstractStoreITs.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2022 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/integration-test/src/main/java/uk/gov/gchq/gaffer/integration/StandaloneIT.java b/integration-test/src/test/java/uk/gov/gchq/gaffer/integration/StandaloneIT.java
similarity index 98%
rename from integration-test/src/main/java/uk/gov/gchq/gaffer/integration/StandaloneIT.java
rename to integration-test/src/test/java/uk/gov/gchq/gaffer/integration/StandaloneIT.java
index 116aa7e77d..92eb87f9f3 100644
--- a/integration-test/src/main/java/uk/gov/gchq/gaffer/integration/StandaloneIT.java
+++ b/integration-test/src/test/java/uk/gov/gchq/gaffer/integration/StandaloneIT.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2022 Crown Copyright
+ * Copyright 2018-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/integration-test/src/main/java/uk/gov/gchq/gaffer/integration/TraitRequirement.java b/integration-test/src/test/java/uk/gov/gchq/gaffer/integration/TraitRequirement.java
similarity index 96%
rename from integration-test/src/main/java/uk/gov/gchq/gaffer/integration/TraitRequirement.java
rename to integration-test/src/test/java/uk/gov/gchq/gaffer/integration/TraitRequirement.java
index 022a249dfa..9fcbce14e4 100644
--- a/integration-test/src/main/java/uk/gov/gchq/gaffer/integration/TraitRequirement.java
+++ b/integration-test/src/test/java/uk/gov/gchq/gaffer/integration/TraitRequirement.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2022 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/integration-test/src/main/java/uk/gov/gchq/gaffer/integration/VisibilityUser.java b/integration-test/src/test/java/uk/gov/gchq/gaffer/integration/VisibilityUser.java
similarity index 95%
rename from integration-test/src/main/java/uk/gov/gchq/gaffer/integration/VisibilityUser.java
rename to integration-test/src/test/java/uk/gov/gchq/gaffer/integration/VisibilityUser.java
index 2b97d22b8e..fd66546dd1 100644
--- a/integration-test/src/main/java/uk/gov/gchq/gaffer/integration/VisibilityUser.java
+++ b/integration-test/src/test/java/uk/gov/gchq/gaffer/integration/VisibilityUser.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2022 Crown Copyright
+ * Copyright 2018-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/integration-test/src/main/java/uk/gov/gchq/gaffer/integration/domain/DomainObject.java b/integration-test/src/test/java/uk/gov/gchq/gaffer/integration/domain/DomainObject.java
similarity index 96%
rename from integration-test/src/main/java/uk/gov/gchq/gaffer/integration/domain/DomainObject.java
rename to integration-test/src/test/java/uk/gov/gchq/gaffer/integration/domain/DomainObject.java
index 73ff64b708..4e1605df5c 100644
--- a/integration-test/src/main/java/uk/gov/gchq/gaffer/integration/domain/DomainObject.java
+++ b/integration-test/src/test/java/uk/gov/gchq/gaffer/integration/domain/DomainObject.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2022 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/integration-test/src/main/java/uk/gov/gchq/gaffer/integration/domain/EdgeDomainObject.java b/integration-test/src/test/java/uk/gov/gchq/gaffer/integration/domain/EdgeDomainObject.java
similarity index 100%
rename from integration-test/src/main/java/uk/gov/gchq/gaffer/integration/domain/EdgeDomainObject.java
rename to integration-test/src/test/java/uk/gov/gchq/gaffer/integration/domain/EdgeDomainObject.java
diff --git a/integration-test/src/main/java/uk/gov/gchq/gaffer/integration/domain/EntityDomainObject.java b/integration-test/src/test/java/uk/gov/gchq/gaffer/integration/domain/EntityDomainObject.java
similarity index 100%
rename from integration-test/src/main/java/uk/gov/gchq/gaffer/integration/domain/EntityDomainObject.java
rename to integration-test/src/test/java/uk/gov/gchq/gaffer/integration/domain/EntityDomainObject.java
diff --git a/integration-test/src/main/java/uk/gov/gchq/gaffer/integration/generators/BasicEdgeGenerator.java b/integration-test/src/test/java/uk/gov/gchq/gaffer/integration/generators/BasicEdgeGenerator.java
similarity index 98%
rename from integration-test/src/main/java/uk/gov/gchq/gaffer/integration/generators/BasicEdgeGenerator.java
rename to integration-test/src/test/java/uk/gov/gchq/gaffer/integration/generators/BasicEdgeGenerator.java
index 68cd729cc6..b13a43d08d 100644
--- a/integration-test/src/main/java/uk/gov/gchq/gaffer/integration/generators/BasicEdgeGenerator.java
+++ b/integration-test/src/test/java/uk/gov/gchq/gaffer/integration/generators/BasicEdgeGenerator.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2022 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/integration-test/src/main/java/uk/gov/gchq/gaffer/integration/generators/BasicElementGenerator.java b/integration-test/src/test/java/uk/gov/gchq/gaffer/integration/generators/BasicElementGenerator.java
similarity index 100%
rename from integration-test/src/main/java/uk/gov/gchq/gaffer/integration/generators/BasicElementGenerator.java
rename to integration-test/src/test/java/uk/gov/gchq/gaffer/integration/generators/BasicElementGenerator.java
diff --git a/integration-test/src/main/java/uk/gov/gchq/gaffer/integration/generators/BasicEntityGenerator.java b/integration-test/src/test/java/uk/gov/gchq/gaffer/integration/generators/BasicEntityGenerator.java
similarity index 98%
rename from integration-test/src/main/java/uk/gov/gchq/gaffer/integration/generators/BasicEntityGenerator.java
rename to integration-test/src/test/java/uk/gov/gchq/gaffer/integration/generators/BasicEntityGenerator.java
index 7a81be26bd..5767aca8eb 100644
--- a/integration-test/src/main/java/uk/gov/gchq/gaffer/integration/generators/BasicEntityGenerator.java
+++ b/integration-test/src/test/java/uk/gov/gchq/gaffer/integration/generators/BasicEntityGenerator.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2022 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/integration-test/src/main/java/uk/gov/gchq/gaffer/integration/generators/BasicObjectGenerator.java b/integration-test/src/test/java/uk/gov/gchq/gaffer/integration/generators/BasicObjectGenerator.java
similarity index 97%
rename from integration-test/src/main/java/uk/gov/gchq/gaffer/integration/generators/BasicObjectGenerator.java
rename to integration-test/src/test/java/uk/gov/gchq/gaffer/integration/generators/BasicObjectGenerator.java
index 111d4b605a..b53b442e6e 100644
--- a/integration-test/src/main/java/uk/gov/gchq/gaffer/integration/generators/BasicObjectGenerator.java
+++ b/integration-test/src/test/java/uk/gov/gchq/gaffer/integration/generators/BasicObjectGenerator.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2022 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/integration-test/src/main/java/uk/gov/gchq/gaffer/integration/generators/EdgeToObjectGenerator.java b/integration-test/src/test/java/uk/gov/gchq/gaffer/integration/generators/EdgeToObjectGenerator.java
similarity index 98%
rename from integration-test/src/main/java/uk/gov/gchq/gaffer/integration/generators/EdgeToObjectGenerator.java
rename to integration-test/src/test/java/uk/gov/gchq/gaffer/integration/generators/EdgeToObjectGenerator.java
index ca79891940..d5ffe28fc1 100644
--- a/integration-test/src/main/java/uk/gov/gchq/gaffer/integration/generators/EdgeToObjectGenerator.java
+++ b/integration-test/src/test/java/uk/gov/gchq/gaffer/integration/generators/EdgeToObjectGenerator.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2022 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/integration-test/src/main/java/uk/gov/gchq/gaffer/integration/generators/EntityToObjectGenerator.java b/integration-test/src/test/java/uk/gov/gchq/gaffer/integration/generators/EntityToObjectGenerator.java
similarity index 98%
rename from integration-test/src/main/java/uk/gov/gchq/gaffer/integration/generators/EntityToObjectGenerator.java
rename to integration-test/src/test/java/uk/gov/gchq/gaffer/integration/generators/EntityToObjectGenerator.java
index 0609303417..14b2e98583 100644
--- a/integration-test/src/main/java/uk/gov/gchq/gaffer/integration/generators/EntityToObjectGenerator.java
+++ b/integration-test/src/test/java/uk/gov/gchq/gaffer/integration/generators/EntityToObjectGenerator.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2022 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/integration-test/src/main/java/uk/gov/gchq/gaffer/integration/impl/AggregationIT.java b/integration-test/src/test/java/uk/gov/gchq/gaffer/integration/impl/AggregationIT.java
similarity index 99%
rename from integration-test/src/main/java/uk/gov/gchq/gaffer/integration/impl/AggregationIT.java
rename to integration-test/src/test/java/uk/gov/gchq/gaffer/integration/impl/AggregationIT.java
index f709a08a9b..9f4b10bc29 100644
--- a/integration-test/src/main/java/uk/gov/gchq/gaffer/integration/impl/AggregationIT.java
+++ b/integration-test/src/test/java/uk/gov/gchq/gaffer/integration/impl/AggregationIT.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2022 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/integration-test/src/main/java/uk/gov/gchq/gaffer/integration/impl/CountGroupsIT.java b/integration-test/src/test/java/uk/gov/gchq/gaffer/integration/impl/CountGroupsIT.java
similarity index 99%
rename from integration-test/src/main/java/uk/gov/gchq/gaffer/integration/impl/CountGroupsIT.java
rename to integration-test/src/test/java/uk/gov/gchq/gaffer/integration/impl/CountGroupsIT.java
index f34ea7a865..b103f1f090 100644
--- a/integration-test/src/main/java/uk/gov/gchq/gaffer/integration/impl/CountGroupsIT.java
+++ b/integration-test/src/test/java/uk/gov/gchq/gaffer/integration/impl/CountGroupsIT.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2022 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/integration-test/src/main/java/uk/gov/gchq/gaffer/integration/impl/ExportIT.java b/integration-test/src/test/java/uk/gov/gchq/gaffer/integration/impl/ExportIT.java
similarity index 99%
rename from integration-test/src/main/java/uk/gov/gchq/gaffer/integration/impl/ExportIT.java
rename to integration-test/src/test/java/uk/gov/gchq/gaffer/integration/impl/ExportIT.java
index c313ba5ad4..6cece32c59 100644
--- a/integration-test/src/main/java/uk/gov/gchq/gaffer/integration/impl/ExportIT.java
+++ b/integration-test/src/test/java/uk/gov/gchq/gaffer/integration/impl/ExportIT.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2022 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/integration-test/src/main/java/uk/gov/gchq/gaffer/integration/impl/FilteringIT.java b/integration-test/src/test/java/uk/gov/gchq/gaffer/integration/impl/FilteringIT.java
similarity index 99%
rename from integration-test/src/main/java/uk/gov/gchq/gaffer/integration/impl/FilteringIT.java
rename to integration-test/src/test/java/uk/gov/gchq/gaffer/integration/impl/FilteringIT.java
index 0f9834ab49..22971e0b2b 100644
--- a/integration-test/src/main/java/uk/gov/gchq/gaffer/integration/impl/FilteringIT.java
+++ b/integration-test/src/test/java/uk/gov/gchq/gaffer/integration/impl/FilteringIT.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2022 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/integration-test/src/main/java/uk/gov/gchq/gaffer/integration/impl/ForEachIT.java b/integration-test/src/test/java/uk/gov/gchq/gaffer/integration/impl/ForEachIT.java
similarity index 99%
rename from integration-test/src/main/java/uk/gov/gchq/gaffer/integration/impl/ForEachIT.java
rename to integration-test/src/test/java/uk/gov/gchq/gaffer/integration/impl/ForEachIT.java
index 50c9ca36b9..0808b33ce3 100644
--- a/integration-test/src/main/java/uk/gov/gchq/gaffer/integration/impl/ForEachIT.java
+++ b/integration-test/src/test/java/uk/gov/gchq/gaffer/integration/impl/ForEachIT.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2022 Crown Copyright
+ * Copyright 2018-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/integration-test/src/main/java/uk/gov/gchq/gaffer/integration/impl/GeneratorsIT.java b/integration-test/src/test/java/uk/gov/gchq/gaffer/integration/impl/GeneratorsIT.java
similarity index 99%
rename from integration-test/src/main/java/uk/gov/gchq/gaffer/integration/impl/GeneratorsIT.java
rename to integration-test/src/test/java/uk/gov/gchq/gaffer/integration/impl/GeneratorsIT.java
index c2ab12e3e4..3163a3db4e 100644
--- a/integration-test/src/main/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-2022 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/integration-test/src/main/java/uk/gov/gchq/gaffer/integration/impl/GetAdjacentIdsIT.java b/integration-test/src/test/java/uk/gov/gchq/gaffer/integration/impl/GetAdjacentIdsIT.java
similarity index 100%
rename from integration-test/src/main/java/uk/gov/gchq/gaffer/integration/impl/GetAdjacentIdsIT.java
rename to integration-test/src/test/java/uk/gov/gchq/gaffer/integration/impl/GetAdjacentIdsIT.java
diff --git a/integration-test/src/main/java/uk/gov/gchq/gaffer/integration/impl/GetAllElementsIT.java b/integration-test/src/test/java/uk/gov/gchq/gaffer/integration/impl/GetAllElementsIT.java
similarity index 99%
rename from integration-test/src/main/java/uk/gov/gchq/gaffer/integration/impl/GetAllElementsIT.java
rename to integration-test/src/test/java/uk/gov/gchq/gaffer/integration/impl/GetAllElementsIT.java
index 55d3efe29f..0953f57176 100644
--- a/integration-test/src/main/java/uk/gov/gchq/gaffer/integration/impl/GetAllElementsIT.java
+++ b/integration-test/src/test/java/uk/gov/gchq/gaffer/integration/impl/GetAllElementsIT.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2022 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/integration-test/src/main/java/uk/gov/gchq/gaffer/integration/impl/GetElementsIT.java b/integration-test/src/test/java/uk/gov/gchq/gaffer/integration/impl/GetElementsIT.java
similarity index 100%
rename from integration-test/src/main/java/uk/gov/gchq/gaffer/integration/impl/GetElementsIT.java
rename to integration-test/src/test/java/uk/gov/gchq/gaffer/integration/impl/GetElementsIT.java
diff --git a/integration-test/src/main/java/uk/gov/gchq/gaffer/integration/impl/GetWalksIT.java b/integration-test/src/test/java/uk/gov/gchq/gaffer/integration/impl/GetWalksIT.java
similarity index 100%
rename from integration-test/src/main/java/uk/gov/gchq/gaffer/integration/impl/GetWalksIT.java
rename to integration-test/src/test/java/uk/gov/gchq/gaffer/integration/impl/GetWalksIT.java
diff --git a/integration-test/src/main/java/uk/gov/gchq/gaffer/integration/impl/GraphHooksIT.java b/integration-test/src/test/java/uk/gov/gchq/gaffer/integration/impl/GraphHooksIT.java
similarity index 99%
rename from integration-test/src/main/java/uk/gov/gchq/gaffer/integration/impl/GraphHooksIT.java
rename to integration-test/src/test/java/uk/gov/gchq/gaffer/integration/impl/GraphHooksIT.java
index 26c7b68dfe..ac18ae9315 100644
--- a/integration-test/src/main/java/uk/gov/gchq/gaffer/integration/impl/GraphHooksIT.java
+++ b/integration-test/src/test/java/uk/gov/gchq/gaffer/integration/impl/GraphHooksIT.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2022 Crown Copyright
+ * Copyright 2018-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/integration-test/src/main/java/uk/gov/gchq/gaffer/integration/impl/IfIT.java b/integration-test/src/test/java/uk/gov/gchq/gaffer/integration/impl/IfIT.java
similarity index 99%
rename from integration-test/src/main/java/uk/gov/gchq/gaffer/integration/impl/IfIT.java
rename to integration-test/src/test/java/uk/gov/gchq/gaffer/integration/impl/IfIT.java
index 469ff7c43f..508be40285 100644
--- a/integration-test/src/main/java/uk/gov/gchq/gaffer/integration/impl/IfIT.java
+++ b/integration-test/src/test/java/uk/gov/gchq/gaffer/integration/impl/IfIT.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019-2022 Crown Copyright
+ * Copyright 2019-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/integration-test/src/main/java/uk/gov/gchq/gaffer/integration/impl/ImportExportCsvIT.java b/integration-test/src/test/java/uk/gov/gchq/gaffer/integration/impl/ImportExportCsvIT.java
similarity index 100%
rename from integration-test/src/main/java/uk/gov/gchq/gaffer/integration/impl/ImportExportCsvIT.java
rename to integration-test/src/test/java/uk/gov/gchq/gaffer/integration/impl/ImportExportCsvIT.java
diff --git a/integration-test/src/main/java/uk/gov/gchq/gaffer/integration/impl/JoinIT.java b/integration-test/src/test/java/uk/gov/gchq/gaffer/integration/impl/JoinIT.java
similarity index 100%
rename from integration-test/src/main/java/uk/gov/gchq/gaffer/integration/impl/JoinIT.java
rename to integration-test/src/test/java/uk/gov/gchq/gaffer/integration/impl/JoinIT.java
diff --git a/integration-test/src/main/java/uk/gov/gchq/gaffer/integration/impl/NoAggregationIT.java b/integration-test/src/test/java/uk/gov/gchq/gaffer/integration/impl/NoAggregationIT.java
similarity index 100%
rename from integration-test/src/main/java/uk/gov/gchq/gaffer/integration/impl/NoAggregationIT.java
rename to integration-test/src/test/java/uk/gov/gchq/gaffer/integration/impl/NoAggregationIT.java
diff --git a/integration-test/src/main/java/uk/gov/gchq/gaffer/integration/impl/PartAggregationIT.java b/integration-test/src/test/java/uk/gov/gchq/gaffer/integration/impl/PartAggregationIT.java
similarity index 99%
rename from integration-test/src/main/java/uk/gov/gchq/gaffer/integration/impl/PartAggregationIT.java
rename to integration-test/src/test/java/uk/gov/gchq/gaffer/integration/impl/PartAggregationIT.java
index c3c0e1987c..5691ad183a 100644
--- a/integration-test/src/main/java/uk/gov/gchq/gaffer/integration/impl/PartAggregationIT.java
+++ b/integration-test/src/test/java/uk/gov/gchq/gaffer/integration/impl/PartAggregationIT.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2022 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/integration-test/src/main/java/uk/gov/gchq/gaffer/integration/impl/SchemaMigrationIT.java b/integration-test/src/test/java/uk/gov/gchq/gaffer/integration/impl/SchemaMigrationIT.java
similarity index 100%
rename from integration-test/src/main/java/uk/gov/gchq/gaffer/integration/impl/SchemaMigrationIT.java
rename to integration-test/src/test/java/uk/gov/gchq/gaffer/integration/impl/SchemaMigrationIT.java
diff --git a/integration-test/src/main/java/uk/gov/gchq/gaffer/integration/impl/StoreValidationIT.java b/integration-test/src/test/java/uk/gov/gchq/gaffer/integration/impl/StoreValidationIT.java
similarity index 99%
rename from integration-test/src/main/java/uk/gov/gchq/gaffer/integration/impl/StoreValidationIT.java
rename to integration-test/src/test/java/uk/gov/gchq/gaffer/integration/impl/StoreValidationIT.java
index 8cd1a8b420..765a7af64b 100644
--- a/integration-test/src/main/java/uk/gov/gchq/gaffer/integration/impl/StoreValidationIT.java
+++ b/integration-test/src/test/java/uk/gov/gchq/gaffer/integration/impl/StoreValidationIT.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2022 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/integration-test/src/main/java/uk/gov/gchq/gaffer/integration/impl/TransformationIT.java b/integration-test/src/test/java/uk/gov/gchq/gaffer/integration/impl/TransformationIT.java
similarity index 99%
rename from integration-test/src/main/java/uk/gov/gchq/gaffer/integration/impl/TransformationIT.java
rename to integration-test/src/test/java/uk/gov/gchq/gaffer/integration/impl/TransformationIT.java
index ca6b000b60..ee14f77d53 100644
--- a/integration-test/src/main/java/uk/gov/gchq/gaffer/integration/impl/TransformationIT.java
+++ b/integration-test/src/test/java/uk/gov/gchq/gaffer/integration/impl/TransformationIT.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2022 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/integration-test/src/main/java/uk/gov/gchq/gaffer/integration/impl/VisibilityIT.java b/integration-test/src/test/java/uk/gov/gchq/gaffer/integration/impl/VisibilityIT.java
similarity index 99%
rename from integration-test/src/main/java/uk/gov/gchq/gaffer/integration/impl/VisibilityIT.java
rename to integration-test/src/test/java/uk/gov/gchq/gaffer/integration/impl/VisibilityIT.java
index a2a8bdbed0..bdb676343d 100644
--- a/integration-test/src/main/java/uk/gov/gchq/gaffer/integration/impl/VisibilityIT.java
+++ b/integration-test/src/test/java/uk/gov/gchq/gaffer/integration/impl/VisibilityIT.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2022 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/integration-test/src/main/java/uk/gov/gchq/gaffer/integration/impl/WhileIT.java b/integration-test/src/test/java/uk/gov/gchq/gaffer/integration/impl/WhileIT.java
similarity index 98%
rename from integration-test/src/main/java/uk/gov/gchq/gaffer/integration/impl/WhileIT.java
rename to integration-test/src/test/java/uk/gov/gchq/gaffer/integration/impl/WhileIT.java
index 3ce14408b3..d7fc73b24b 100644
--- a/integration-test/src/main/java/uk/gov/gchq/gaffer/integration/impl/WhileIT.java
+++ b/integration-test/src/test/java/uk/gov/gchq/gaffer/integration/impl/WhileIT.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2022 Crown Copyright
+ * Copyright 2018-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/integration-test/src/main/java/uk/gov/gchq/gaffer/integration/impl/loader/AbstractLoaderIT.java b/integration-test/src/test/java/uk/gov/gchq/gaffer/integration/impl/loader/AbstractLoaderIT.java
similarity index 100%
rename from integration-test/src/main/java/uk/gov/gchq/gaffer/integration/impl/loader/AbstractLoaderIT.java
rename to integration-test/src/test/java/uk/gov/gchq/gaffer/integration/impl/loader/AbstractLoaderIT.java
diff --git a/integration-test/src/main/java/uk/gov/gchq/gaffer/integration/impl/loader/AddElementsLoaderIT.java b/integration-test/src/test/java/uk/gov/gchq/gaffer/integration/impl/loader/AddElementsLoaderIT.java
similarity index 98%
rename from integration-test/src/main/java/uk/gov/gchq/gaffer/integration/impl/loader/AddElementsLoaderIT.java
rename to integration-test/src/test/java/uk/gov/gchq/gaffer/integration/impl/loader/AddElementsLoaderIT.java
index d04c600f70..22218bbedd 100644
--- a/integration-test/src/main/java/uk/gov/gchq/gaffer/integration/impl/loader/AddElementsLoaderIT.java
+++ b/integration-test/src/test/java/uk/gov/gchq/gaffer/integration/impl/loader/AddElementsLoaderIT.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2022 Crown Copyright
+ * Copyright 2018-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/integration-test/src/main/java/uk/gov/gchq/gaffer/integration/impl/loader/UserLoaderIT.java b/integration-test/src/test/java/uk/gov/gchq/gaffer/integration/impl/loader/UserLoaderIT.java
similarity index 98%
rename from integration-test/src/main/java/uk/gov/gchq/gaffer/integration/impl/loader/UserLoaderIT.java
rename to integration-test/src/test/java/uk/gov/gchq/gaffer/integration/impl/loader/UserLoaderIT.java
index 8a7d1076ac..6c5006a5e6 100644
--- a/integration-test/src/main/java/uk/gov/gchq/gaffer/integration/impl/loader/UserLoaderIT.java
+++ b/integration-test/src/test/java/uk/gov/gchq/gaffer/integration/impl/loader/UserLoaderIT.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 Crown Copyright
+ * Copyright 2022-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.