Support lazy loading

build.gradle

@@ -170,7 +170,7 @@ apply from: "licenses-source-header.gradle"
 
 ext {
     publicDir = "${project.rootDir}"
-    neo4jVersionEffective = project.hasProperty("neo4jVersionOverride") ? project.getProperty("neo4jVersionOverride") : "2024.12.0-SNAPSHOT"
+    neo4jVersionEffective = project.hasProperty("neo4jVersionOverride") ? project.getProperty("neo4jVersionOverride") : "2024.12.0"
     testContainersVersion = '1.20.2'
     apacheArrowVersion = '15.0.0'
 }

processor/src/main/java/apoc/processor/ApocProcessor.java

@@ -19,31 +19,27 @@
 package apoc.processor;
 
 import java.util.ArrayList;
-import java.util.HashSet;
 import java.util.List;
-import java.util.Map;
 import java.util.Set;
 import javax.annotation.processing.AbstractProcessor;
 import javax.annotation.processing.ProcessingEnvironment;
 import javax.annotation.processing.RoundEnvironment;
 import javax.annotation.processing.SupportedSourceVersion;
 import javax.lang.model.SourceVersion;
 import javax.lang.model.element.TypeElement;
-import org.neo4j.kernel.api.QueryLanguage;
 import org.neo4j.procedure.Procedure;
 import org.neo4j.procedure.UserAggregationFunction;
 import org.neo4j.procedure.UserFunction;
 
 @SupportedSourceVersion(SourceVersion.RELEASE_21)
 public class ApocProcessor extends AbstractProcessor {
 
-    private List<Map<String, List<QueryLanguage>>> procedureSignatures;
-    private List<Map<String, List<QueryLanguage>>> userFunctionSignatures;
-    private Set<String> procedureClassNames;
+    private List<Signature> signatures;
 
     private SignatureVisitor signatureVisitor;
 
     private ExtensionClassWriter extensionClassWriter;
+    private ProcedureServiceWriter procedureServiceWriter;
 
     @Override
     public Set<String> getSupportedAnnotationTypes() {
@@ -52,65 +48,24 @@ public Set<String> getSupportedAnnotationTypes() {
 
     @Override
     public synchronized void init(ProcessingEnvironment processingEnv) {
-        procedureSignatures = new ArrayList<>();
-        userFunctionSignatures = new ArrayList<>();
-        procedureClassNames = new HashSet<>();
+        signatures = new ArrayList<>();
         extensionClassWriter = new ExtensionClassWriter(processingEnv.getFiler());
+        procedureServiceWriter = new ProcedureServiceWriter(processingEnv.getFiler());
         signatureVisitor = new SignatureVisitor(processingEnv.getElementUtils(), processingEnv.getMessager());
     }
 
     @Override
     public boolean process(Set<? extends TypeElement> annotations, RoundEnvironment roundEnv) {
-        annotations.forEach(annotation -> extractSignature(annotation, roundEnv));
-        annotations.forEach(annotation -> procedureClassNames.add(annotation.getQualifiedName().toString()));
-
-        List<String> procedureSignaturesCypher5 = new ArrayList<>();
-        List<String> userFunctionSignaturesCypher5 = new ArrayList<>();
-        List<String> procedureSignaturesCypher25 = new ArrayList<>();
-        List<String> userFunctionSignaturesCypher25 = new ArrayList<>();
-
-        separateKeysByQueryLanguage(procedureSignatures, procedureSignaturesCypher5, procedureSignaturesCypher25);
-        separateKeysByQueryLanguage(
-                userFunctionSignatures, userFunctionSignaturesCypher5, userFunctionSignaturesCypher25);
+        for (final var annotation : annotations) {
+            for (final var method : roundEnv.getElementsAnnotatedWith(annotation)) {
+                signatures.add(signatureVisitor.visit(method));
+            }
+        }
 
         if (roundEnv.processingOver()) {
-            extensionClassWriter.write(
-                    procedureSignaturesCypher5,
-                    userFunctionSignaturesCypher5,
-                    procedureSignaturesCypher25,
-                    userFunctionSignaturesCypher25);
-
+            extensionClassWriter.write(signatures);
+            procedureServiceWriter.write(signatures);
         }
         return false;
     }
-
-    private void extractSignature(TypeElement annotation, RoundEnvironment roundEnv) {
-        List<Map<String, List<QueryLanguage>>> signatures = accumulator(annotation);
-        roundEnv.getElementsAnnotatedWith(annotation)
-                .forEach(annotatedElement -> signatures.add(signatureVisitor.visit(annotatedElement)));
-    }
-
-    private List<Map<String, List<QueryLanguage>>> accumulator(TypeElement annotation) {
-        if (annotation.getQualifiedName().contentEquals(Procedure.class.getName())) {
-            return procedureSignatures;
-        }
-        return userFunctionSignatures;
-    }
-
-    public static void separateKeysByQueryLanguage(
-            List<Map<String, List<QueryLanguage>>> list, List<String> c5Keys, List<String> c6Keys) {
-        for (Map<String, List<QueryLanguage>> map : list) {
-            for (Map.Entry<String, List<QueryLanguage>> entry : map.entrySet()) {
-                String key = entry.getKey();
-                List<QueryLanguage> values = entry.getValue();
-
-                if (values.contains(QueryLanguage.CYPHER_5)) {
-                    c5Keys.add(key);
-                }
-                if (values.contains(QueryLanguage.CYPHER_25)) {
-                    c6Keys.add(key);
-                }
-            }
-        }
-    }
 }