Skip to content

Commit 7f649ba

Browse files
committed
#143 - Remove service loader META-INF services file for custom modules
Now that custom modules can have no default constructor they can not be loaded via ServiceLoader. This should not matter as it really didn't make sense to service load the custom modules anyway. Note that the 'default' scope modules still are expected to be service loaded. That does mean that we do not create a specific constructor for 'default' scope modules. External dependencies for default modules must still be provided via withBean()
1 parent 4e68834 commit 7f649ba

File tree

1 file changed

+0
-44
lines changed
  • inject-generator/src/main/java/io/avaje/inject/generator

1 file changed

+0
-44
lines changed

inject-generator/src/main/java/io/avaje/inject/generator/AllScopes.java

Lines changed: 0 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,6 @@
55
import javax.annotation.processing.RoundEnvironment;
66
import javax.lang.model.element.Element;
77
import javax.lang.model.element.TypeElement;
8-
import javax.tools.FileObject;
9-
import java.io.IOException;
10-
import java.io.Writer;
118
import java.util.HashMap;
129
import java.util.List;
1310
import java.util.Map;
@@ -50,39 +47,6 @@ void write(boolean processingOver) {
5047
for (Data value : scopeAnnotations.values()) {
5148
value.write(processingOver);
5249
}
53-
if (processingOver) {
54-
writeModuleCustomServicesFile();
55-
}
56-
}
57-
58-
private void writeModuleCustomServicesFile() {
59-
if (scopeAnnotations.isEmpty()) {
60-
return;
61-
}
62-
try {
63-
FileObject jfo = context.createMetaInfModuleCustom();
64-
if (jfo != null) {
65-
Writer writer = jfo.openWriter();
66-
for (Data value : scopeAnnotations.values()) {
67-
final String moduleFullName = value.moduleFullName();
68-
if (moduleFullName == null) {
69-
// an empty module, custom scope with no beans
70-
final TypeElement typeElement = value.annotationType();
71-
if (typeElement != null) {
72-
context.logWarn("Empty module for "+typeElement);
73-
}
74-
} else {
75-
writer.write(moduleFullName);
76-
writer.write("\n");
77-
}
78-
}
79-
writer.close();
80-
}
81-
82-
} catch (IOException e) {
83-
e.printStackTrace();
84-
context.logError("Failed to write services file " + e.getMessage());
85-
}
8650
}
8751

8852
void readModules(List<String> customScopeModules) {
@@ -125,13 +89,5 @@ static class Data {
12589
void write(boolean processingOver) {
12690
scopeInfo.write(processingOver);
12791
}
128-
129-
String moduleFullName() {
130-
return scopeInfo.moduleFullName();
131-
}
132-
133-
TypeElement annotationType() {
134-
return scopeInfo.annotationType();
135-
}
13692
}
13793
}

0 commit comments

Comments
 (0)