Remove 4.4.8-drop01.0 compat layer

s1ck · s1ck · commit f060dafd78aa · 2022-09-02T10:01:01.000+02:00
diff --git a/cypher/cypher-test/src/test/java/org/neo4j/gds/storageengine/InMemoryNodeCursorTest.java b/cypher/cypher-test/src/test/java/org/neo4j/gds/storageengine/InMemoryNodeCursorTest.java
@@ -64,7 +64,6 @@ protected GraphStore graphStore() {
 
     @Test
     @DisableForNeo4jVersion(Neo4jVersion.V_4_4_9_drop10)
-    @DisableForNeo4jVersion(Neo4jVersion.V_4_4_8_drop10)
     @DisableForNeo4jVersion(Neo4jVersion.V_5_0_drop60)
     @DisableForNeo4jVersion(Neo4jVersion.V_5_0_drop80)
     void shouldScanSingle() {
@@ -75,7 +74,6 @@ void shouldScanSingle() {
 
     @Test
     @DisableForNeo4jVersion(Neo4jVersion.V_4_4_9_drop10)
-    @DisableForNeo4jVersion(Neo4jVersion.V_4_4_8_drop10)
     @DisableForNeo4jVersion(Neo4jVersion.V_5_0_drop60)
     @DisableForNeo4jVersion(Neo4jVersion.V_5_0_drop80)
     void shouldScanRange() {
@@ -89,7 +87,6 @@ void shouldScanRange() {
 
     @Test
     @DisableForNeo4jVersion(Neo4jVersion.V_4_4_9_drop10)
-    @DisableForNeo4jVersion(Neo4jVersion.V_4_4_8_drop10)
     @DisableForNeo4jVersion(Neo4jVersion.V_5_0_drop60)
     @DisableForNeo4jVersion(Neo4jVersion.V_5_0_drop80)
     void shouldScanAll() {
@@ -104,7 +101,6 @@ void shouldScanAll() {
 
     @Test
     @DisableForNeo4jVersion(Neo4jVersion.V_4_4_9_drop10)
-    @DisableForNeo4jVersion(Neo4jVersion.V_4_4_8_drop10)
     @DisableForNeo4jVersion(Neo4jVersion.V_5_0_drop60)
     @DisableForNeo4jVersion(Neo4jVersion.V_5_0_drop80)
     void testLabels() {
@@ -130,7 +126,6 @@ void shouldHaveProperties43() {
     @Test
     @DisableForNeo4jVersion(Neo4jVersion.V_4_3)
     @DisableForNeo4jVersion(Neo4jVersion.V_4_4_9_drop10)
-    @DisableForNeo4jVersion(Neo4jVersion.V_4_4_8_drop10)
     @DisableForNeo4jVersion(Neo4jVersion.V_5_0_drop60)
     @DisableForNeo4jVersion(Neo4jVersion.V_5_0_drop80)
     void shouldHaveProperties() {
@@ -141,7 +136,6 @@ void shouldHaveProperties() {
 
     @Test
     @DisableForNeo4jVersion(Neo4jVersion.V_4_4_9_drop10)
-    @DisableForNeo4jVersion(Neo4jVersion.V_4_4_8_drop10)
     @DisableForNeo4jVersion(Neo4jVersion.V_5_0_drop60)
     @DisableForNeo4jVersion(Neo4jVersion.V_5_0_drop80)
     void shouldTraverseProperties() throws TokenNotFoundException {
diff --git a/cypher/cypher-test/src/test/java/org/neo4j/gds/storageengine/InMemoryRelationshipScanCursorTest.java b/cypher/cypher-test/src/test/java/org/neo4j/gds/storageengine/InMemoryRelationshipScanCursorTest.java
@@ -41,7 +41,6 @@
 import static org.assertj.core.api.Assertions.assertThat;
 
 @DisableForNeo4jVersion(Neo4jVersion.V_4_4_9_drop10)
-@DisableForNeo4jVersion(Neo4jVersion.V_4_4_8_drop10)
 @DisableForNeo4jVersion(Neo4jVersion.V_5_0_drop60)
 @DisableForNeo4jVersion(Neo4jVersion.V_5_0_drop80)
 public class InMemoryRelationshipScanCursorTest extends CypherTest {
diff --git a/cypher/cypher-test/src/test/java/org/neo4j/gds/storageengine/InMemoryRelationshipTraversalCursorTest.java b/cypher/cypher-test/src/test/java/org/neo4j/gds/storageengine/InMemoryRelationshipTraversalCursorTest.java
@@ -44,7 +44,6 @@
 import static org.assertj.core.api.Assertions.assertThat;
 
 @DisableForNeo4jVersion(Neo4jVersion.V_4_4_9_drop10)
-@DisableForNeo4jVersion(Neo4jVersion.V_4_4_8_drop10)
 @DisableForNeo4jVersion(Neo4jVersion.V_5_0_drop60)
 @DisableForNeo4jVersion(Neo4jVersion.V_5_0_drop80)
 class InMemoryRelationshipTraversalCursorTest extends CypherTest {
diff --git a/cypher/cypher-test/src/test/java/org/neo4j/internal/recordstorage/InMemoryStorageEngineTest.java b/cypher/cypher-test/src/test/java/org/neo4j/internal/recordstorage/InMemoryStorageEngineTest.java
@@ -35,7 +35,6 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-@DisableForNeo4jVersion(Neo4jVersion.V_4_4_8_drop10)
 @DisableForNeo4jVersion(Neo4jVersion.V_4_4_9_drop10)
 @DisableForNeo4jVersion(Neo4jVersion.V_5_0_drop60)
 @DisableForNeo4jVersion(Neo4jVersion.V_5_0_drop80)
diff --git a/cypher/unsupported/storage-engine-adapter/src/main/java/org/neo4j/gds/compat/unsupported/StorageEngineProxyFactoryImpl.java b/cypher/unsupported/storage-engine-adapter/src/main/java/org/neo4j/gds/compat/unsupported/StorageEngineProxyFactoryImpl.java
@@ -31,7 +31,6 @@
 public class StorageEngineProxyFactoryImpl implements StorageEngineProxyFactory {
 
     private static final Collection<Neo4jVersion> incompatibleVersions = EnumSet.of(
-        Neo4jVersion.V_4_4_8_drop10,
         Neo4jVersion.V_4_4_9_drop10,
         Neo4jVersion.V_5_0_drop60,
         Neo4jVersion.V_5_0_drop80
diff --git a/neo4j-adapter/src/main/java/org/neo4j/gds/compat/Neo4jVersion.java b/neo4j-adapter/src/main/java/org/neo4j/gds/compat/Neo4jVersion.java
@@ -28,7 +28,6 @@
 public enum Neo4jVersion {
     V_4_3,
     V_4_4,
-    V_4_4_8_drop10,
     V_4_4_9_drop10,
     V_4_4_10_drop10,
     V_5_0_drop60,
@@ -41,8 +40,6 @@ public String toString() {
                 return "4.3";
             case V_4_4:
                 return "4.4";
-            case V_4_4_8_drop10:
-                return "4.4.8-drop01.0";
             case V_4_4_9_drop10:
                 return "4.4.9-drop01.0";
             case V_4_4_10_drop10:
@@ -85,10 +82,6 @@ static String neo4jVersion() {
     }
 
     static Neo4jVersion parse(String version) {
-        if ("4.4.8-drop01.0".equals(version)) {
-            return Neo4jVersion.V_4_4_8_drop10;
-        }
-
         if ("4.4.9-drop01.0".equals(version)) {
             return Neo4jVersion.V_4_4_9_drop10;
         }
diff --git a/neo4j-adapter/src/test/java/org/neo4j/gds/compat/Neo4jVersionTest.java b/neo4j-adapter/src/test/java/org/neo4j/gds/compat/Neo4jVersionTest.java
@@ -37,7 +37,6 @@ class Neo4jVersionTest {
         "4.3.0, V_4_3",
         "4.4.0, V_4_4",
         "4.4.12, V_4_4",
-        "4.4.8-drop01.0, V_4_4_8_drop10",
         "4.4.9-drop01.0, V_4_4_9_drop10",
         "4.4.10-drop01.0, V_4_4_10_drop10",
         "5.0.0-drop06.0, V_5_0_drop60",
diff --git a/proc/catalog/src/test/java/org/neo4j/gds/catalog/GraphStoreExportProcTest.java b/proc/catalog/src/test/java/org/neo4j/gds/catalog/GraphStoreExportProcTest.java
@@ -92,7 +92,6 @@ void teardown() {
     }
 
     @DisableForNeo4jVersion(Neo4jVersion.V_4_3)
-    @DisableForNeo4jVersion(Neo4jVersion.V_4_4_8_drop10)
     @DisableForNeo4jVersion(Neo4jVersion.V_4_4_9_drop10)
     @DisableForNeo4jVersion(Neo4jVersion.V_4_4_10_drop10)
     @Test
@@ -113,7 +112,6 @@ void exportGraph() {
     }
 
     @DisableForNeo4jVersion(Neo4jVersion.V_4_3)
-    @DisableForNeo4jVersion(Neo4jVersion.V_4_4_8_drop10)
     @DisableForNeo4jVersion(Neo4jVersion.V_4_4_9_drop10)
     @DisableForNeo4jVersion(Neo4jVersion.V_4_4_10_drop10)
     @Test
@@ -142,7 +140,6 @@ void exportGraphWithAdditionalNodeProperties() {
     }
 
     @DisableForNeo4jVersion(Neo4jVersion.V_4_3)
-    @DisableForNeo4jVersion(Neo4jVersion.V_4_4_8_drop10)
     @DisableForNeo4jVersion(Neo4jVersion.V_4_4_9_drop10)
     @DisableForNeo4jVersion(Neo4jVersion.V_4_4_10_drop10)
     @Test
diff --git a/proc/sysinfo/src/test/java/org/neo4j/gds/SysInfoProcTest.java b/proc/sysinfo/src/test/java/org/neo4j/gds/SysInfoProcTest.java
@@ -55,7 +55,6 @@ class SysInfoProcTest extends BaseProcTest {
         "Neo4j Settings 5.0.0-drop08.0",
         "Neo4j 4.3",
         "Neo4j 4.4",
-        "Neo4j 4.4.8-drop01.0",
         "Neo4j 4.4.9-drop01.0",
         "Neo4j 4.4.10-drop01.0",
         "Neo4j 5.0.0-drop06.0 (placeholder)",
@@ -116,9 +115,6 @@ void testSysInfoProc() throws IOException {
             case V_4_4:
                 expectedCompatibilities = Set.of("Neo4j 4.4", "Neo4j Settings 4.x");
                 break;
-            case V_4_4_8_drop10:
-                expectedCompatibilities = Set.of("Neo4j 4.4.8-drop01.0", "Neo4j Settings 4.x");
-                break;
             case V_4_4_9_drop10:
                 expectedCompatibilities = Set.of("Neo4j 4.4.9-drop01.0", "Neo4j Settings 4.x");
                 break;

Original file line number	Diff line number	Diff line change
`@@ -92,7 +92,6 @@ void teardown() {`
`92`	`92`	`}`
`93`	`93`
`94`	`94`	`@DisableForNeo4jVersion(Neo4jVersion.V_4_3)`
`95`		`- @DisableForNeo4jVersion(Neo4jVersion.V_4_4_8_drop10)`
`96`	`95`	`@DisableForNeo4jVersion(Neo4jVersion.V_4_4_9_drop10)`
`97`	`96`	`@DisableForNeo4jVersion(Neo4jVersion.V_4_4_10_drop10)`
`98`	`97`	`@Test`
`@@ -113,7 +112,6 @@ void exportGraph() {`
`113`	`112`	`}`
`114`	`113`
`115`	`114`	`@DisableForNeo4jVersion(Neo4jVersion.V_4_3)`
`116`		`- @DisableForNeo4jVersion(Neo4jVersion.V_4_4_8_drop10)`
`117`	`115`	`@DisableForNeo4jVersion(Neo4jVersion.V_4_4_9_drop10)`
`118`	`116`	`@DisableForNeo4jVersion(Neo4jVersion.V_4_4_10_drop10)`
`119`	`117`	`@Test`
`@@ -142,7 +140,6 @@ void exportGraphWithAdditionalNodeProperties() {`
`142`	`140`	`}`
`143`	`141`
`144`	`142`	`@DisableForNeo4jVersion(Neo4jVersion.V_4_3)`
`145`		`- @DisableForNeo4jVersion(Neo4jVersion.V_4_4_8_drop10)`
`146`	`143`	`@DisableForNeo4jVersion(Neo4jVersion.V_4_4_9_drop10)`
`147`	`144`	`@DisableForNeo4jVersion(Neo4jVersion.V_4_4_10_drop10)`
`148`	`145`	`@Test`