RS-6567: AddChild method is not working if child is hibernate proxy

infofabrik · Dec 7, 2022 · 243aa31 · 243aa31
1 parent eaf9128
commit 243aa31
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 5 deletions.
diff --git a/src/net/datenwerke/treedb/service/treedb/AbstractNode.java b/src/net/datenwerke/treedb/service/treedb/AbstractNode.java
@@ -332,14 +332,18 @@ final public void addChild(N child) {
       addChild(child, children.size() + 1);
    }
 
-   final public void addChild(N child, int position) {
+   final public void addChild(N childObj, int position) {
+      N child = childObj;
+      if (childObj instanceof HibernateProxy)
+         childObj = (N) ((HibernateProxy) childObj).getHibernateLazyInitializer().getImplementation();
+
       /* make sure child is not denied */
       boolean foundInListOfDeniedChildren = false;
       for (Class<?> potentialChild : getDeniedChildren()) {
          try {
             potentialChild.cast(child);
             if (foundInListOfDeniedChildren)
-               throw new UnsupportedChildException(this.getClass(), child.getClass());
+               throw new UnsupportedChildException(this, child);
          } catch (ClassCastException e) {
          }
       }
@@ -355,7 +359,7 @@ final public void addChild(N child, int position) {
          }
       }
       if (!foundInListOfAllowedChildren)
-         throw new UnsupportedChildException(this.getClass(), child.getClass());
+         throw new UnsupportedChildException(this, child);
 
       if (child.getParent() != null)
          child.getParent().removeChild(child);

diff --git a/src/net/datenwerke/treedb/service/treedb/exceptions/UnsupportedChildException.java b/src/net/datenwerke/treedb/service/treedb/exceptions/UnsupportedChildException.java
@@ -10,8 +10,23 @@ public class UnsupportedChildException extends TreeDBRuntimeException {
     */
    private static final long serialVersionUID = -5119598342580086538L;
 
-   public UnsupportedChildException(Class<? extends AbstractNode> parent, Class<? extends AbstractNode> child) {
-      super(TreeDbMessages.INSTANCE.exceptionUnsupportedChild(child.getSimpleName(), parent.getSimpleName()));
+   public UnsupportedChildException(AbstractNode<?> parent, AbstractNode<?> child) {
+      super(TreeDbMessages.INSTANCE.exceptionUnsupportedChild(getNodeInfo(child),
+            getNodeInfo(parent)));
+   }
+
+   private static String getNodeInfo(AbstractNode<?> node) {
+      StringBuilder sb = new StringBuilder();
+      sb.append("(class: ")
+         .append(node.getClass().getSimpleName())
+         .append(", ")
+         .append("id: ")
+         .append(node.getId())
+         .append(", ")
+         .append("name: ")
+         .append(node.getNodeName())
+         .append(")");
+      return sb.toString();
    }
 
 }