removed apoc.custom references

neo4j-contrib · Sep 2, 2024 · fe6c196 · fe6c196
1 parent 716388c
commit fe6c196
Show file tree

Hide file tree

Showing 23 changed files with 216 additions and 5,680 deletions.
diff --git a/extended-it/src/test/java/apoc/neo4j/docker/ApocSplitTest.java b/extended-it/src/test/java/apoc/neo4j/docker/ApocSplitTest.java
@@ -133,11 +133,11 @@ public class ApocSplitTest {
         // "apoc.export.xls.data",
         // "apoc.export.xls.graph",
         // "apoc.export.xls.query",
-        "apoc.custom.declareProcedure",
-        "apoc.custom.declareFunction",
-        "apoc.custom.list",
-        "apoc.custom.removeProcedure",
-        "apoc.custom.removeFunction",
+//        "apoc.custom.declareProcedure",
+//        "apoc.custom.declareFunction",
+//        "apoc.custom.list",
+//        "apoc.custom.removeProcedure",
+//        "apoc.custom.removeFunction",
         "apoc.uuid.install",
         "apoc.uuid.remove",
         "apoc.uuid.removeAll",

diff --git a/extended-it/src/test/java/apoc/neo4j/docker/CypherProceduresClusterRoutingTest.java b/extended-it/src/test/java/apoc/neo4j/docker/CypherProceduresClusterRoutingTest.java
diff --git a/extended/src/main/java/apoc/ExtendedApocGlobalComponents.java b/extended/src/main/java/apoc/ExtendedApocGlobalComponents.java
@@ -1,7 +1,5 @@
 package apoc;
 
-import apoc.custom.CypherProcedures;
-import apoc.custom.CypherProceduresHandler;
 import apoc.load.LoadDirectory;
 import apoc.load.LoadDirectoryHandler;
 import apoc.ttl.TTLLifeCycle;
@@ -17,26 +15,14 @@
 import java.util.Collections;
 import java.util.List;
 import java.util.Map;
-import java.util.concurrent.ConcurrentHashMap;
 
 @ServiceProvider
 public class ExtendedApocGlobalComponents implements ApocGlobalComponents {
 
-    private final Map<GraphDatabaseService,CypherProceduresHandler> cypherProcedureHandlers = new ConcurrentHashMap<>();
 
     @Override
     public Map<String, Lifecycle> getServices(GraphDatabaseAPI db, ApocExtensionFactory.Dependencies dependencies) {
 
-
-        CypherProceduresHandler cypherProcedureHandler = new CypherProceduresHandler(
-                db,
-                dependencies.scheduler(),
-                dependencies.apocConfig(),
-                dependencies.log().getUserLog(CypherProcedures.class),
-                dependencies.globalProceduresRegistry()
-        );
-        cypherProcedureHandlers.put(db, cypherProcedureHandler);
-
         return Map.of(
 
                 "ttl", new TTLLifeCycle(dependencies.scheduler(),
@@ -53,20 +39,18 @@ public Map<String, Lifecycle> getServices(GraphDatabaseAPI db, ApocExtensionFact
 
                 "directory", new LoadDirectoryHandler(db,
                         dependencies.log().getUserLog(LoadDirectory.class),
-                        dependencies.pools()),
+                        dependencies.pools())
 
-                "cypherProcedures", cypherProcedureHandler
         );
     }
 
     @Override
     public Collection<Class> getContextClasses() {
-        return List.of(CypherProceduresHandler.class, UuidHandler.class, LoadDirectoryHandler.class);
+        return List.of(UuidHandler.class, LoadDirectoryHandler.class);
     }
 
     @Override
     public Iterable<AvailabilityListener> getListeners(GraphDatabaseAPI db, ApocExtensionFactory.Dependencies dependencies) {
-        CypherProceduresHandler cypherProceduresHandler = cypherProcedureHandlers.get(db);
-        return cypherProceduresHandler==null ? Collections.emptyList() : Collections.singleton(cypherProceduresHandler);
+        return Collections.emptyList();
     }
 }
diff --git a/extended/src/main/java/apoc/config/Config.java b/extended/src/main/java/apoc/config/Config.java
@@ -29,7 +29,6 @@
 import static apoc.ExtendedApocConfig.APOC_TTL_SCHEDULE;
 import static apoc.ExtendedApocConfig.APOC_UUID_ENABLED;
 import static apoc.ExtendedApocConfig.APOC_UUID_FORMAT;
-import static apoc.custom.CypherProceduresHandler.CUSTOM_PROCEDURES_REFRESH;
 
 /**
  * @author mh
@@ -70,8 +69,6 @@ public class Config {
             "apoc.http.timeout.connect",
             "apoc.http.timeout.read",
 
-            // apoc.custom.
-            CUSTOM_PROCEDURES_REFRESH,
 
             // apoc.spatial. - other configs can have sensitive credentials
             "apoc.spatial.geocode.osm.throttle",

diff --git a/extended/src/main/java/apoc/custom/CustomProcedureInfo.java b/extended/src/main/java/apoc/custom/CustomProcedureInfo.java