Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[TOQo1n9M] Core part - apoc-hadoop dependency is conflicting 5.x (neo4j-contrib/neo4j-apoc-procedures#3450) #347

Merged
merged 2 commits into from
Apr 3, 2023
Merged

[TOQo1n9M] Core part - apoc-hadoop dependency is conflicting 5.x (neo4j-contrib/neo4j-apoc-procedures#3450) #347

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8d4740b
[TOQo1n9M] Core part - apoc-hadoop dependency is conflicting 5.x (neo…
vga91 Mar 13, 2023
feb0a13
[TOQo1n9M] changed getProjectPath() to isExtendedProject()
vga91 Mar 30, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 19 additions & 4 deletions processor/src/main/java/apoc/processor/ExtensionClassWriter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,10 @@
import com.squareup.javapoet.TypeSpec;

import javax.annotation.processing.Filer;
import javax.lang.model.element.Element;
import javax.lang.model.element.Modifier;
import javax.tools.FileObject;
import javax.tools.StandardLocation;
import java.io.IOException;
import java.util.List;
import java.util.stream.Collectors;
Expand All @@ -25,16 +28,28 @@ public void write(List<String> procedureSignatures,
List<String> userFunctionSignatures) {

try {
JavaFile.builder("apoc", defineClass(procedureSignatures, userFunctionSignatures))
String suffix = isExtendedProject() ? "Extended" : "";
final TypeSpec typeSpec = defineClass(procedureSignatures, userFunctionSignatures, suffix);

JavaFile.builder("apoc", typeSpec)
.build()
.writeTo(filer);
} catch (IOException e) {
throw new RuntimeException(e);
}
}

private TypeSpec defineClass(List<String> procedureSignatures, List<String> userFunctionSignatures) {
return TypeSpec.classBuilder("ApocSignatures")
private boolean isExtendedProject() throws IOException {
// create and delete a file to retrieve the current project path (e.g `ROOT/../core/build/generated/.../tmp`)
FileObject resource = filer.createResource(StandardLocation.SOURCE_OUTPUT, "", "tmp", (Element[]) null);
String projectPath = resource.getName();
resource.delete();

return projectPath.contains("extended/build/generated");
}

private TypeSpec defineClass(List<String> procedureSignatures, List<String> userFunctionSignatures, String suffix) {
return TypeSpec.classBuilder("ApocSignatures" + suffix)
.addModifiers(Modifier.PUBLIC)
.addField(signatureListField("PROCEDURES", procedureSignatures))
.addField(signatureListField("FUNCTIONS", userFunctionSignatures))
Expand All @@ -57,4 +72,4 @@ private String placeholders(List<String> signatures) {
// FIXME: find a way to manage the indentation automatically
return signatures.stream().map((ignored) -> "$S").collect(Collectors.joining(",\n\t\t"));
}
}
}
27 changes: 16 additions & 11 deletions test-utils/src/main/java/apoc/util/TestContainerUtil.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
import com.github.dockerjava.api.exception.NotFoundException;
import java.time.Duration;
import org.apache.commons.io.FileUtils;
import org.apache.commons.io.filefilter.IOFileFilter;
import org.apache.commons.io.filefilter.WildcardFileFilter;
import org.apache.commons.lang3.exception.ExceptionUtils;
import org.gradle.tooling.BuildLauncher;
Expand Down Expand Up @@ -46,9 +47,10 @@ public enum ApocPackage {

private TestContainerUtil() {}

private static File baseDir = Paths.get("..").toFile();
public static File baseDir = Paths.get("..").toFile();
public static File pluginsFolder = new File(baseDir, "build/plugins");
Lojjs marked this conversation as resolved.
Show resolved Hide resolved
private static File coreDir = new File(baseDir, System.getProperty("coreDir"));
private static File extendedDir = new File(baseDir, "extended");
public static File extendedDir = new File(baseDir, "extended");

public static String dockerImageForNeo4j(Neo4jVersion version) {
if (version == Neo4jVersion.COMMUNITY)
Expand Down Expand Up @@ -84,7 +86,6 @@ private static Neo4jContainerExtension createNeo4jContainer(List<ApocPackage> ap
dockerImage = neo4jCommunityDockerImageVersion;
}

File pluginsFolder = new File(baseDir, "build/plugins");
try {
FileUtils.deleteDirectory( pluginsFolder );
} catch (IOException e) {
Expand Down Expand Up @@ -113,14 +114,7 @@ private static Neo4jContainerExtension createNeo4jContainer(List<ApocPackage> ap

executeGradleTasks(projectDir, "shadowJar");

Collection<File> files = FileUtils.listFiles(new File(projectDir, "build/libs"), new WildcardFileFilter(Arrays.asList("*-extended.jar", "*-core.jar")), null);
for (File file: files) {
try {
FileUtils.copyFileToDirectory(file, pluginsFolder);
} catch (IOException e) {
throw new RuntimeException(e);
}
}
copyFilesToPlugin(new File(projectDir, "build/libs"), new WildcardFileFilter(Arrays.asList("*-extended.jar", "*-core.jar")), pluginsFolder);
}

System.out.println("neo4jDockerImageVersion = " + dockerImage);
Expand Down Expand Up @@ -165,6 +159,17 @@ private static Neo4jContainerExtension createNeo4jContainer(List<ApocPackage> ap
return neo4jContainer.withWaitForNeo4jDatabaseReady(password, version);
}

public static void copyFilesToPlugin(File directory, IOFileFilter instance, File pluginsFolder) {
Collection<File> files = FileUtils.listFiles(directory, instance, null);
for (File file: files) {
try {
FileUtils.copyFileToDirectory(file, pluginsFolder);
} catch (IOException e) {
throw new RuntimeException(e);
}
}
}

public static void executeGradleTasks(File baseDir, String... tasks) {
try (ProjectConnection connection = GradleConnector.newConnector()
.forProjectDirectory(baseDir)
Expand Down