Author: reschke
Date: Tue May 28 12:38:36 2019
New Revision: 1860255
URL: http://svn.apache.org/viewvc?rev=1860255&view=rev
Log:
OAK-8232: Node#setPrimaryType(String) does not create child nodes defined as
autoCreated (ported to 1.10)
NodeImpl will now auto-create child nodes when a new primary type requires that.
Modified:
jackrabbit/oak/branches/1.10/ (props changed)
jackrabbit/oak/branches/1.10/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/session/NodeImpl.java
jackrabbit/oak/branches/1.10/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/nodetype/NodeTypeTest.java
Propchange: jackrabbit/oak/branches/1.10/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue May 28 12:38:36 2019
@@ -1,3 +1,3 @@
/jackrabbit/oak/branches/1.0:1665962
-/jackrabbit/oak/trunk:1850874,1850882,1851236,1851253,1851451,1851533-1851535,1851619,1852052,1852084,1852120,1852135,1852451,1852492-1852493,1852528,1852582,1852584,1852601,1852920,1853083,1853141,1853229,1853393,1853429,1853433,1853441,1853866,1853868,1853870,1853893,1853969,1853997,1854034,1854044,1854055,1854058,1854113,1854373,1854377,1854380,1854385,1854401,1854403,1854455,1854461-1854462,1854466,1854468,1854515,1854533,1854539,1854701,1854773-1854774,1854827,1854848,1854859,1854930,1854990-1854991,1855032,1855221,1855477-1855478,1855776,1855993,1856049,1856056,1856538,1856545,1857000,1857010,1857104,1857159,1857212,1857221,1857238,1857247,1857253,1857294,1857314,1857577,1857635,1857638,1857640,1857687,1857936,1858032,1858053,1858123,1858139,1858571,1858578,1858810,1858926,1858931,1859231,1859292,1859294,1859619,1859716,1859776,1859780,1859843,1859854,1859881,1860202
+/jackrabbit/oak/trunk:1850874,1850882,1851236,1851253,1851451,1851533-1851535,1851619,1852052,1852084,1852120,1852135,1852451,1852492-1852493,1852528,1852582,1852584,1852601,1852920,1853083,1853141,1853229,1853393,1853429,1853433,1853441,1853866,1853868,1853870,1853893,1853969,1853997,1854034,1854044,1854055,1854058,1854113,1854373,1854377,1854380,1854385,1854401,1854403,1854455,1854461-1854462,1854466,1854468,1854515,1854533,1854539,1854701,1854773-1854774,1854827,1854848,1854859,1854930,1854990-1854991,1855032,1855221,1855477-1855478,1855776,1855993,1856049,1856056,1856538,1856545,1857000,1857010,1857104,1857159,1857212,1857221,1857238,1857247,1857253,1857294,1857314,1857577,1857589,1857592,1857635,1857638,1857640,1857687,1857936,1858032,1858053,1858123,1858139,1858571,1858578,1858810,1858926,1858931,1859231,1859292,1859294,1859619,1859716,1859776,1859780,1859843,1859854,1859881,1860202
/jackrabbit/trunk:1345480
Modified:
jackrabbit/oak/branches/1.10/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/session/NodeImpl.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.10/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/session/NodeImpl.java?rev=1860255&r1=1860254&r2=1860255&view=diff
==============================================================================
---
jackrabbit/oak/branches/1.10/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/session/NodeImpl.java
(original)
+++
jackrabbit/oak/branches/1.10/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/session/NodeImpl.java
Tue May 28 12:38:36 2019
@@ -92,6 +92,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;
@@ -1362,6 +1363,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/branches/1.10/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/nodetype/NodeTypeTest.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.10/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/nodetype/NodeTypeTest.java?rev=1860255&r1=1860254&r2=1860255&view=diff
==============================================================================
---
jackrabbit/oak/branches/1.10/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/nodetype/NodeTypeTest.java
(original)
+++
jackrabbit/oak/branches/1.10/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/nodetype/NodeTypeTest.java
Tue May 28 12:38:36 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();
