Merge pull request #3611 from ebean-orm/feature/fix-native-image-mappedSuper

Fix NPE with native-image with @MappedSuperclass

Author: rbygrave

ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssocOne.java

@@ -1,6 +1,5 @@
 package io.ebeaninternal.server.deploy;
 
-import io.ebean.Query;
 import io.ebean.SqlUpdate;
 import io.ebean.Transaction;
 import io.ebean.ValuePair;
@@ -125,6 +124,10 @@ private void initialiseAssocOne(String embeddedPrefix) {
         // no imported or exported information
       } else if (!oneToOneExported) {
         importedId = createImportedId(this, targetDescriptor, tableJoin);
+        if (importedId == null) {
+          throw new PersistenceException("Cannot find imported id for " + fullName() + " from " + targetDescriptor
+          + ". If using native-image, possibly missing reflect-config for the Id property.");
+        }
         if (importedId.isScalar()) {
           // limit JoinColumn mapping to the @Id / primary key
           TableJoinColumn[] columns = tableJoin.columns();

querybean-generator/src/main/java/io/ebean/querybean/generator/ProcessingContext.java

@@ -66,6 +66,7 @@ class ProcessingContext implements Constants {
    * Entity classes for the default database.
    */
   private final Set<String> dbEntities = new TreeSet<>();
+  private final Set<String> dbMappedSuper = new TreeSet<>();
 
   /**
    * Entity classes for non default databases.
@@ -104,6 +105,10 @@ TypeElement embeddableAnnotation() {
     return elementUtils.getTypeElement(EMBEDDABLE);
   }
 
+  TypeElement mappedSuperclassAnnotation() {
+    return elementUtils.getTypeElement(MAPPED_SUPERCLASS);
+  }
+
   TypeElement converterAnnotation() {
     return elementUtils.getTypeElement(CONVERTER);
   }
@@ -565,4 +570,12 @@ Element asElement(TypeMirror mirror) {
   boolean isNameClash(String shortName) {
     return propertyTypeMap.isNameClash(shortName);
   }
+
+  void addMappedSuper(String fullName) {
+    dbMappedSuper.add(fullName);
+  }
+
+  Set<String> getMappedSuper() {
+    return dbMappedSuper;
+  }
 }

querybean-generator/src/main/java/io/ebean/querybean/generator/Processor.java

@@ -75,9 +75,17 @@ private int processEntities(RoundEnvironment roundEnv) {
       generateQueryBeans(element);
       count++;
     }
+    for (Element element : roundEnv.getElementsAnnotatedWith(processingContext.mappedSuperclassAnnotation())) {
+      addMappedSuperclasses(element);
+    }
     return count;
   }
 
+  private void addMappedSuperclasses(Element element) {
+    String fullName = ((TypeElement)element).getQualifiedName().toString();
+    processingContext.addMappedSuper(fullName);
+  }
+
   private void processOthers(RoundEnvironment round) {
     processOthers(round, processingContext.converterAnnotation());
     processOthers(round, processingContext.componentAnnotation());

querybean-generator/src/main/java/io/ebean/querybean/generator/SimpleModuleInfoWriter.java

@@ -88,7 +88,7 @@ private void writeNativeImageFile() {
       for (Set<String> value : processingContext.getOtherDbEntities().values()) {
         allEntities.addAll(value);
       }
-
+      allEntities.addAll(processingContext.getMappedSuper());
       if (!allEntities.isEmpty()) {
         FileObject jfo = processingContext.createNativeImageWriter(factoryPackage + ".ebean-entity");
         if (jfo != null) {