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

fix #853 - repair classloader for spring #870

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open

fix #853 - repair classloader for spring #870

Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
c2c3c0b
fix #853 - repair classloader for spring
kamilkrzywanski Feb 6, 2025
dca2cff
Merge branch 'master' into issue_853
velo Feb 7, 2025
f3cb9a0
Fix code format
velo Feb 7, 2025
6558abf
fix #853 - repair classloader for spring - test
kamilkrzywanski Feb 7, 2025
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
8 changes: 3 additions & 5 deletions .../querydsl-codegen-utils/src/main/java/com/querydsl/codegen/utils/JDKEvaluatorFactory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,7 @@
import java.io.IOException;
import java.io.StringWriter;
import java.io.Writer;
import java.util.Arrays;
import java.util.Collections;
import java.util.List;
import java.util.Map;
import java.util.*;
velo marked this conversation as resolved.
Show resolved Hide resolved
import javax.tools.JavaCompiler;
import javax.tools.SimpleJavaFileObject;
import javax.tools.StandardLocation;
Expand Down Expand Up @@ -50,7 +47,8 @@ public JDKEvaluatorFactory(ClassLoader parent, JavaCompiler compiler) {
this.fileManager =
new MemFileManager(parent, compiler.getStandardFileManager(null, null, null));
this.compiler = compiler;
this.classpath = SimpleCompiler.getClassPath(parent);
this.classpath = Optional.of(SimpleCompiler.getClassPath(parent)).filter(s -> !s.isEmpty())
.orElseGet(() -> SimpleCompiler.getClassPath(compiler.getClass().getClassLoader()));
this.loader = fileManager.getClassLoader(StandardLocation.CLASS_OUTPUT);
this.compilationOptions = Arrays.asList("-classpath", classpath, "-g:none");
}
Expand Down