svn commit: r1857589 - in /jackrabbit/oak/trunk/oak-jcr/src: main/java/org/apache/jackrabbit/oak/jcr/session/NodeImpl.java test/java/org/apache/jackrabbit/oak/jcr/nodetype/NodeTypeTest.java

[baedke]

Author: baedke
Date: Mon Apr 15 14:49:25 2019
New Revision: 1857589

URL: http://svn.apache.org/viewvc?rev=1857589&view=rev
Log:
OAK-8232: Node#setPrimaryType(String) does not create child nodes defined as 
autoCreated

NodeImpl will now auto-create child nodes when a new primary type requires that.

Modified:
    
jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/session/NodeImpl.java
    
jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/nodetype/NodeTypeTest.java

Modified: 
jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/session/NodeImpl.java
URL: 
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/session/NodeImpl.java?rev=1857589&r1=1857588&r2=1857589&view=diff
==============================================================================
--- 
jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/session/NodeImpl.java
 (original)
+++ 
jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/session/NodeImpl.java
 Mon Apr 15 14:49:25 2019
@@ -57,6 +57,7 @@ import javax.jcr.Value;
 import javax.jcr.lock.Lock;
 import javax.jcr.lock.LockManager;
 import javax.jcr.nodetype.ConstraintViolationException;
+import javax.jcr.nodetype.NoSuchNodeTypeException;
 import javax.jcr.nodetype.NodeDefinition;
 import javax.jcr.nodetype.NodeType;
 import javax.jcr.nodetype.NodeTypeManager;
@@ -93,6 +94,7 @@ import org.apache.jackrabbit.oak.plugins
 import org.apache.jackrabbit.oak.plugins.memory.PropertyStates;
 import org.apache.jackrabbit.oak.spi.nodetype.EffectiveNodeType;
 import org.apache.jackrabbit.oak.plugins.tree.factories.RootFactory;
+import org.apache.jackrabbit.oak.spi.nodetype.NodeTypeConstants;
 import 
org.apache.jackrabbit.oak.spi.security.authorization.permission.Permissions;
 import org.apache.jackrabbit.oak.plugins.tree.TreeUtil;
 import org.apache.jackrabbit.value.ValueHelper;
@@ -1363,6 +1365,11 @@ public class NodeImpl<T extends NodeDele
         PropertyState state = PropertyStates.createProperty(
                 JCR_PRIMARYTYPE, getOakName(nodeTypeName), NAME);
         dlg.setProperty(state, true, true);
+
+        Tree typeRoot = 
sessionDelegate.getRoot().getTree(NodeTypeConstants.NODE_TYPES_PATH);
+        TreeUtil.autoCreateItems(
+                dlg.getTree(), typeRoot.getChild(nodeTypeName), typeRoot, 
sessionDelegate.getAuthInfo().getUserID());
+
         dlg.setOrderableChildren(nt.hasOrderableChildNodes());
     }
 

Modified: 
jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/nodetype/NodeTypeTest.java
URL: 
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/nodetype/NodeTypeTest.java?rev=1857589&r1=1857588&r2=1857589&view=diff
==============================================================================
--- 
jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/nodetype/NodeTypeTest.java
 (original)
+++ 
jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/nodetype/NodeTypeTest.java
 Mon Apr 15 14:49:25 2019
@@ -33,6 +33,7 @@ import javax.jcr.PropertyType;
 import javax.jcr.Session;
 import javax.jcr.ValueFactory;
 import javax.jcr.nodetype.ConstraintViolationException;
+import javax.jcr.nodetype.NodeDefinitionTemplate;
 import javax.jcr.nodetype.NodeTypeDefinition;
 import javax.jcr.nodetype.NodeTypeManager;
 import javax.jcr.nodetype.NodeTypeTemplate;
@@ -82,6 +83,31 @@ public class NodeTypeTest extends Abstra
         session.save();
     }
 
+    @Test
+    public void setPrimaryTypeWithMandatoryAutoCreatedChild() throws Exception 
{
+        Session session = getAdminSession();
+        Node root = session.getRootNode();
+        NodeTypeManager manager = session.getWorkspace().getNodeTypeManager();
+
+        NodeTypeTemplate ntt = 
manager.createNodeTypeTemplate(manager.getNodeType(JcrConstants.NT_QUERY));
+        ntt.setName("rep:test");
+
+        NodeDefinitionTemplate ndt = manager.createNodeDefinitionTemplate();
+        ndt.setName("mandatoryAutoCreated");
+        ndt.setAutoCreated(true);
+        ndt.setMandatory(true);
+        ndt.setDefaultPrimaryTypeName(JcrConstants.NT_UNSTRUCTURED);
+        ndt.setRequiredPrimaryTypeNames(new String[] 
{JcrConstants.NT_UNSTRUCTURED});
+
+        ntt.getNodeDefinitionTemplates().add(ndt);
+
+        manager.registerNodeType(ntt, true);
+
+        Node node = root.addNode("a", JcrConstants.NT_UNSTRUCTURED);
+        node.setPrimaryType("rep:test");
+        session.save();
+    }
+
     @Test
     public void updateNodeType() throws Exception {
         Session session = getAdminSession();