adopted the web demo to work with hibernate 5.0

Blazebit · Nov 15, 2016 · 94ad52c · 94ad52c
1 parent de30a66
commit 94ad52c
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/web-demo/src/main/java/com/blazebit/presentation/demo/rest/CatSubResource.java b/web-demo/src/main/java/com/blazebit/presentation/demo/rest/CatSubResource.java
@@ -89,10 +89,11 @@ public <T> List<T> getCatHierarchy(Integer catId, EntityViewSetting<T, CriteriaB
                     .endOr()
                 .end()
                 .from(Cat.class, "cat")
-                .innerJoinOn(CatHierarchyCTE.class, "cte").on("cte.id").eqExpression("cat.id").end()
+                .from(CatHierarchyCTE.class, "cte")
+                .where("cte.id").eqExpression("cat.id")
                 .groupBy("cat.id")
                 .orderByAsc("cte.generation");
 
-        return evm.applySetting(setting, cb).getResultList();
+        return evm.applySetting(setting, cb, "cat").getResultList();
     }
 }
diff --git a/web-demo/src/main/java/com/blazebit/presentation/demo/view/CatFamilyTreeView.java b/web-demo/src/main/java/com/blazebit/presentation/demo/view/CatFamilyTreeView.java
@@ -28,7 +28,7 @@
  * @since 1.2
  */
 @EntityView(Cat.class)
-public interface CatFamilyTreeView extends CatView{
+public interface CatFamilyTreeView extends CatView {
 
     CatView getMother();
 
@@ -44,8 +44,8 @@ public <T> T createSubquery(SubqueryInitiator<T> subqueryInitiator) {
             return subqueryInitiator.from(Cat.class)
                     .select("COUNT(*)")
                     .whereOr()
-                        .where("father.id").eqExpression("OUTER(id)")
-                        .where("mother.id").eqExpression("OUTER(id)")
+                        .where("father.id").eqExpression("VIEW_ROOT(id)")
+                        .where("mother.id").eqExpression("VIEW_ROOT(id)")
                     .endOr()
                     .end();
         }