Author: angela
Date: Fri Sep 22 09:36:31 2017
New Revision: 1809287
URL: http://svn.apache.org/viewvc?rev=1809287&view=rev
Log:
OAK-6698 : Refactor UUID utilites from IdentifierManager to new UUIDUtils in
oak-commons
Added:
jackrabbit/oak/trunk/oak-commons/src/main/java/org/apache/jackrabbit/oak/commons/UUIDUtils.java
(with props)
Modified:
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/identifier/IdentifierManager.java
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/nodetype/NodeTypeImpl.java
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/nodetype/TypeEditor.java
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/tree/TreeUtil.java
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/value/jcr/ValueFactoryImpl.java
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/version/ReadWriteVersionManager.java
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/version/VersionableState.java
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/AuthorizableBaseProvider.java
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/namepath/NamePathMapperImplTest.java
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/identifier/IdentifierManagerTest.java
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/observation/filter/UuidPredicateTest.java
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/security/authorization/evaluation/JcrUUIDTest.java
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/security/user/UserValidatorTest.java
jackrabbit/oak/trunk/oak-it/src/test/java/org/apache/jackrabbit/oak/composite/AtomicCompositeMergeTest.java
jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/delegate/WorkspaceDelegate.java
Added:
jackrabbit/oak/trunk/oak-commons/src/main/java/org/apache/jackrabbit/oak/commons/UUIDUtils.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-commons/src/main/java/org/apache/jackrabbit/oak/commons/UUIDUtils.java?rev=1809287&view=auto
==============================================================================
---
jackrabbit/oak/trunk/oak-commons/src/main/java/org/apache/jackrabbit/oak/commons/UUIDUtils.java
(added)
+++
jackrabbit/oak/trunk/oak-commons/src/main/java/org/apache/jackrabbit/oak/commons/UUIDUtils.java
Fri Sep 22 09:36:31 2017
@@ -0,0 +1,47 @@
+/*
+ * 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.commons;
+
+import java.util.UUID;
+import javax.annotation.Nonnull;
+
+import com.google.common.base.Charsets;
+
+public final class UUIDUtils {
+
+ private UUIDUtils() {}
+
+ @Nonnull
+ public static String generateUUID() {
+ return UUID.randomUUID().toString();
+ }
+
+ @Nonnull
+ public static String generateUUID(String hint) {
+ UUID uuid = UUID.nameUUIDFromBytes(hint.getBytes(Charsets.UTF_8));
+ return uuid.toString();
+ }
+
+ public static boolean isValidUUID(String uuid) {
+ try {
+ UUID.fromString(uuid);
+ return true;
+ } catch (IllegalArgumentException e) {
+ return false;
+ }
+ }
+}
\ No newline at end of file
Propchange:
jackrabbit/oak/trunk/oak-commons/src/main/java/org/apache/jackrabbit/oak/commons/UUIDUtils.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified:
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/identifier/IdentifierManager.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/identifier/IdentifierManager.java?rev=1809287&r1=1809286&r2=1809287&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/identifier/IdentifierManager.java
(original)
+++
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/identifier/IdentifierManager.java
Fri Sep 22 09:36:31 2017
@@ -20,7 +20,6 @@ import java.text.ParseException;
import java.util.Collections;
import java.util.Iterator;
import java.util.Map;
-import java.util.UUID;
import javax.annotation.CheckForNull;
import javax.annotation.Nonnull;
@@ -28,7 +27,6 @@ import javax.annotation.Nullable;
import javax.jcr.PropertyType;
import javax.jcr.query.Query;
-import com.google.common.base.Charsets;
import com.google.common.base.Function;
import com.google.common.base.Predicate;
import com.google.common.collect.Iterables;
@@ -45,9 +43,9 @@ import org.apache.jackrabbit.oak.api.Tre
import org.apache.jackrabbit.oak.api.Type;
import org.apache.jackrabbit.oak.commons.PathUtils;
import org.apache.jackrabbit.oak.commons.QueryUtils;
+import org.apache.jackrabbit.oak.commons.UUIDUtils;
import org.apache.jackrabbit.oak.namepath.NamePathMapper;
import org.apache.jackrabbit.oak.plugins.memory.StringPropertyState;
-import org.apache.jackrabbit.oak.spi.nodetype.EffectiveNodeTypeProvider;
import org.apache.jackrabbit.oak.plugins.nodetype.ReadOnlyNodeTypeManager;
import org.apache.jackrabbit.oak.spi.version.VersionConstants;
import org.apache.jackrabbit.oak.plugins.memory.PropertyValues;
@@ -77,24 +75,27 @@ public class IdentifierManager {
this.nodeTypeManager = ReadOnlyNodeTypeManager.getInstance(root,
NamePathMapper.DEFAULT);
}
+ /**
+ * @deprecated Use {@link UUIDUtils#generateUUID()}
+ */
@Nonnull
public static String generateUUID() {
- return UUID.randomUUID().toString();
+ return UUIDUtils.generateUUID();
}
+ /**
+ * @deprecated Use {@link UUIDUtils#generateUUID(String)}
+ */
@Nonnull
public static String generateUUID(String hint) {
- UUID uuid = UUID.nameUUIDFromBytes(hint.getBytes(Charsets.UTF_8));
- return uuid.toString();
+ return UUIDUtils.generateUUID(hint);
}
+ /**
+ * @deprecated Use {@link UUIDUtils#isValidUUID(String)} (String)}
+ */
public static boolean isValidUUID(String uuid) {
- try {
- UUID.fromString(uuid);
- return true;
- } catch (IllegalArgumentException e) {
- return false;
- }
+ return UUIDUtils.isValidUUID(uuid);
}
/**
@@ -133,7 +134,7 @@ public class IdentifierManager {
? identifier
: identifier.substring(0, k);
- checkArgument(isValidUUID(uuid), "Not a valid identifier '" +
identifier + '\'');
+ checkArgument(UUIDUtils.isValidUUID(uuid), "Not a valid identifier
'" + identifier + '\'');
String basePath = resolveUUID(uuid);
if (basePath == null) {
Modified:
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/nodetype/NodeTypeImpl.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/nodetype/NodeTypeImpl.java?rev=1809287&r1=1809286&r2=1809287&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/nodetype/NodeTypeImpl.java
(original)
+++
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/nodetype/NodeTypeImpl.java
Fri Sep 22 09:36:31 2017
@@ -76,10 +76,10 @@ import org.apache.jackrabbit.commons.ite
import org.apache.jackrabbit.oak.api.PropertyState;
import org.apache.jackrabbit.oak.api.Tree;
import org.apache.jackrabbit.oak.api.Type;
+import org.apache.jackrabbit.oak.commons.UUIDUtils;
import org.apache.jackrabbit.oak.namepath.JcrNameParser;
import org.apache.jackrabbit.oak.namepath.JcrPathParser;
import org.apache.jackrabbit.oak.namepath.NamePathMapper;
-import org.apache.jackrabbit.oak.plugins.identifier.IdentifierManager;
import org.apache.jackrabbit.oak.plugins.nodetype.constraint.Constraints;
import org.apache.jackrabbit.oak.plugins.tree.TreeUtil;
import org.slf4j.Logger;
@@ -626,7 +626,7 @@ class NodeTypeImpl extends AbstractTypeD
}
case PropertyType.REFERENCE:
case PropertyType.WEAKREFERENCE:
- return IdentifierManager.isValidUUID(value.getString());
+ return UUIDUtils.isValidUUID(value.getString());
case PropertyType.URI:
new URI(value.getString());
return true;
Modified:
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/nodetype/TypeEditor.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/nodetype/TypeEditor.java?rev=1809287&r1=1809286&r2=1809287&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/nodetype/TypeEditor.java
(original)
+++
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/nodetype/TypeEditor.java
Fri Sep 22 09:36:31 2017
@@ -30,7 +30,7 @@ import static org.apache.jackrabbit.oak.
import static org.apache.jackrabbit.oak.api.Type.NAME;
import static org.apache.jackrabbit.oak.api.Type.STRING;
import static org.apache.jackrabbit.oak.api.Type.STRINGS;
-import static
org.apache.jackrabbit.oak.plugins.identifier.IdentifierManager.isValidUUID;
+import static org.apache.jackrabbit.oak.commons.UUIDUtils.isValidUUID;
import static
org.apache.jackrabbit.oak.plugins.memory.EmptyNodeState.EMPTY_NODE;
import static
org.apache.jackrabbit.oak.plugins.memory.EmptyNodeState.MISSING_NODE;
import static
org.apache.jackrabbit.oak.spi.nodetype.NodeTypeConstants.JCR_IS_ABSTRACT;
Modified:
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/tree/TreeUtil.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/tree/TreeUtil.java?rev=1809287&r1=1809286&r2=1809287&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/tree/TreeUtil.java
(original)
+++
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/tree/TreeUtil.java
Fri Sep 22 09:36:31 2017
@@ -38,7 +38,7 @@ import org.apache.jackrabbit.oak.api.Pro
import org.apache.jackrabbit.oak.api.Tree;
import org.apache.jackrabbit.oak.api.Type;
import org.apache.jackrabbit.oak.commons.PathUtils;
-import org.apache.jackrabbit.oak.plugins.identifier.IdentifierManager;
+import org.apache.jackrabbit.oak.commons.UUIDUtils;
import org.apache.jackrabbit.oak.plugins.memory.PropertyStates;
import org.apache.jackrabbit.oak.spi.nodetype.NodeTypeConstants;
import org.apache.jackrabbit.oak.plugins.tree.impl.ImmutableTree;
@@ -357,7 +357,7 @@ public final class TreeUtil {
@Nonnull Tree definition,
@CheckForNull String
userID) {
if (JCR_UUID.equals(name)) {
- String uuid = IdentifierManager.generateUUID();
+ String uuid = UUIDUtils.generateUUID();
return PropertyStates.createProperty(name, uuid, STRING);
} else if (JCR_CREATED.equals(name)) {
String now = ISO8601.format(Calendar.getInstance());
Modified:
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/value/jcr/ValueFactoryImpl.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/value/jcr/ValueFactoryImpl.java?rev=1809287&r1=1809286&r2=1809287&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/value/jcr/ValueFactoryImpl.java
(original)
+++
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/value/jcr/ValueFactoryImpl.java
Fri Sep 22 09:36:31 2017
@@ -39,11 +39,11 @@ import org.apache.jackrabbit.oak.api.Blo
import org.apache.jackrabbit.oak.api.PropertyState;
import org.apache.jackrabbit.oak.api.PropertyValue;
import org.apache.jackrabbit.oak.api.Root;
+import org.apache.jackrabbit.oak.commons.UUIDUtils;
import org.apache.jackrabbit.oak.commons.benchmark.PerfLogger;
import org.apache.jackrabbit.oak.namepath.JcrNameParser;
import org.apache.jackrabbit.oak.namepath.JcrPathParser;
import org.apache.jackrabbit.oak.namepath.NamePathMapper;
-import org.apache.jackrabbit.oak.plugins.identifier.IdentifierManager;
import org.apache.jackrabbit.oak.plugins.memory.BinaryPropertyState;
import org.apache.jackrabbit.oak.plugins.memory.BooleanPropertyState;
import org.apache.jackrabbit.oak.plugins.memory.DecimalPropertyState;
@@ -260,12 +260,12 @@ public class ValueFactoryImpl implements
}
return newValue(GenericPropertyState.pathProperty("",
oakValue), namePathMapper);
case PropertyType.REFERENCE:
- if (!IdentifierManager.isValidUUID(value)) {
+ if (!UUIDUtils.isValidUUID(value)) {
throw new ValueFormatException("Invalid reference
value " + value);
}
return newValue(GenericPropertyState.referenceProperty("",
value), namePathMapper);
case PropertyType.WEAKREFERENCE:
- if (!IdentifierManager.isValidUUID(value)) {
+ if (!UUIDUtils.isValidUUID(value)) {
throw new ValueFormatException("Invalid weak reference
value " + value);
}
return
newValue(GenericPropertyState.weakreferenceProperty("", value), namePathMapper);
@@ -277,9 +277,7 @@ public class ValueFactoryImpl implements
default:
throw new ValueFormatException("Invalid type: " + type);
}
- } catch (NumberFormatException e) {
- throw new ValueFormatException("Invalid value " + value + " for
type " + PropertyType.nameFromValue(type), e);
- } catch (URISyntaxException e) {
+ } catch (NumberFormatException | URISyntaxException e) {
throw new ValueFormatException("Invalid value " + value + " for
type " + PropertyType.nameFromValue(type), e);
}
}
Modified:
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/version/ReadWriteVersionManager.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/version/ReadWriteVersionManager.java?rev=1809287&r1=1809286&r2=1809287&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/version/ReadWriteVersionManager.java
(original)
+++
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/version/ReadWriteVersionManager.java
Fri Sep 22 09:36:31 2017
@@ -38,8 +38,8 @@ import org.apache.jackrabbit.oak.api.Roo
import org.apache.jackrabbit.oak.api.Tree;
import org.apache.jackrabbit.oak.api.Type;
import org.apache.jackrabbit.oak.commons.PathUtils;
+import org.apache.jackrabbit.oak.commons.UUIDUtils;
import org.apache.jackrabbit.oak.namepath.NamePathMapper;
-import org.apache.jackrabbit.oak.plugins.identifier.IdentifierManager;
import org.apache.jackrabbit.oak.plugins.memory.PropertyBuilder;
import org.apache.jackrabbit.oak.plugins.nodetype.ReadOnlyNodeTypeManager;
import org.apache.jackrabbit.oak.plugins.nodetype.TypePredicate;
@@ -155,7 +155,7 @@ public class ReadWriteVersionManager ext
// jcr:versionableUuid property
node.setProperty(JCR_VERSIONABLEUUID, vUUID, Type.STRING);
node.setProperty(JCR_UUID,
- IdentifierManager.generateUUID(), Type.STRING);
+ UUIDUtils.generateUUID(), Type.STRING);
// jcr:versionLabels child node
NodeBuilder vLabels = node.child(JCR_VERSIONLABELS);
@@ -373,7 +373,7 @@ public class ReadWriteVersionManager ext
predecessors =
ImmutableList.copyOf(state.getValue(Type.REFERENCES));
version = vHistory.child(calculateVersion(vHistory, versionable));
}
- String versionUUID = IdentifierManager.generateUUID();
+ String versionUUID = UUIDUtils.generateUUID();
version.setProperty(JCR_UUID, versionUUID, Type.STRING);
version.setProperty(JCR_PRIMARYTYPE, NT_VERSION, Type.NAME);
version.setProperty(JCR_CREATED,
ISO8601.format(Calendar.getInstance()), Type.DATE);
Modified:
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/version/VersionableState.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/version/VersionableState.java?rev=1809287&r1=1809286&r2=1809287&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/version/VersionableState.java
(original)
+++
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/version/VersionableState.java
Fri Sep 22 09:36:31 2017
@@ -60,7 +60,7 @@ import org.apache.jackrabbit.oak.api.Com
import org.apache.jackrabbit.oak.api.PropertyState;
import org.apache.jackrabbit.oak.api.Tree;
import org.apache.jackrabbit.oak.api.Type;
-import org.apache.jackrabbit.oak.plugins.identifier.IdentifierManager;
+import org.apache.jackrabbit.oak.commons.UUIDUtils;
import org.apache.jackrabbit.oak.plugins.memory.EmptyNodeState;
import org.apache.jackrabbit.oak.plugins.memory.MemoryNodeBuilder;
import org.apache.jackrabbit.oak.plugins.memory.PropertyStates;
@@ -175,7 +175,7 @@ class VersionableState {
NodeBuilder node,
String nodeId) {
// initialize jcr:frozenNode
- frozen.setProperty(JCR_UUID, IdentifierManager.generateUUID(),
Type.STRING);
+ frozen.setProperty(JCR_UUID, UUIDUtils.generateUUID(), Type.STRING);
frozen.setProperty(JCR_PRIMARYTYPE, NT_FROZENNODE, Type.NAME);
List<String> mixinTypes;
if (node.hasProperty(JCR_MIXINTYPES)) {
Modified:
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/AuthorizableBaseProvider.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/AuthorizableBaseProvider.java?rev=1809287&r1=1809286&r2=1809287&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/AuthorizableBaseProvider.java
(original)
+++
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/AuthorizableBaseProvider.java
Fri Sep 22 09:36:31 2017
@@ -21,6 +21,7 @@ import javax.annotation.Nonnull;
import org.apache.jackrabbit.oak.api.Root;
import org.apache.jackrabbit.oak.api.Tree;
+import org.apache.jackrabbit.oak.commons.UUIDUtils;
import org.apache.jackrabbit.oak.plugins.identifier.IdentifierManager;
import org.apache.jackrabbit.oak.spi.security.ConfigurationParameters;
import org.apache.jackrabbit.oak.spi.security.user.AuthorizableType;
@@ -28,7 +29,7 @@ import org.apache.jackrabbit.oak.spi.sec
import org.apache.jackrabbit.oak.spi.security.user.util.UserUtil;
import static com.google.common.base.Preconditions.checkNotNull;
-import static
org.apache.jackrabbit.oak.plugins.identifier.IdentifierManager.generateUUID;
+import static org.apache.jackrabbit.oak.commons.UUIDUtils.generateUUID;
import static
org.apache.jackrabbit.oak.plugins.identifier.IdentifierManager.getIdentifier;
/**
@@ -86,6 +87,6 @@ abstract class AuthorizableBaseProvider
if (usercaseMappedProfile) {
s = java.text.Normalizer.normalize(s,
java.text.Normalizer.Form.NFKC);
}
- return generateUUID(s);
+ return UUIDUtils.generateUUID(s);
}
}
\ No newline at end of file
Modified:
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/namepath/NamePathMapperImplTest.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/namepath/NamePathMapperImplTest.java?rev=1809287&r1=1809286&r2=1809287&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/namepath/NamePathMapperImplTest.java
(original)
+++
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/namepath/NamePathMapperImplTest.java
Fri Sep 22 09:36:31 2017
@@ -29,7 +29,7 @@ import java.util.Map;
import javax.jcr.RepositoryException;
import com.google.common.collect.ImmutableMap;
-import org.apache.jackrabbit.oak.plugins.identifier.IdentifierManager;
+import org.apache.jackrabbit.oak.commons.UUIDUtils;
import org.junit.Test;
public class NamePathMapperImplTest {
@@ -53,7 +53,7 @@ public class NamePathMapperImplTest {
@Test
public void testInvalidIdentifierPath() {
- String uuid = IdentifierManager.generateUUID();
+ String uuid = UUIDUtils.generateUUID();
List<String> invalid = new ArrayList<String>();
invalid.add('[' + uuid + "]abc");
invalid.add('[' + uuid + "]/a/b/c");
Modified:
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/identifier/IdentifierManagerTest.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/identifier/IdentifierManagerTest.java?rev=1809287&r1=1809286&r2=1809287&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/identifier/IdentifierManagerTest.java
(original)
+++
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/identifier/IdentifierManagerTest.java
Fri Sep 22 09:36:31 2017
@@ -25,6 +25,7 @@ import org.apache.jackrabbit.oak.api.Pro
import org.apache.jackrabbit.oak.api.Root;
import org.apache.jackrabbit.oak.api.Tree;
import org.apache.jackrabbit.oak.api.Type;
+import org.apache.jackrabbit.oak.commons.UUIDUtils;
import org.apache.jackrabbit.oak.plugins.memory.PropertyStates;
import org.apache.jackrabbit.oak.InitialContent;
import org.apache.jackrabbit.oak.spi.security.OpenSecurityProvider;
@@ -37,8 +38,8 @@ import static org.junit.Assert.assertNul
import static org.junit.Assert.fail;
public class IdentifierManagerTest {
- private static final String UUID_Y = IdentifierManager.generateUUID();
- private static final String UUID_Z1 = IdentifierManager.generateUUID();
+ private static final String UUID_Y = UUIDUtils.generateUUID();
+ private static final String UUID_Z1 = UUIDUtils.generateUUID();
public static final String ID_ROOT = "/";
public static final String ID_X1 = "/x/x1";
public static final String ID_Y1 = UUID_Y + "/y1";
@@ -47,7 +48,7 @@ public class IdentifierManagerTest {
public static final String PATH_Y1 = "/y/y1";
public static final String PATH_Z1 = "/z/z1";
public static final String ID_INVALID = "invalid";
- public static final String ID_NON_EXISTING =
IdentifierManager.generateUUID();
+ public static final String ID_NON_EXISTING = UUIDUtils.generateUUID();
private IdentifierManager identifierManager;
private Root root;
Modified:
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/observation/filter/UuidPredicateTest.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/observation/filter/UuidPredicateTest.java?rev=1809287&r1=1809286&r2=1809287&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/observation/filter/UuidPredicateTest.java
(original)
+++
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/observation/filter/UuidPredicateTest.java
Fri Sep 22 09:36:31 2017
@@ -20,11 +20,12 @@
package org.apache.jackrabbit.oak.plugins.observation.filter;
import static org.apache.jackrabbit.JcrConstants.JCR_UUID;
-import static
org.apache.jackrabbit.oak.plugins.identifier.IdentifierManager.generateUUID;
+import static org.apache.jackrabbit.oak.commons.UUIDUtils.generateUUID;
import static
org.apache.jackrabbit.oak.plugins.memory.EmptyNodeState.EMPTY_NODE;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
+import org.apache.jackrabbit.oak.commons.UUIDUtils;
import org.apache.jackrabbit.oak.spi.state.NodeState;
import org.junit.Test;
@@ -33,13 +34,13 @@ public class UuidPredicateTest {
@Test
public void emptyUuidList() {
UuidPredicate p = new UuidPredicate(new String[] {});
- NodeState tree = createNodeWithUuid(generateUUID());
+ NodeState tree = createNodeWithUuid(UUIDUtils.generateUUID());
assertFalse(p.apply(tree));
}
@Test
public void singleUuidMatch() {
- String uuid = generateUUID();
+ String uuid = UUIDUtils.generateUUID();
UuidPredicate p = new UuidPredicate(new String[] {uuid});
NodeState tree = createNodeWithUuid(uuid);
assertTrue(p.apply(tree));
@@ -47,16 +48,16 @@ public class UuidPredicateTest {
@Test
public void singleUuidMiss() {
- UuidPredicate p = new UuidPredicate(new String[] {generateUUID()});
- NodeState tree = createNodeWithUuid(generateUUID());
+ UuidPredicate p = new UuidPredicate(new String[]
{UUIDUtils.generateUUID()});
+ NodeState tree = createNodeWithUuid(UUIDUtils.generateUUID());
assertFalse(p.apply(tree));
}
@Test
public void multipleUuidsMatch() {
- String uuid = generateUUID();
+ String uuid = UUIDUtils.generateUUID();
UuidPredicate p = new UuidPredicate(
- new String[] {generateUUID(), generateUUID(), uuid});
+ new String[] {UUIDUtils.generateUUID(),
UUIDUtils.generateUUID(), uuid});
NodeState tree = createNodeWithUuid(uuid);
assertTrue(p.apply(tree));
}
@@ -64,8 +65,8 @@ public class UuidPredicateTest {
@Test
public void multipleUuidsMiss() {
UuidPredicate p = new UuidPredicate(
- new String[] {generateUUID(), generateUUID(), generateUUID()});
- NodeState tree = createNodeWithUuid(generateUUID());
+ new String[] {UUIDUtils.generateUUID(),
UUIDUtils.generateUUID(), UUIDUtils.generateUUID()});
+ NodeState tree = createNodeWithUuid(UUIDUtils.generateUUID());
assertFalse(p.apply(tree));
}
Modified:
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/security/authorization/evaluation/JcrUUIDTest.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/security/authorization/evaluation/JcrUUIDTest.java?rev=1809287&r1=1809286&r2=1809287&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/security/authorization/evaluation/JcrUUIDTest.java
(original)
+++
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/security/authorization/evaluation/JcrUUIDTest.java
Fri Sep 22 09:36:31 2017
@@ -24,7 +24,7 @@ import org.apache.jackrabbit.oak.Oak;
import org.apache.jackrabbit.oak.api.CommitFailedException;
import org.apache.jackrabbit.oak.api.Root;
import org.apache.jackrabbit.oak.api.Tree;
-import org.apache.jackrabbit.oak.plugins.identifier.IdentifierManager;
+import org.apache.jackrabbit.oak.commons.UUIDUtils;
import org.apache.jackrabbit.oak.plugins.nodetype.TypeEditorProvider;
import
org.apache.jackrabbit.oak.plugins.nodetype.write.ReadWriteNodeTypeManager;
import org.apache.jackrabbit.oak.spi.security.privilege.PrivilegeConstants;
@@ -71,7 +71,7 @@ public class JcrUUIDTest extends Abstrac
NodeUtil a = new NodeUtil(root.getTree("/a"));
NodeUtil test = a.addChild("referenceable", NT_NAME);
- test.setString(JcrConstants.JCR_UUID,
IdentifierManager.generateUUID());
+ test.setString(JcrConstants.JCR_UUID, UUIDUtils.generateUUID());
referenceablePath = test.getTree().getPath();
}
@@ -94,7 +94,7 @@ public class JcrUUIDTest extends Abstrac
NodeUtil a = new NodeUtil(testRoot.getTree("/a"));
NodeUtil test = a.addChild("referenceable2", NT_NAME);
- test.setString(JcrConstants.JCR_UUID,
IdentifierManager.generateUUID());
+ test.setString(JcrConstants.JCR_UUID, UUIDUtils.generateUUID());
testRoot.commit();
}
@@ -153,7 +153,7 @@ public class JcrUUIDTest extends Abstrac
try {
Root testRoot = getTestRoot();
NodeUtil a = new NodeUtil(testRoot.getTree("/a"));
- a.setString(JCR_UUID, IdentifierManager.generateUUID());
+ a.setString(JCR_UUID, UUIDUtils.generateUUID());
testRoot.commit();
fail("Creating a jcr:uuid property for an unstructured node
without ADD_PROPERTY permission must fail.");
} catch (CommitFailedException e) {
@@ -195,7 +195,7 @@ public class JcrUUIDTest extends Abstrac
Root testRoot = getTestRoot();
a = new NodeUtil(testRoot.getTree("/a"));
assertNotNull(a.getString(JCR_UUID, null));
- a.setString(JCR_UUID, IdentifierManager.generateUUID());
+ a.setString(JCR_UUID, UUIDUtils.generateUUID());
testRoot.commit();
fail("Modifying a jcr:uuid property for an unstructured node
without MODIFY_PROPERTY permission must fail.");
} catch (CommitFailedException e) {
Modified:
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/security/user/UserValidatorTest.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/security/user/UserValidatorTest.java?rev=1809287&r1=1809286&r2=1809287&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/security/user/UserValidatorTest.java
(original)
+++
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/security/user/UserValidatorTest.java
Fri Sep 22 09:36:31 2017
@@ -17,25 +17,20 @@
package org.apache.jackrabbit.oak.security.user;
import java.util.ArrayList;
-import java.util.Collections;
import java.util.List;
-import java.util.Set;
import java.util.UUID;
import javax.jcr.RepositoryException;
import org.apache.jackrabbit.JcrConstants;
import org.apache.jackrabbit.api.security.user.Authorizable;
-import org.apache.jackrabbit.api.security.user.Group;
import org.apache.jackrabbit.api.security.user.User;
import org.apache.jackrabbit.api.security.user.UserManager;
import org.apache.jackrabbit.oak.AbstractSecurityTest;
import org.apache.jackrabbit.oak.api.CommitFailedException;
-import org.apache.jackrabbit.oak.api.PropertyState;
import org.apache.jackrabbit.oak.api.Tree;
import org.apache.jackrabbit.oak.api.Type;
-import org.apache.jackrabbit.oak.plugins.identifier.IdentifierManager;
+import org.apache.jackrabbit.oak.commons.UUIDUtils;
import org.apache.jackrabbit.oak.plugins.memory.MemoryNodeStore;
-import org.apache.jackrabbit.oak.plugins.memory.PropertyStates;
import org.apache.jackrabbit.oak.spi.commit.CommitInfo;
import org.apache.jackrabbit.oak.spi.commit.Validator;
import org.apache.jackrabbit.oak.spi.security.ConfigurationParameters;
@@ -309,7 +304,7 @@ public class UserValidatorTest extends A
NodeUtil nested = profile.addChild("nested",
UserConstants.NT_REP_USER);
nested.setString(UserConstants.REP_PRINCIPAL_NAME, "nested");
nested.setString(UserConstants.REP_AUTHORIZABLE_ID, "nested");
- nested.setString(JcrConstants.JCR_UUID,
IdentifierManager.generateUUID("nested"));
+ nested.setString(JcrConstants.JCR_UUID,
UUIDUtils.generateUUID("nested"));
try {
root.commit();
fail("Creating nested users must be detected.");
@@ -329,7 +324,7 @@ public class UserValidatorTest extends A
NodeUtil nested = profile.addChild("nested",
JcrConstants.NT_UNSTRUCTURED);
nested.setString(UserConstants.REP_PRINCIPAL_NAME, "nested");
nested.setString(UserConstants.REP_AUTHORIZABLE_ID, "nested");
- nested.setString(JcrConstants.JCR_UUID,
IdentifierManager.generateUUID("nested"));
+ nested.setString(JcrConstants.JCR_UUID,
UUIDUtils.generateUUID("nested"));
root.commit();
try {
Modified:
jackrabbit/oak/trunk/oak-it/src/test/java/org/apache/jackrabbit/oak/composite/AtomicCompositeMergeTest.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-it/src/test/java/org/apache/jackrabbit/oak/composite/AtomicCompositeMergeTest.java?rev=1809287&r1=1809286&r2=1809287&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-it/src/test/java/org/apache/jackrabbit/oak/composite/AtomicCompositeMergeTest.java
(original)
+++
jackrabbit/oak/trunk/oak-it/src/test/java/org/apache/jackrabbit/oak/composite/AtomicCompositeMergeTest.java
Fri Sep 22 09:36:31 2017
@@ -27,13 +27,12 @@ import org.apache.jackrabbit.oak.api.Con
import org.apache.jackrabbit.oak.api.PropertyValue;
import org.apache.jackrabbit.oak.api.QueryEngine;
import org.apache.jackrabbit.oak.api.Result;
-import org.apache.jackrabbit.oak.api.ResultRow;
import org.apache.jackrabbit.oak.api.Root;
import org.apache.jackrabbit.oak.commons.IOUtils;
+import org.apache.jackrabbit.oak.commons.UUIDUtils;
import org.apache.jackrabbit.oak.plugins.document.DocumentMK;
import org.apache.jackrabbit.oak.plugins.document.DocumentNodeStore;
import org.apache.jackrabbit.oak.plugins.document.memory.MemoryDocumentStore;
-import org.apache.jackrabbit.oak.plugins.identifier.IdentifierManager;
import
org.apache.jackrabbit.oak.plugins.index.property.PropertyIndexEditorProvider;
import org.apache.jackrabbit.oak.plugins.memory.MemoryNodeStore;
import org.apache.jackrabbit.oak.plugins.memory.PropertyValues;
@@ -42,7 +41,6 @@ import org.apache.jackrabbit.oak.spi.sec
import org.apache.jackrabbit.oak.spi.state.NodeStore;
import org.junit.After;
import org.junit.Before;
-import org.junit.Ignore;
import org.junit.Test;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -69,7 +67,7 @@ public class AtomicCompositeMergeTest {
private static final int THREADS = 6;
- private static final String TEST_UUID = IdentifierManager.generateUUID();
+ private static final String TEST_UUID = UUIDUtils.generateUUID();
private Closer closer;
@@ -167,7 +165,7 @@ public class AtomicCompositeMergeTest {
}
private void waitForReindexing(ContentSession session) throws
CommitFailedException, ParseException {
- String tmpUuid = IdentifierManager.generateUUID();
+ String tmpUuid = UUIDUtils.generateUUID();
Root root = session.getLatestRoot();
root.getTree("/").addChild("tmp").setProperty(JcrConstants.JCR_UUID,
tmpUuid);
Modified:
jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/delegate/WorkspaceDelegate.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/delegate/WorkspaceDelegate.java?rev=1809287&r1=1809286&r2=1809287&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/delegate/WorkspaceDelegate.java
(original)
+++
jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/delegate/WorkspaceDelegate.java
Fri Sep 22 09:36:31 2017
@@ -33,9 +33,9 @@ import org.apache.jackrabbit.oak.api.Pro
import org.apache.jackrabbit.oak.api.Root;
import org.apache.jackrabbit.oak.api.Tree;
import org.apache.jackrabbit.oak.api.Type;
+import org.apache.jackrabbit.oak.commons.UUIDUtils;
import org.apache.jackrabbit.oak.jcr.security.AccessManager;
import org.apache.jackrabbit.oak.jcr.session.SessionContext;
-import org.apache.jackrabbit.oak.plugins.identifier.IdentifierManager;
import org.apache.jackrabbit.oak.plugins.lock.LockConstants;
import org.apache.jackrabbit.oak.plugins.memory.GenericPropertyState;
import org.apache.jackrabbit.oak.plugins.memory.MultiGenericPropertyState;
@@ -145,7 +145,7 @@ public class WorkspaceDelegate {
}
} else if (JCR_UUID.equals(propName)) {
String sourceId = property.getValue(Type.STRING);
- String newId = IdentifierManager.generateUUID();
+ String newId = UUIDUtils.generateUUID();
dest.setProperty(JCR_UUID, newId, Type.STRING);
if (!translated.containsKey(sourceId)) {
translated.put(sourceId, newId);
