Merge pull request jooby-project#2380 from agentgt/2379-allow-other-nonnull

jknack · web-flow · commit 87e94d54e3ee · 2021-07-17T20:58:30.000-03:00
Allow other NonNull/Nullable annotations for APT
diff --git a/modules/jooby-apt/src/main/java/io/jooby/internal/apt/ParamDefinition.java b/modules/jooby-apt/src/main/java/io/jooby/internal/apt/ParamDefinition.java
@@ -100,11 +100,12 @@ public boolean isNamed() {
   }
 
   public boolean isNullable() {
-    if (hasAnnotation("org.jetbrains.annotations.Nullable")
+    if (hasAnnotation(".Nullable")
         || hasAnnotation("javax.annotation.Nullable")) {
       return true;
     }
-    boolean nonnull = hasAnnotation("org.jetbrains.annotations.NotNull")
+    boolean nonnull = hasAnnotation(".NotNull")
+        || hasAnnotation(".NonNull")
         || hasAnnotation("javax.annotation.Nonnull");
     if (nonnull) {
       return false;
@@ -114,7 +115,7 @@ public boolean isNullable() {
 
   private boolean hasAnnotation(String type) {
     for (AnnotationMirror annotation : parameter.getAnnotationMirrors()) {
-      if (annotation.getAnnotationType().toString().equals(type)) {
+      if (annotation.getAnnotationType().toString().endsWith(type)) {
         return true;
       }
     }

Original file line number	Diff line number	Diff line change
`@@ -100,11 +100,12 @@ public boolean isNamed() {`
`100`	`100`	`}`
`101`	`101`
`102`	`102`	`public boolean isNullable() {`
`103`		`- if (hasAnnotation("org.jetbrains.annotations.Nullable")`
	`103`	`+ if (hasAnnotation(".Nullable")`
`104`	`104`	`\|\| hasAnnotation("javax.annotation.Nullable")) {`
`105`	`105`	`return true;`
`106`	`106`	`}`
`107`		`- boolean nonnull = hasAnnotation("org.jetbrains.annotations.NotNull")`
	`107`	`+ boolean nonnull = hasAnnotation(".NotNull")`
	`108`	`+ \|\| hasAnnotation(".NonNull")`
`108`	`109`	`\|\| hasAnnotation("javax.annotation.Nonnull");`
`109`	`110`	`if (nonnull) {`
`110`	`111`	`return false;`
`@@ -114,7 +115,7 @@ public boolean isNullable() {`
`114`	`115`
`115`	`116`	`private boolean hasAnnotation(String type) {`
`116`	`117`	`for (AnnotationMirror annotation : parameter.getAnnotationMirrors()) {`
`117`		`- if (annotation.getAnnotationType().toString().equals(type)) {`
	`118`	`+ if (annotation.getAnnotationType().toString().endsWith(type)) {`
`118`	`119`	`return true;`
`119`	`120`	`}`
`120`	`121`	`}`