Skip to content

Commit 32bc9fe

Browse files
yuvalr1neoyuvalr1neo
authored
Merge pull request #8121 from knutwalker/2.4-rc-compat-3
Update RC compat
2 parents 59a2d2f + 756ae79 commit 32bc9fe

File tree

28 files changed

+255
-69
lines changed

28 files changed

+255
-69
lines changed

‎compatibility/4.4/neo4j-kernel-adapter/src/main/java/org/neo4j/gds/compat/_44/Neo4jProxyImpl.java

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -836,4 +836,21 @@ public Stream<UserFunctionSignature> getAllAggregatingFunctions() {
836836
}
837837
};
838838
}
839+
840+
private static final DependencyResolver EMPTY_DEPENDENCY_RESOLVER = new DependencyResolver.Adapter() {
841+
@Override
842+
public <T> T resolveDependency(Class<T> type, SelectionStrategy selector) {
843+
return null;
844+
}
845+
846+
@Override
847+
public boolean containsDependency(Class<?> type) {
848+
return false;
849+
}
850+
};
851+
852+
@Override
853+
public DependencyResolver emptyDependencyResolver() {
854+
return EMPTY_DEPENDENCY_RESOLVER;
855+
}
839856
}

‎compatibility/5.1/neo4j-kernel-adapter/src/main/java17/org/neo4j/gds/compat/_51/Neo4jProxyImpl.java

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -953,4 +953,21 @@ public Stream<UserFunctionSignature> getAllAggregatingFunctions() {
953953
}
954954
};
955955
}
956+
957+
private static final DependencyResolver EMPTY_DEPENDENCY_RESOLVER = new DependencyResolver.Adapter() {
958+
@Override
959+
public <T> T resolveDependency(Class<T> type, DependencyResolver.SelectionStrategy selector) {
960+
return null;
961+
}
962+
963+
@Override
964+
public boolean containsDependency(Class<?> type) {
965+
return false;
966+
}
967+
};
968+
969+
@Override
970+
public DependencyResolver emptyDependencyResolver() {
971+
return EMPTY_DEPENDENCY_RESOLVER;
972+
}
956973
}

‎compatibility/5.10/neo4j-kernel-adapter/src/main/java17/org/neo4j/gds/compat/_510/Neo4jProxyImpl.java

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -948,4 +948,21 @@ public Stream<UserFunctionSignature> getAllAggregatingFunctions() {
948948
}
949949
};
950950
}
951+
952+
private static final DependencyResolver EMPTY_DEPENDENCY_RESOLVER = new DependencyResolver.Adapter() {
953+
@Override
954+
public <T> T resolveDependency(Class<T> type, SelectionStrategy selector) {
955+
return null;
956+
}
957+
958+
@Override
959+
public boolean containsDependency(Class<?> type) {
960+
return false;
961+
}
962+
};
963+
964+
@Override
965+
public DependencyResolver emptyDependencyResolver() {
966+
return EMPTY_DEPENDENCY_RESOLVER;
967+
}
951968
}

‎compatibility/5.11/neo4j-kernel-adapter/src/main/java17/org/neo4j/gds/compat/_511/Neo4jProxyImpl.java

Lines changed: 26 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -649,7 +649,11 @@ public String versionLongToString(long storeVersion) {
649649
Bits bits = Bits.bitsFromLongs(new long[]{storeVersion});
650650
int length = bits.getShort(8);
651651
if (length == 0 || length > 7) {
652-
throw new IllegalArgumentException(format(Locale.ENGLISH, "The read version string length %d is not proper.", length));
652+
throw new IllegalArgumentException(format(
653+
Locale.ENGLISH,
654+
"The read version string length %d is not proper.",
655+
length
656+
));
653657
}
654658
char[] result = new char[length];
655659
for (int i = 0; i < length; i++) {
@@ -925,7 +929,10 @@ public boolean isCompositeDatabase(GraphDatabaseService databaseService) {
925929

926930
@Override
927931
public <T> T lookupComponentProvider(Context ctx, Class<T> component, boolean safe) throws ProcedureException {
928-
var globalProcedures = GraphDatabaseApiProxy.resolveDependency(ctx.dependencyResolver(), GlobalProcedures.class);
932+
var globalProcedures = GraphDatabaseApiProxy.resolveDependency(
933+
ctx.dependencyResolver(),
934+
GlobalProcedures.class
935+
);
929936
return globalProcedures.getCurrentView().lookupComponentProvider(component, safe).apply(ctx);
930937
}
931938

@@ -948,4 +955,21 @@ public Stream<UserFunctionSignature> getAllAggregatingFunctions() {
948955
}
949956
};
950957
}
958+
959+
private static final DependencyResolver EMPTY_DEPENDENCY_RESOLVER = new DependencyResolver.Adapter() {
960+
@Override
961+
public <T> T resolveDependency(Class<T> type, SelectionStrategy selector) {
962+
return null;
963+
}
964+
965+
@Override
966+
public boolean containsDependency(Class<?> type) {
967+
return false;
968+
}
969+
};
970+
971+
@Override
972+
public DependencyResolver emptyDependencyResolver() {
973+
return EMPTY_DEPENDENCY_RESOLVER;
974+
}
951975
}

‎compatibility/5.12/neo4j-kernel-adapter/src/main/java17/org/neo4j/gds/compat/_512/Neo4jProxyImpl.java

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -947,4 +947,21 @@ public Stream<UserFunctionSignature> getAllAggregatingFunctions() {
947947
}
948948
};
949949
}
950+
951+
private static final DependencyResolver EMPTY_DEPENDENCY_RESOLVER = new DependencyResolver() {
952+
@Override
953+
public <T> T resolveDependency(Class<T> type, SelectionStrategy selector) {
954+
return null;
955+
}
956+
957+
@Override
958+
public boolean containsDependency(Class<?> type) {
959+
return false;
960+
}
961+
};
962+
963+
@Override
964+
public DependencyResolver emptyDependencyResolver() {
965+
return EMPTY_DEPENDENCY_RESOLVER;
966+
}
950967
}

‎compatibility/5.2/neo4j-kernel-adapter/src/main/java17/org/neo4j/gds/compat/_52/Neo4jProxyImpl.java

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -951,4 +951,21 @@ public Stream<UserFunctionSignature> getAllAggregatingFunctions() {
951951
}
952952
};
953953
}
954+
955+
private static final DependencyResolver EMPTY_DEPENDENCY_RESOLVER = new DependencyResolver.Adapter() {
956+
@Override
957+
public <T> T resolveDependency(Class<T> type, DependencyResolver.SelectionStrategy selector) {
958+
return null;
959+
}
960+
961+
@Override
962+
public boolean containsDependency(Class<?> type) {
963+
return false;
964+
}
965+
};
966+
967+
@Override
968+
public DependencyResolver emptyDependencyResolver() {
969+
return EMPTY_DEPENDENCY_RESOLVER;
970+
}
954971
}

‎compatibility/5.3/neo4j-kernel-adapter/src/main/java17/org/neo4j/gds/compat/_53/Neo4jProxyImpl.java

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -952,4 +952,21 @@ public Stream<UserFunctionSignature> getAllAggregatingFunctions() {
952952
}
953953
};
954954
}
955+
956+
private static final DependencyResolver EMPTY_DEPENDENCY_RESOLVER = new DependencyResolver.Adapter() {
957+
@Override
958+
public <T> T resolveDependency(Class<T> type, DependencyResolver.SelectionStrategy selector) {
959+
return null;
960+
}
961+
962+
@Override
963+
public boolean containsDependency(Class<?> type) {
964+
return false;
965+
}
966+
};
967+
968+
@Override
969+
public DependencyResolver emptyDependencyResolver() {
970+
return EMPTY_DEPENDENCY_RESOLVER;
971+
}
955972
}

‎compatibility/5.4/neo4j-kernel-adapter/src/main/java17/org/neo4j/gds/compat/_54/Neo4jProxyImpl.java

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -951,4 +951,21 @@ public Stream<UserFunctionSignature> getAllAggregatingFunctions() {
951951
}
952952
};
953953
}
954+
955+
private static final DependencyResolver EMPTY_DEPENDENCY_RESOLVER = new DependencyResolver.Adapter() {
956+
@Override
957+
public <T> T resolveDependency(Class<T> type, DependencyResolver.SelectionStrategy selector) {
958+
return null;
959+
}
960+
961+
@Override
962+
public boolean containsDependency(Class<?> type) {
963+
return false;
964+
}
965+
};
966+
967+
@Override
968+
public DependencyResolver emptyDependencyResolver() {
969+
return EMPTY_DEPENDENCY_RESOLVER;
970+
}
954971
}

‎compatibility/5.5/neo4j-kernel-adapter/src/main/java17/org/neo4j/gds/compat/_55/Neo4jProxyImpl.java

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -952,4 +952,21 @@ public Stream<UserFunctionSignature> getAllAggregatingFunctions() {
952952
}
953953
};
954954
}
955+
956+
private static final DependencyResolver EMPTY_DEPENDENCY_RESOLVER = new DependencyResolver.Adapter() {
957+
@Override
958+
public <T> T resolveDependency(Class<T> type, DependencyResolver.SelectionStrategy selector) {
959+
return null;
960+
}
961+
962+
@Override
963+
public boolean containsDependency(Class<?> type) {
964+
return false;
965+
}
966+
};
967+
968+
@Override
969+
public DependencyResolver emptyDependencyResolver() {
970+
return EMPTY_DEPENDENCY_RESOLVER;
971+
}
955972
}

‎compatibility/5.6/neo4j-kernel-adapter/src/main/java17/org/neo4j/gds/compat/_56/Neo4jProxyImpl.java

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -952,4 +952,21 @@ public Stream<UserFunctionSignature> getAllAggregatingFunctions() {
952952
}
953953
};
954954
}
955+
956+
private static final DependencyResolver EMPTY_DEPENDENCY_RESOLVER = new DependencyResolver.Adapter() {
957+
@Override
958+
public <T> T resolveDependency(Class<T> type, SelectionStrategy selector) {
959+
return null;
960+
}
961+
962+
@Override
963+
public boolean containsDependency(Class<?> type) {
964+
return false;
965+
}
966+
};
967+
968+
@Override
969+
public DependencyResolver emptyDependencyResolver() {
970+
return EMPTY_DEPENDENCY_RESOLVER;
971+
}
955972
}

0 commit comments

Comments
 (0)