[Blazebit#728] Fix NPE during entity type id resolving for deltaspike…

… repository method using the plain entity type
beikov · Feb 19, 2019 · acb433b · acb433b
1 parent 3e230f1
commit acb433b
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 2 deletions.
diff --git a/...va/com/blazebit/persistence/deltaspike/data/impl/handler/EntityViewRepositoryHandler.java b/...va/com/blazebit/persistence/deltaspike/data/impl/handler/EntityViewRepositoryHandler.java
@@ -94,7 +94,13 @@ protected String entityName() {
 
     @Override
     protected String idAttribute() {
-        Class<?> entityClass = context.getEntityViewManager().getMetamodel().view(viewClass()).getEntityClass();
+        Class<V> viewClass = viewClass();
+        Class<?> entityClass;
+        if (viewClass == null) {
+            entityClass = entityClass();
+        } else {
+            entityClass = context.getEntityViewManager().getMetamodel().view(viewClass).getEntityClass();
+        }
         EntityType<?> entityType = context.getEntityManager().getMetamodel().entity(entityClass);
         return JpaMetamodelUtils.getSingleIdAttribute(entityType).getName();
     }

diff --git a/...va/com/blazebit/persistence/deltaspike/data/impl/handler/EntityViewRepositoryHandler.java b/...va/com/blazebit/persistence/deltaspike/data/impl/handler/EntityViewRepositoryHandler.java
@@ -94,7 +94,13 @@ protected String entityName() {
 
     @Override
     protected String idAttribute() {
-        Class<?> entityClass = context.getEntityViewManager().getMetamodel().view(viewClass()).getEntityClass();
+        Class<V> viewClass = viewClass();
+        Class<?> entityClass;
+        if (viewClass == null) {
+            entityClass = entityClass();
+        } else {
+            entityClass = context.getEntityViewManager().getMetamodel().view(viewClass).getEntityClass();
+        }
         EntityType<?> entityType = context.getEntityManager().getMetamodel().entity(entityClass);
         return JpaMetamodelUtils.getSingleIdAttribute(entityType).getName();
     }