github/ebean
4
0
Fork 0
mirror of https://github.com/ebean-orm/ebean.git synced 2024-04-21 10:51:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

#2914 - Query bean generation support for @ElementCollection with validaiton annotations - NPE NullPointerException

Browse Source
This commit is contained in:
Rob Bygrave
2022-12-08 11:10:23 +13:00
parent e290f68b29
commit d2f629e7bb
4 changed files with 32 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
querybean-generator/src/main/java/io/ebean/querybean/generator/ProcessingContext.java
+11 -3
View File
@@ -4,7 +4,6 @@ import javax.annotation.processing.Filer;
import javax.annotation.processing.FilerException;
import javax.annotation.processing.Messager;
import javax.annotation.processing.ProcessingEnvironment;
import javax.lang.model.SourceVersion;
import javax.lang.model.element.AnnotationMirror;
import javax.lang.model.element.AnnotationValue;
import javax.lang.model.element.Element;
@@ -231,6 +230,15 @@ class ProcessingContext implements Constants {
}
}
private String trimAnnotations(String type) {
int pos = type.indexOf("@");
if (pos == -1) {
return type;
}
String remainder = type.substring(0, pos) + type.substring(type.indexOf(' ') + 1);
return trimAnnotations(remainder);
}
PropertyType getPropertyType(VariableElement field) {
TypeMirror typeMirror = field.asType();
@@ -296,9 +304,9 @@ class ProcessingContext implements Constants {
return result;
} else {
if (typeInstanceOf(typeMirror, "java.lang.Comparable")) {
return new PropertyTypeScalarComparable(typeMirror.toString());
return new PropertyTypeScalarComparable(trimAnnotations(typeMirror.toString()));
} else {
return new PropertyTypeScalar(typeMirror.toString());
return new PropertyTypeScalar(trimAnnotations(typeMirror.toString()));
}
}
}