You are viewing a plain text version of this content. The canonical link for it is here.
Posted to oak-commits@jackrabbit.apache.org by an...@apache.org on 2016/05/03 11:54:13 UTC
svn commit: r1742077 - in /jackrabbit/oak/trunk/oak-core/src:
main/java/org/apache/jackrabbit/oak/util/TreeUtil.java
test/java/org/apache/jackrabbit/oak/util/TreeUtilTest.java
Author: angela
Date: Tue May 3 09:54:13 2016
New Revision: 1742077
URL: http://svn.apache.org/viewvc?rev=1742077&view=rev
Log:
OAK-4325 : Autocreation of properties fails if user id is null
Added:
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/util/TreeUtilTest.java
Modified:
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/util/TreeUtil.java
Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/util/TreeUtil.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/util/TreeUtil.java?rev=1742077&r1=1742076&r2=1742077&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/util/TreeUtil.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/util/TreeUtil.java Tue May 3 09:54:13 2016
@@ -26,6 +26,7 @@ import javax.jcr.RepositoryException;
import javax.jcr.nodetype.ConstraintViolationException;
import javax.jcr.nodetype.NoSuchNodeTypeException;
+import com.google.common.base.Strings;
import com.google.common.collect.Iterables;
import com.google.common.collect.Lists;
import com.google.common.collect.Sets;
@@ -304,16 +305,12 @@ public final class TreeUtil {
String now = ISO8601.format(Calendar.getInstance());
return PropertyStates.createProperty(name, now, DATE);
} else if (JCR_CREATEDBY.equals(name)) {
- if (userID != null) {
- return PropertyStates.createProperty(name, userID, STRING);
- }
+ return PropertyStates.createProperty(name, Strings.nullToEmpty(userID), STRING);
} else if (JCR_LASTMODIFIED.equals(name)) {
String now = ISO8601.format(Calendar.getInstance());
return PropertyStates.createProperty(name, now, DATE);
} else if (JCR_LASTMODIFIEDBY.equals(name)) {
- if (userID != null) {
- return PropertyStates.createProperty(name, userID, STRING);
- }
+ return PropertyStates.createProperty(name, Strings.nullToEmpty(userID), STRING);
}
// does the definition have a default value?
Added: jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/util/TreeUtilTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/util/TreeUtilTest.java?rev=1742077&view=auto
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/util/TreeUtilTest.java (added)
+++ jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/util/TreeUtilTest.java Tue May 3 09:54:13 2016
@@ -0,0 +1,67 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.jackrabbit.oak.util;
+
+import org.apache.jackrabbit.JcrConstants;
+import org.apache.jackrabbit.oak.api.PropertyState;
+import org.apache.jackrabbit.oak.api.Tree;
+import org.apache.jackrabbit.oak.AbstractSecurityTest;
+import org.apache.jackrabbit.oak.api.Type;
+import org.apache.jackrabbit.oak.plugins.nodetype.NodeTypeConstants;
+import org.junit.Test;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+
+public class TreeUtilTest extends AbstractSecurityTest {
+
+ @Test
+ public void testJcrCreatedBy() throws Exception {
+ Tree tree = TreeUtil.addChild(root.getTree("/"), "test", JcrConstants.NT_FOLDER, root.getTree(NodeTypeConstants.NODE_TYPES_PATH), "userId");
+ PropertyState ps = tree.getProperty(NodeTypeConstants.JCR_CREATEDBY);
+ assertNotNull(ps);
+ assertEquals("userId", ps.getValue(Type.STRING));
+ }
+
+ @Test
+ public void testJcrCreatedByNullUserId() throws Exception {
+ Tree tree = TreeUtil.addChild(root.getTree("/"), "test", JcrConstants.NT_FOLDER, root.getTree(NodeTypeConstants.NODE_TYPES_PATH), null);
+ PropertyState ps = tree.getProperty(NodeTypeConstants.JCR_CREATEDBY);
+ assertNotNull(ps);
+ assertEquals("", ps.getValue(Type.STRING));
+ }
+
+ @Test
+ public void testJcrLastModifiedBy() throws Exception {
+ Tree ntRoot = root.getTree(NodeTypeConstants.NODE_TYPES_PATH);
+ Tree tree = TreeUtil.addChild(root.getTree("/"), "test", NodeTypeConstants.NT_OAK_UNSTRUCTURED, ntRoot, "userId");
+ TreeUtil.addMixin(tree, NodeTypeConstants.MIX_LASTMODIFIED, ntRoot, "userId");
+ PropertyState ps = tree.getProperty(NodeTypeConstants.JCR_LASTMODIFIEDBY);
+ assertNotNull(ps);
+ assertEquals("userId", ps.getValue(Type.STRING));
+ }
+
+ @Test
+ public void testJcrLastModifiedByNullUserId() throws Exception {
+ Tree ntRoot = root.getTree(NodeTypeConstants.NODE_TYPES_PATH);
+ Tree tree = TreeUtil.addChild(root.getTree("/"), "test", NodeTypeConstants.NT_OAK_UNSTRUCTURED, ntRoot, null);
+ TreeUtil.addMixin(tree, NodeTypeConstants.MIX_LASTMODIFIED, ntRoot, null);
+ PropertyState ps = tree.getProperty(NodeTypeConstants.JCR_LASTMODIFIEDBY);
+ assertNotNull(ps);
+ assertEquals("", ps.getValue(Type.STRING));
+ }
+}
\ No newline at end of file