Skip to content

Commit bb83266

Browse files
committed
jooby-apt: should not generate META-INF/services by default fix #3542
1 parent b882feb commit bb83266

2 files changed

Lines changed: 1 addition & 16 deletions

File tree

modules/jooby-apt/src/main/java/io/jooby/apt/JoobyProcessor.java

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,6 @@
3434
HANDLER,
3535
DEBUG,
3636
INCREMENTAL,
37-
SERVICES,
3837
MVC_METHOD,
3938
RETURN_TYPE,
4039
ROUTER_PREFIX,
@@ -51,7 +50,6 @@ public interface Options {
5150
String INCREMENTAL = "jooby.incremental";
5251
String RETURN_TYPE = "jooby.returnType";
5352
String MVC_METHOD = "jooby.mvcMethod";
54-
String SERVICES = "jooby.services";
5553
String SKIP_ATTRIBUTE_ANNOTATIONS = "jooby.skipAttributeAnnotations";
5654

5755
static boolean boolOpt(ProcessingEnvironment environment, String option, boolean defaultValue) {
@@ -101,9 +99,6 @@ public boolean process(Set<? extends TypeElement> annotations, RoundEnvironment
10199
if (roundEnv.processingOver()) {
102100
context.debug("Output:");
103101
context.getRouters().forEach(it -> context.debug(" %s.java", it.getGeneratedType()));
104-
if (context.generateServices()) {
105-
doServices(context.getProcessingEnvironment().getFiler(), context.getRouters());
106-
}
107102
return false;
108103
} else {
109104
var routeMap = buildRouteRegistry(annotations, roundEnv);
@@ -328,10 +323,7 @@ public Set<String> getSupportedOptions() {
328323
// more then one originating element is passed to the Filer
329324
// API on writing the resource file - isolating mode does not
330325
// allow this.
331-
options.add(
332-
String.format(
333-
"org.gradle.annotation.processing.%s",
334-
context.generateServices() ? "aggregating" : "isolating"));
326+
options.add("org.gradle.annotation.processing.isolating");
335327
}
336328

337329
return options;

modules/jooby-apt/src/main/java/io/jooby/internal/apt/MvcContext.java

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@ private record ResultType(String type, String handler, boolean nonBlocking) {}
2929
private final ProcessingEnvironment processingEnvironment;
3030
private final boolean debug;
3131
private final boolean incremental;
32-
private final boolean services;
3332
private final String routerPrefix;
3433
private final String routerSuffix;
3534
private final BiConsumer<Diagnostic.Kind, String> output;
@@ -46,13 +45,11 @@ public MvcContext(
4645
this.incremental = Options.boolOpt(processingEnvironment, Options.INCREMENTAL, true);
4746
this.returnType = Options.boolOpt(processingEnvironment, Options.RETURN_TYPE, false);
4847
this.mvcMethod = Options.boolOpt(processingEnvironment, Options.MVC_METHOD, true);
49-
this.services = Options.boolOpt(processingEnvironment, Options.SERVICES, true);
5048
this.routerPrefix = Options.string(processingEnvironment, Options.ROUTER_PREFIX, "");
5149
this.routerSuffix = Options.string(processingEnvironment, Options.ROUTER_SUFFIX, "_");
5250
computeResultTypes(processingEnvironment, handler::put);
5351

5452
debug("Incremental annotation processing is turned %s.", incremental ? "ON" : "OFF");
55-
debug("Generation of service provider configuration is turned %s.", services ? "ON" : "OFF");
5653
}
5754

5855
private void computeResultTypes(
@@ -243,10 +240,6 @@ public Set<TypeElement> superTypes(Element owner) {
243240
return result;
244241
}
245242

246-
public boolean generateServices() {
247-
return services;
248-
}
249-
250243
public boolean generateMvcMethod() {
251244
return mvcMethod;
252245
}

0 commit comments

Comments
 (0)