Merge pull request #136 from avaje/feature/ctx-javax-flag

rbygrave · web-flow · commit 4d8f39666186 · 2023-01-18T07:15:18.000+13:00
Simplify useJavax determination in ProcessingContext
diff --git a/http-generator-core/src/main/java/io/avaje/http/generator/core/ProcessingContext.java b/http-generator-core/src/main/java/io/avaje/http/generator/core/ProcessingContext.java
@@ -58,10 +58,8 @@ public ProcessingContext(ProcessingEnvironment env, PlatformAdapter readAdapter)
     final var override = env.getOptions().get("useJavax");
     if (override != null || (javax && jakarta)) {
       this.useJavax = Boolean.parseBoolean(override);
-    } else if (javax && !jakarta) {
-      useJavax = javax;
     } else {
-      useJavax = false;
+      this.useJavax = javax;
     }
   }
 

Original file line number	Diff line number	Diff line change
`@@ -58,10 +58,8 @@ public ProcessingContext(ProcessingEnvironment env, PlatformAdapter readAdapter)`
`58`	`58`	`final var override = env.getOptions().get("useJavax");`
`59`	`59`	`if (override != null \|\| (javax && jakarta)) {`
`60`	`60`	`this.useJavax = Boolean.parseBoolean(override);`
`61`		`- } else if (javax && !jakarta) {`
`62`		`- useJavax = javax;`
`63`	`61`	`} else {`
`64`		`- useJavax = false;`
	`62`	`+ this.useJavax = javax;`
`65`	`63`	`}`
`66`	`64`	`}`
`67`	`65`