Skip to content

Commit ccbbf5d

Browse files
mageddomageddo
committed
Cli is working
1 parent d303ad5 commit ccbbf5d

File tree

10 files changed

+187
-55
lines changed

10 files changed

+187
-55
lines changed

‎reflection-config-generator/acceptance-tests/src/test/java/com/acme/ReflectionConfigGenerationTest.java‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
import com.fasterxml.jackson.databind.ObjectMapper;
1111
import com.fasterxml.jackson.databind.SerializationFeature;
1212

13+
import org.junit.jupiter.api.Disabled;
1314
import org.junit.jupiter.api.Test;
1415

1516
import static com.acme.TestUtils.getResourceAsString;
@@ -37,6 +38,7 @@ void mustConfigureReflectJson() throws JsonProcessingException {
3738
}
3839

3940
@Test
41+
@Disabled
4042
void mustConfigureThirdPartyReflectJson() throws JsonProcessingException {
4143
// arrange
4244

‎reflection-config-generator/src/main/java/nativeimage/core/NativeImageReflectionConfigGenerator.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@
2525
import static nativeimage.core.NativeImages.solvePath;
2626
import nativeimage.core.domain.ReflectionConfig;
2727
import nativeimage.core.io.NativeImagePropertiesWriter;
28+
import nativeimage.core.io.Out;
2829
import nativeimage.core.io.ReflectionConfigWriter;
2930

3031
/**
@@ -147,17 +148,16 @@ private void writeObjects() {
147148

148149
final String classPackage = this.getClassPackage();
149150
final String reflectFile = solvePath(classPackage, "reflect.json");
150-
final String reflectFileThirdParty = solvePath(classPackage, "reflect-third-party.json");
151151

152152
try (
153153
ReflectionConfigWriter appender =
154-
new ReflectionConfigWriter(this.processingEnv, reflectFile);
154+
new ReflectionConfigWriter(Out.of(this.processingEnv, reflectFile));
155155
) {
156156

157157
appender.writeAll(this.classes);
158158

159159
final URI nativeImageFile = NativeImagePropertiesWriter.write(
160-
this.processingEnv, classPackage, reflectFile, reflectFileThirdParty
160+
this.processingEnv, classPackage, reflectFile
161161
);
162162
log.info(
163163
"status=reflect-generation-done, objects=%d, path=%s",

‎reflection-config-generator/src/main/java/nativeimage/core/ReflectionConfigAppender.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,5 +3,5 @@
33
import nativeimage.core.domain.ReflectionConfig;
44

55
public interface ReflectionConfigAppender {
6-
void append(ReflectionConfig reflectionConfig);
6+
void write(ReflectionConfig reflectionConfig);
77
}

‎reflection-config-generator/src/main/java/nativeimage/core/ReflectionConfigBuilder.java‎

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,11 @@
11
package nativeimage.core;
22

3-
import java.util.ArrayList;
43
import java.util.LinkedHashSet;
5-
import java.util.List;
64
import java.util.Set;
75

86
import nativeimage.Reflection;
9-
import nativeimage.core.domain.Method;
107
import nativeimage.core.domain.ReflectionConfig;
8+
import static nativeimage.core.domain.ReflectionConfig.withConstructors;
119

1210
//@Experimental
1311
public final class ReflectionConfigBuilder {
@@ -41,11 +39,7 @@ private static ReflectionConfig.ReflectionConfigBuilder toBuilder(Reflection ref
4139
.allDeclaredMethods(reflectionAnn.declaredMethods())
4240
;
4341
if(reflectionAnn.constructors()){
44-
final List<Method> methods = new ArrayList<>();
45-
methods.add(Method.of("<init>"));
46-
builder.allDeclaredConstructors(true);
47-
builder.allPublicConstructors(true);
48-
builder.methods(methods);
42+
withConstructors(builder);
4943
}
5044
return builder;
5145
}

‎reflection-config-generator/src/main/java/nativeimage/core/domain/ReflectionConfig.java‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
package nativeimage.core.domain;
22

3+
import java.util.ArrayList;
34
import java.util.List;
45

56
public class ReflectionConfig {
@@ -143,4 +144,13 @@ public ReflectionConfig build() {
143144
}
144145

145146
}
147+
148+
public static void withConstructors(ReflectionConfig.ReflectionConfigBuilder builder) {
149+
final List<Method> methods = new ArrayList<>();
150+
methods.add(Method.of("<init>"));
151+
builder.allDeclaredConstructors(true);
152+
builder.allPublicConstructors(true);
153+
builder.methods(methods);
154+
}
155+
146156
}

‎reflection-config-generator/src/main/java/nativeimage/core/io/Out.java‎

Lines changed: 49 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,49 @@
1+
package nativeimage.core.io;
2+
3+
import java.io.IOException;
4+
import java.net.URI;
5+
import java.nio.file.Files;
6+
import java.nio.file.Path;
7+
8+
import javax.annotation.processing.ProcessingEnvironment;
9+
import javax.tools.FileObject;
10+
11+
import com.fasterxml.jackson.databind.SequenceWriter;
12+
13+
import static nativeimage.core.io.ReflectionConfigFileCreator.buildFileObject;
14+
import static nativeimage.core.io.ReflectionConfigFileCreator.createReflectionConfigWriter;
15+
16+
public class Out {
17+
private final SequenceWriter writer;
18+
private final URI uri;
19+
20+
public Out(SequenceWriter writer, URI uri) {
21+
this.writer = writer;
22+
this.uri = uri;
23+
}
24+
25+
public static Out of(ProcessingEnvironment processingEnv, String fileName) {
26+
try {
27+
final FileObject fileObject = buildFileObject(processingEnv, fileName);
28+
return new Out(createReflectionConfigWriter(fileObject.openOutputStream()), fileObject.toUri());
29+
} catch (IOException e) {
30+
throw new RuntimeException(e);
31+
}
32+
}
33+
34+
public static Out of(Path path) {
35+
try {
36+
return new Out(createReflectionConfigWriter(Files.newOutputStream(path)), path.toUri());
37+
} catch (IOException e) {
38+
throw new RuntimeException(e);
39+
}
40+
}
41+
42+
public SequenceWriter getWriter() {
43+
return writer;
44+
}
45+
46+
public URI getUri() {
47+
return uri;
48+
}
49+
}

‎reflection-config-generator/src/main/java/nativeimage/core/io/ReflectionConfigFileCreator.java‎

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
package nativeimage.core.io;
22

33
import java.io.IOException;
4+
import java.io.OutputStream;
45

56
import javax.annotation.processing.ProcessingEnvironment;
67
import javax.tools.FileObject;
@@ -14,13 +15,6 @@
1415

1516
public class ReflectionConfigFileCreator {
1617

17-
public static SequenceWriter createWriterForConfigFile(
18-
ProcessingEnvironment processingEnv, String fileName
19-
) {
20-
final FileObject fileObject = buildFileObject(processingEnv, fileName);
21-
return createReflectionConfigWriter(fileObject);
22-
}
23-
2418
public static FileObject buildFileObject(ProcessingEnvironment processingEnv, String fileName) {
2519
try {
2620
return processingEnv
@@ -34,7 +28,7 @@ public static FileObject buildFileObject(ProcessingEnvironment processingEnv, St
3428
}
3529
}
3630

37-
public static SequenceWriter createReflectionConfigWriter(FileObject fileObject) {
31+
public static SequenceWriter createReflectionConfigWriter(final OutputStream out) {
3832
final DefaultPrettyPrinter.Indenter indenter = new DefaultIndenter(
3933
" ", DefaultIndenter.SYS_LF
4034
);
@@ -45,7 +39,7 @@ public static SequenceWriter createReflectionConfigWriter(FileObject fileObject)
4539
return new ObjectMapper()
4640
.setSerializationInclusion(JsonInclude.Include.NON_NULL)
4741
.writer(printer)
48-
.writeValuesAsArray(fileObject.openOutputStream())
42+
.writeValuesAsArray(out)
4943
;
5044
} catch (IOException e) {
5145
throw new RuntimeException(e);

‎reflection-config-generator/src/main/java/nativeimage/core/io/ReflectionConfigWriter.java‎

Lines changed: 8 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -5,48 +5,38 @@
55
import java.net.URI;
66
import java.util.Set;
77

8-
import javax.annotation.processing.ProcessingEnvironment;
9-
import javax.tools.FileObject;
10-
11-
import com.fasterxml.jackson.databind.SequenceWriter;
12-
13-
import static nativeimage.core.io.ReflectionConfigFileCreator.buildFileObject;
14-
import static nativeimage.core.io.ReflectionConfigFileCreator.createReflectionConfigWriter;
158
import nativeimage.core.ReflectionConfigAppender;
169
import nativeimage.core.domain.ReflectionConfig;
1710

1811
public class ReflectionConfigWriter implements ReflectionConfigAppender, Closeable {
19-
private final SequenceWriter writer;
20-
private final URI fileUri;
12+
private final Out out;
2113

22-
public ReflectionConfigWriter(ProcessingEnvironment processingEnv, String fileName) {
23-
final FileObject fileObject = buildFileObject(processingEnv, fileName);
24-
this.writer = createReflectionConfigWriter(fileObject);
25-
this.fileUri = fileObject.toUri();
14+
public ReflectionConfigWriter(Out out) {
15+
this.out = out;
2616
}
2717

2818
@Override
29-
public void append(ReflectionConfig reflectionConfig) {
19+
public void write(ReflectionConfig reflectionConfig) {
3020
try {
31-
this.writer.write(reflectionConfig);
21+
this.out.getWriter().write(reflectionConfig);
3222
} catch (IOException e) {
3323
throw new RuntimeException(e);
3424
}
3525
}
3626

3727
@Override
3828
public void close() throws IOException {
39-
this.writer.close();
29+
this.out.getWriter().close();
4030
}
4131

4232

4333
public void writeAll(Set<ReflectionConfig> classes) {
4434
for (ReflectionConfig config : classes) {
45-
this.append(config);
35+
this.write(config);
4636
}
4737
}
4838

4939
public URI getFileUri() {
50-
return fileUri;
40+
return this.out.getUri();
5141
}
5242
}

‎reflection-config-generator/src/main/java/nativeimage/core/thirdparty/Main.java‎

Lines changed: 93 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,101 @@
11
package nativeimage.core.thirdparty;
22

3+
import java.io.IOException;
4+
import java.nio.file.Path;
5+
import java.nio.file.Paths;
6+
import java.util.Arrays;
7+
import java.util.HashMap;
8+
import java.util.HashSet;
9+
import java.util.Map;
10+
import java.util.Set;
11+
12+
import nativeimage.core.domain.ReflectionConfig;
13+
import static nativeimage.core.domain.ReflectionConfig.withConstructors;
14+
import nativeimage.core.io.Out;
15+
import nativeimage.core.io.ReflectionConfigWriter;
316
import static nativeimage.core.thirdparty.ThirdPartyPackageScanner.findPackageClasses;
417

518
public class Main {
6-
public static void main(String[] args) {
7-
System.out.println("> Finding classes for package: " + args[0]);
8-
for (Class<?> clazz : findPackageClasses(args[0])) {
9-
System.out.println(clazz);
19+
20+
public static final String HELP = "--help";
21+
public static final String CONSTRUCTORS = "--constructors";
22+
public static final String DECLARED_CONSTRUCTORS = "--declaredConstructors";
23+
public static final String PUBLIC_CONSTRUCTORS = "--publicConstructors";
24+
public static final String DECLARED_METHODS = "--declaredMethods";
25+
public static final String PUBLIC_METHODS = "--publicMethods";
26+
public static final String PUBLIC_FIELDS = "--publicFields";
27+
public static final String DECLARED_FIELDS = "--declaredFields";
28+
public static final Set<String> KNOWN_FLAGS = new HashSet<>(Arrays.asList(
29+
HELP,
30+
CONSTRUCTORS,
31+
DECLARED_CONSTRUCTORS,
32+
PUBLIC_CONSTRUCTORS,
33+
DECLARED_METHODS,
34+
PUBLIC_METHODS,
35+
PUBLIC_FIELDS,
36+
DECLARED_FIELDS
37+
));
38+
39+
public static Map<String, Boolean> FLAGS = new HashMap<>();
40+
41+
public static void main(String[] args) throws IOException {
42+
43+
processArgs(args);
44+
45+
final int from = args.length - 2;
46+
final String packageName = args[from];
47+
final Path outFilePath = Paths.get(args[from + 1]);
48+
49+
System.out.printf(
50+
"generating reflect..., package=%s, options=%s%n",
51+
packageName, Arrays.toString(args)
52+
);
53+
54+
try (ReflectionConfigWriter writer = new ReflectionConfigWriter(Out.of(outFilePath))) {
55+
final Set<Class<?>> classes = findPackageClasses(packageName);
56+
for (Class<?> clazz : classes) {
57+
writer.write(toReflectionConfig(clazz));
58+
}
59+
System.out.printf(
60+
"package=%s, objects=%d, writtenTo=%s%n",
61+
packageName, classes.size(), outFilePath
62+
);
1063
}
64+
65+
}
66+
67+
private static void processArgs(String[] args) {
68+
for (int i = 0; i < args.length - 2; i++) {
69+
final String arg = args[i];
70+
if (KNOWN_FLAGS.contains(arg)) {
71+
if (arg.equals("--help")) {
72+
System.out.println(KNOWN_FLAGS);
73+
System.exit(0);
74+
}
75+
FLAGS.put(arg, true);
76+
} else {
77+
System.err.println("unknown option: " + arg);
78+
System.exit(1);
79+
}
80+
}
81+
}
82+
83+
static ReflectionConfig toReflectionConfig(Class<?> clazz) {
84+
final ReflectionConfig.ReflectionConfigBuilder builder = ReflectionConfig
85+
.builder()
86+
.type(clazz.getName())
87+
.allDeclaredConstructors(getFlag(DECLARED_CONSTRUCTORS))
88+
.allDeclaredFields(getFlag(DECLARED_FIELDS))
89+
.allDeclaredMethods(getFlag(DECLARED_METHODS))
90+
.allPublicFields(getFlag(PUBLIC_FIELDS))
91+
.allPublicMethods(getFlag(PUBLIC_METHODS));
92+
if (getFlag(CONSTRUCTORS)) {
93+
withConstructors(builder);
94+
}
95+
return builder.build();
96+
}
97+
98+
private static boolean getFlag(String k) {
99+
return FLAGS.get(k) != null ? FLAGS.get(k) : false;
11100
}
12101
}

0 commit comments

Comments
 (0)