Skip to content

Commit ac7cc60

Browse files
committed
only default if both
1 parent d59586a commit ac7cc60

File tree

1 file changed

+12
-2
lines changed

1 file changed

+12
-2
lines changed

http-generator-core/src/main/java/io/avaje/http/generator/core/ProcessingContext.java

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,9 +39,19 @@ public ProcessingContext(ProcessingEnvironment env, PlatformAdapter readAdapter)
3939
this.types = env.getTypeUtils();
4040
this.openApiAvailable = isTypeAvailable(Constants.OPENAPIDEFINITION);
4141
this.avajeAvailable = isTypeAvailable(Constants.COMPONENT);
42-
this.docContext = new DocContext(env, openApiAvailable);
43-
this.useJavax = Boolean.parseBoolean(env.getOptions().get("useJavax"));
4442
this.diAnnotation = avajeAvailable ? "@Component" : "@Singleton";
43+
44+
this.docContext = new DocContext(env, openApiAvailable);
45+
46+
final var javax = isTypeAvailable(Constants.SINGLETON.replace("jakarta", "javax"));
47+
final var jakarta = isTypeAvailable(Constants.SINGLETON);
48+
if (javax && jakarta) {
49+
this.useJavax = Boolean.parseBoolean(env.getOptions().get("useJavax"));
50+
} else if (jakarta) {
51+
this.useJavax = false;
52+
} else {
53+
useJavax = true;
54+
}
4555
}
4656

4757
private boolean isTypeAvailable(String canonicalName) {

0 commit comments

Comments
 (0)