Skip to content

Commit 24e90bb

Browse files
soerenreichardtMats-SX
authored and
knutwalker
committed
Use static empty dependency resolvers
Co-authored-by: Mats Rydberg <[email protected]>
1 parent ef00f14 commit 24e90bb

File tree

8 files changed

+113
-90
lines changed

8 files changed

+113
-90
lines changed

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

Lines changed: 13 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -837,18 +837,20 @@ public Stream<UserFunctionSignature> getAllAggregatingFunctions() {
837837
};
838838
}
839839

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+
840852
@Override
841853
public DependencyResolver emptyDependencyResolver() {
842-
return new DependencyResolver.Adapter() {
843-
@Override
844-
public <T> T resolveDependency(Class<T> type, SelectionStrategy selector) {
845-
return null;
846-
}
847-
848-
@Override
849-
public boolean containsDependency(Class<?> type) {
850-
return false;
851-
}
852-
};
854+
return EMPTY_DEPENDENCY_RESOLVER;
853855
}
854856
}

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

Lines changed: 13 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -949,18 +949,20 @@ public Stream<UserFunctionSignature> getAllAggregatingFunctions() {
949949
};
950950
}
951951

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+
952964
@Override
953965
public DependencyResolver emptyDependencyResolver() {
954-
return new DependencyResolver.Adapter() {
955-
@Override
956-
public <T> T resolveDependency(Class<T> type, SelectionStrategy selector) {
957-
return null;
958-
}
959-
960-
@Override
961-
public boolean containsDependency(Class<?> type) {
962-
return false;
963-
}
964-
};
966+
return EMPTY_DEPENDENCY_RESOLVER;
965967
}
966968
}

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

Lines changed: 22 additions & 13 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

@@ -949,18 +956,20 @@ public Stream<UserFunctionSignature> getAllAggregatingFunctions() {
949956
};
950957
}
951958

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+
952971
@Override
953972
public DependencyResolver emptyDependencyResolver() {
954-
return new DependencyResolver.Adapter() {
955-
@Override
956-
public <T> T resolveDependency(Class<T> type, SelectionStrategy selector) {
957-
return null;
958-
}
959-
960-
@Override
961-
public boolean containsDependency(Class<?> type) {
962-
return false;
963-
}
964-
};
973+
return EMPTY_DEPENDENCY_RESOLVER;
965974
}
966975
}

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

Lines changed: 13 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -948,18 +948,20 @@ public Stream<UserFunctionSignature> getAllAggregatingFunctions() {
948948
};
949949
}
950950

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+
951963
@Override
952964
public DependencyResolver emptyDependencyResolver() {
953-
return new DependencyResolver() {
954-
@Override
955-
public <T> T resolveDependency(Class<T> type, SelectionStrategy selector) {
956-
return null;
957-
}
958-
959-
@Override
960-
public boolean containsDependency(Class<?> type) {
961-
return false;
962-
}
963-
};
965+
return EMPTY_DEPENDENCY_RESOLVER;
964966
}
965967
}

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

Lines changed: 13 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -953,18 +953,20 @@ public Stream<UserFunctionSignature> getAllAggregatingFunctions() {
953953
};
954954
}
955955

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+
956968
@Override
957969
public DependencyResolver emptyDependencyResolver() {
958-
return new DependencyResolver.Adapter() {
959-
@Override
960-
public <T> T resolveDependency(Class<T> type, SelectionStrategy selector) {
961-
return null;
962-
}
963-
964-
@Override
965-
public boolean containsDependency(Class<?> type) {
966-
return false;
967-
}
968-
};
970+
return EMPTY_DEPENDENCY_RESOLVER;
969971
}
970972
}

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

Lines changed: 13 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -948,18 +948,20 @@ public Stream<UserFunctionSignature> getAllAggregatingFunctions() {
948948
};
949949
}
950950

951+
private static final DependencyResolver EMPTY_DEPENDENCY_RESOLVER = new DependencyResolver.Adapter() {
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+
951963
@Override
952964
public DependencyResolver emptyDependencyResolver() {
953-
return new DependencyResolver.Adapter() {
954-
@Override
955-
public <T> T resolveDependency(Class<T> type, SelectionStrategy selector) {
956-
return null;
957-
}
958-
959-
@Override
960-
public boolean containsDependency(Class<?> type) {
961-
return false;
962-
}
963-
};
965+
return EMPTY_DEPENDENCY_RESOLVER;
964966
}
965967
}

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

Lines changed: 13 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -948,18 +948,20 @@ public Stream<UserFunctionSignature> getAllAggregatingFunctions() {
948948
};
949949
}
950950

951+
private static final DependencyResolver EMPTY_DEPENDENCY_RESOLVER = new DependencyResolver.Adapter() {
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+
951963
@Override
952964
public DependencyResolver emptyDependencyResolver() {
953-
return new DependencyResolver.Adapter() {
954-
@Override
955-
public <T> T resolveDependency(Class<T> type, SelectionStrategy selector) {
956-
return null;
957-
}
958-
959-
@Override
960-
public boolean containsDependency(Class<?> type) {
961-
return false;
962-
}
963-
};
965+
return EMPTY_DEPENDENCY_RESOLVER;
964966
}
965967
}

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

Lines changed: 13 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -948,18 +948,20 @@ public Stream<UserFunctionSignature> getAllAggregatingFunctions() {
948948
};
949949
}
950950

951+
private static final DependencyResolver EMPTY_DEPENDENCY_RESOLVER = new DependencyResolver.Adapter() {
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+
951963
@Override
952964
public DependencyResolver emptyDependencyResolver() {
953-
return new DependencyResolver.Adapter() {
954-
@Override
955-
public <T> T resolveDependency(Class<T> type, SelectionStrategy selector) {
956-
return null;
957-
}
958-
959-
@Override
960-
public boolean containsDependency(Class<?> type) {
961-
return false;
962-
}
963-
};
965+
return EMPTY_DEPENDENCY_RESOLVER;
964966
}
965967
}

0 commit comments

Comments
 (0)