[wokdlhX3] Extract code from APOC core which is only used in APOC ext…

…ended (#261) * Also use admin annotation instead of checkAdmin * Also suppress unused warnings for remaining code only used from extended These usages are not as straight forward to get rid of/extract to extended.
neo4j · Jan 16, 2023 · 3950300 · 3950300
1 parent 7c124ad
commit 3950300
Show file tree

Hide file tree

Showing 37 changed files with 17,175 additions and 882 deletions.
diff --git a/common/src/main/antlr/apoc/custom/Signature.g4 b/common/src/main/antlr/apoc/custom/Signature.g4
diff --git a/common/src/main/java/apoc/ApocConfig.java b/common/src/main/java/apoc/ApocConfig.java
@@ -266,10 +266,6 @@ public static ApocConfig apocConfig() {
      * delegate methods for Configuration
      */
 
-    public boolean containsKey(String key) {
-        return getConfig().containsKey(key);
-    }
-
     public String getString(String key) {
         return getConfig().getString(key);
     }
@@ -286,10 +282,6 @@ public boolean getBoolean(String key) {
         return getConfig().getBoolean(key);
     }
 
-    public boolean getBoolean(String key, boolean defaultValue) {
-        return getConfig().getBoolean(key, defaultValue);
-    }
-
     public boolean isImportFolderConfigured() {
         // in case we're test database import path is TestDatabaseManagementServiceBuilder.EPHEMERAL_PATH
 

diff --git a/common/src/main/java/apoc/ApocExtensionFactory.java b/common/src/main/java/apoc/ApocExtensionFactory.java
@@ -43,6 +43,7 @@ public interface Dependencies {
         AvailabilityGuard availabilityGuard();
         DatabaseManagementService databaseManagementService();
         ApocConfig apocConfig();
+        @SuppressWarnings("unused") // used from extended
         GlobalProcedures globalProceduresRegistry();
         RegisterComponentFactory.RegisterComponentLifecycle registerComponentLifecycle();
         Pools pools();

diff --git a/common/src/main/java/apoc/Description.java b/common/src/main/java/apoc/Description.java
diff --git a/common/src/main/java/apoc/RegisterComponentFactory.java b/common/src/main/java/apoc/RegisterComponentFactory.java
@@ -48,6 +48,7 @@ public void addResolver(String databaseNamme, Class clazz, Object instance) {
             classInstanceMap.put(databaseNamme, instance);
         }
 
+        @SuppressWarnings("unused") // used from extended
         public Map<Class, Map<String, Object>> getResolvers() {
             return resolvers;
         }

diff --git a/common/src/main/java/apoc/SystemLabels.java b/common/src/main/java/apoc/SystemLabels.java
@@ -3,12 +3,6 @@
 import org.neo4j.graphdb.Label;
 
 public enum SystemLabels implements Label {
-    ApocCypherProcedures,
-    ApocCypherProceduresMeta,
-    Procedure,
-    Function,
-    ApocUuid,
     ApocTriggerMeta,
-    ApocTrigger,
-    DataVirtualizationCatalog
+    ApocTrigger
 }
diff --git a/common/src/main/java/apoc/SystemPropertyKeys.java b/common/src/main/java/apoc/SystemPropertyKeys.java
@@ -7,24 +7,9 @@ public enum SystemPropertyKeys  {
     // cypher stored procedures/functions
     lastUpdated,
     statement,
-    inputs,
-    description,
-    mode,
-    outputs,
-    output,
-    forceSingle,
-    prefix,
 
     // triggers
     selector,
     params,
     paused,
-
-    // dv
-    data,
-
-    // uuid handler
-    label,
-    addToSetLabel,
-    propertyName
 }
diff --git a/common/src/main/java/apoc/export/cypher/FileManagerFactory.java b/common/src/main/java/apoc/export/cypher/FileManagerFactory.java
@@ -19,10 +19,6 @@
  * @since 06.12.17
  */
 public class FileManagerFactory {
-    public static ExportFileManager createFileManager(String fileName, boolean separatedFiles) {
-        return createFileManager(fileName, separatedFiles, ExportConfig.EMPTY);
-    }
-
     public static ExportFileManager createFileManager(String fileName, boolean separatedFiles, ExportConfig config) {
         if (fileName == null || "".equals(fileName)) {
             return new StringExportCypherFileManager(separatedFiles, config);

diff --git a/common/src/main/java/apoc/load/LoadJsonUtils.java b/common/src/main/java/apoc/load/LoadJsonUtils.java
@@ -11,9 +11,6 @@
 import org.neo4j.procedure.Name;
 
 public class LoadJsonUtils {
-    public static Stream<MapResult> loadJsonStream(@Name("url") Object url, @Name("headers") Map<String, Object> headers, @Name("payload") String payload) {
-        return loadJsonStream(url, headers, payload, "", true, null, null);
-    }
     public static Stream<MapResult> loadJsonStream(@Name("urlOrKeyOrBinary") Object urlOrKeyOrBinary, @Name("headers") Map<String, Object> headers, @Name("payload") String payload, String path, boolean failOnError, String compressionAlgo, List<String> pathOptions) {
         if (urlOrKeyOrBinary instanceof String) {
             headers = null != headers ? headers : new HashMap<>();

diff --git a/common/src/main/java/apoc/load/Mapping.java b/common/src/main/java/apoc/load/Mapping.java
@@ -1,6 +1,5 @@
 package apoc.load;
 
-import apoc.load.util.LoadCsvConfig;
 import apoc.meta.Types;
 import apoc.util.Util;
 import org.apache.commons.lang3.StringUtils;
@@ -15,7 +14,6 @@
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collection;
-import java.util.Collections;
 import java.util.List;
 import java.util.Map;
 import java.util.function.Supplier;
@@ -28,7 +26,6 @@
 import static org.neo4j.configuration.GraphDatabaseSettings.db_temporal_timezone;
 
 public class Mapping {
-    public static final Mapping EMPTY = new Mapping("", Collections.emptyMap(), LoadCsvConfig.DEFAULT_ARRAY_SEP, false);
     final String name;
     final Collection<String> nullValues;
     final Types type;

diff --git a/common/src/main/java/apoc/load/util/JdbcUtil.java b/common/src/main/java/apoc/load/util/JdbcUtil.java
diff --git a/common/src/main/java/apoc/load/util/LoadCsvConfig.java b/common/src/main/java/apoc/load/util/LoadCsvConfig.java