Skip to content

Commit 2d04889

Browse files
soerenreichardtknutwalker
authored andcommitted
Move empty dependency resolver behind Neo4jProxy
1 parent 57be3c6 commit 2d04889

File tree

21 files changed

+142
-78
lines changed

21 files changed

+142
-78
lines changed

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

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -836,4 +836,19 @@ public Stream<UserFunctionSignature> getAllAggregatingFunctions() {
836836
}
837837
};
838838
}
839+
840+
@Override
841+
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+
};
853+
}
839854
}

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

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -948,4 +948,19 @@ public Stream<UserFunctionSignature> getAllAggregatingFunctions() {
948948
}
949949
};
950950
}
951+
952+
@Override
953+
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+
};
965+
}
951966
}

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

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -948,4 +948,19 @@ public Stream<UserFunctionSignature> getAllAggregatingFunctions() {
948948
}
949949
};
950950
}
951+
952+
@Override
953+
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+
};
965+
}
951966
}

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

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -947,4 +947,19 @@ public Stream<UserFunctionSignature> getAllAggregatingFunctions() {
947947
}
948948
};
949949
}
950+
951+
@Override
952+
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+
};
964+
}
950965
}

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

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -952,4 +952,19 @@ public Stream<UserFunctionSignature> getAllAggregatingFunctions() {
952952
}
953953
};
954954
}
955+
956+
@Override
957+
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+
};
969+
}
955970
}

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

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -947,4 +947,19 @@ public Stream<UserFunctionSignature> getAllAggregatingFunctions() {
947947
}
948948
};
949949
}
950+
951+
@Override
952+
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+
};
964+
}
950965
}

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

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -947,4 +947,19 @@ public Stream<UserFunctionSignature> getAllAggregatingFunctions() {
947947
}
948948
};
949949
}
950+
951+
@Override
952+
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+
};
964+
}
950965
}

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

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -947,4 +947,19 @@ public Stream<UserFunctionSignature> getAllAggregatingFunctions() {
947947
}
948948
};
949949
}
950+
951+
@Override
952+
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+
};
964+
}
950965
}

compatibility/api/neo4j-kernel-adapter/src/main/java/org/neo4j/gds/compat/Neo4jProxyApi.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121

2222
import org.jetbrains.annotations.Nullable;
2323
import org.jetbrains.annotations.TestOnly;
24+
import org.neo4j.common.DependencyResolver;
2425
import org.neo4j.configuration.Config;
2526
import org.neo4j.configuration.connectors.ConnectorPortRegister;
2627
import org.neo4j.dbms.api.DatabaseManagementService;
@@ -327,4 +328,6 @@ TransactionalContext newQueryContext(
327328
<T> T lookupComponentProvider(Context ctx, Class<T> component, boolean safe) throws ProcedureException;
328329

329330
GlobalProcedureRegistry globalProcedureRegistry(GlobalProcedures globalProcedures);
331+
332+
DependencyResolver emptyDependencyResolver();
330333
}

compatibility/common/neo4j-kernel-adapter/src/main/java/org/neo4j/gds/compat/Neo4jProxy.java

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121

2222
import org.jetbrains.annotations.Nullable;
2323
import org.jetbrains.annotations.TestOnly;
24+
import org.neo4j.common.DependencyResolver;
2425
import org.neo4j.configuration.Config;
2526
import org.neo4j.configuration.connectors.ConnectorPortRegister;
2627
import org.neo4j.dbms.api.DatabaseManagementService;
@@ -493,6 +494,10 @@ public static GlobalProcedureRegistry globalProcedureRegistry(GlobalProcedures g
493494
return IMPL.globalProcedureRegistry(globalProcedures);
494495
}
495496

497+
public static DependencyResolver emptyDependencyResolver() {
498+
return IMPL.emptyDependencyResolver();
499+
}
500+
496501
private Neo4jProxy() {
497502
throw new UnsupportedOperationException("No instances");
498503
}

0 commit comments

Comments
 (0)