This is an automated email from the ASF dual-hosted git repository.
reschke pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/jackrabbit-oak.git
The following commit(s) were added to refs/heads/trunk by this push:
new 0fa0466c60 Revert "OAK-11657: JackrabbitSession.getExpandedName/Path
need to return stable expanded names (#2229)"
0fa0466c60 is described below
commit 0fa0466c607fcf21fe6441817e4eda05b7e83161
Author: Julian Reschke <[email protected]>
AuthorDate: Thu May 8 17:11:31 2025 +0100
Revert "OAK-11657: JackrabbitSession.getExpandedName/Path need to return
stable expanded names (#2229)"
This reverts commit f66bd38d528a3b8757bffd7e75f39fc369833254.
---
.../apache/jackrabbit/oak/namepath/NameMapper.java | 4 ++--
.../oak/namepath/impl/GlobalNameMapper.java | 28 ++++++++--------------
.../apache/jackrabbit/api/JackrabbitSession.java | 9 +------
.../jackrabbit/oak/jcr/session/SessionImpl.java | 7 +-----
.../oak/jcr/session/JackrabbitSessionTest.java | 28 ++++------------------
5 files changed, 18 insertions(+), 58 deletions(-)
diff --git
a/oak-core-spi/src/main/java/org/apache/jackrabbit/oak/namepath/NameMapper.java
b/oak-core-spi/src/main/java/org/apache/jackrabbit/oak/namepath/NameMapper.java
index dc94f4d706..94c8d9bf84 100644
---
a/oak-core-spi/src/main/java/org/apache/jackrabbit/oak/namepath/NameMapper.java
+++
b/oak-core-spi/src/main/java/org/apache/jackrabbit/oak/namepath/NameMapper.java
@@ -87,11 +87,11 @@ public interface NameMapper {
* @param oakName Oak name
* @return JCR name in expanded form
* @since Oak 1.78.0
- * @throws IllegalStateException in case the namespace URI for the given
- * Oak name cannot be resolved or is invalid
+ * @throws IllegalStateException in case the namespace URI for the given
Oak name cannot be resolved
*
* @see <a
href="https://s.apache.org/jcr-2.0-spec/3_Repository_Model.html#3.2.5.1%20Expanded%20Form";>JCR
2.0, 3.2.5.1 Expanded Form</a>
*/
@NotNull
String getExpandedJcrName(@NotNull String oakName);
+
}
diff --git
a/oak-core/src/main/java/org/apache/jackrabbit/oak/namepath/impl/GlobalNameMapper.java
b/oak-core/src/main/java/org/apache/jackrabbit/oak/namepath/impl/GlobalNameMapper.java
index ec26596ee5..546d9aab13 100644
---
a/oak-core/src/main/java/org/apache/jackrabbit/oak/namepath/impl/GlobalNameMapper.java
+++
b/oak-core/src/main/java/org/apache/jackrabbit/oak/namepath/impl/GlobalNameMapper.java
@@ -35,7 +35,6 @@ import static
org.apache.jackrabbit.oak.spi.namespace.NamespaceConstants.REP_URI
import java.util.Map;
import java.util.Map.Entry;
-import javax.jcr.NamespaceException;
import javax.jcr.RepositoryException;
import org.apache.jackrabbit.oak.api.Root;
@@ -66,17 +65,16 @@ public class GlobalNameMapper implements NameMapper {
return name.startsWith(":");
}
- private static boolean isValidNamespaceName(String namespace) {
- // the empty namespace and "internal" are valid as well, otherwise it
always contains a colon (as it is a URI)
- // compare with RFC 3986, Section 3
(https://datatracker.ietf.org/doc/html/rfc3986#section-3)
- return namespace.isEmpty() ||
namespace.equals(NamespaceConstants.NAMESPACE_REP) || namespace.contains(":");
- }
-
protected static boolean isExpandedName(String name) {
if (name.startsWith("{")) {
int brace = name.indexOf('}', 1);
if (brace != -1) {
- return isValidNamespaceName(name.substring(1, brace));
+ String namespace = name.substring(1, brace);
+ // the empty namespace and "internal" are valid as well,
otherwise it always contains a colon (as it is a URI)
+ // compare with RFC 3986, Section 3
(https://datatracker.ietf.org/doc/html/rfc3986#section-3)
+ if (namespace.isEmpty() ||
namespace.equals(NamespaceConstants.NAMESPACE_REP)|| namespace.indexOf(':') !=
-1) {
+ return true;
+ }
}
}
return false;
@@ -145,23 +143,17 @@ public class GlobalNameMapper implements NameMapper {
int colon = oakName.indexOf(':');
if (colon > 0) {
String oakPrefix = oakName.substring(0, colon);
- uri = getNamespacesProperty(oakPrefix);
- // global mapping must take precedence...
+ // local mapping must take precedence...
+ uri = getSessionLocalMappings().get(oakPrefix);
if (uri == null) {
- // ...over local mappings
- uri = getSessionLocalMappings().get(oakPrefix);
+ // ...over global mappings
+ uri = getNamespacesProperty(oakPrefix);
}
if (uri == null) {
throw new IllegalStateException(
"No namespace mapping found for " + oakName);
}
localName = oakName.substring(colon + 1);
- // check namespace name for validity in Oak
- if (!isValidNamespaceName(uri)) {
- throw new IllegalStateException(
- new NamespaceException("Cannot determine expanded name for
'" + oakName +
- "' as registered namespace name '" + uri + "' is
invalid"));
- }
} else {
uri = "";
localName = oakName;
diff --git
a/oak-jackrabbit-api/src/main/java/org/apache/jackrabbit/api/JackrabbitSession.java
b/oak-jackrabbit-api/src/main/java/org/apache/jackrabbit/api/JackrabbitSession.java
index f7e1f71187..db1bf7cb0d 100644
---
a/oak-jackrabbit-api/src/main/java/org/apache/jackrabbit/api/JackrabbitSession.java
+++
b/oak-jackrabbit-api/src/main/java/org/apache/jackrabbit/api/JackrabbitSession.java
@@ -25,7 +25,6 @@ import javax.jcr.Node;
import javax.jcr.Property;
import javax.jcr.Session;
import javax.jcr.AccessDeniedException;
-import javax.jcr.NamespaceException;
import javax.jcr.RepositoryException;
import javax.jcr.UnsupportedRepositoryOperationException;
@@ -283,10 +282,7 @@ public interface JackrabbitSession extends Session {
* Returns the expanded name of the given {@code Item}.
* @param item the item for which to retrieve the name
* @return the name of the item in expanded form.
- * @throws NamespaceException when no expanded name can
- * be determined (for instance, if the registered namespace
- * (name) is invalid)
- * @throws RepositoryException if another error occurs
+ * @throws RepositoryException if another error occurs.
* @since 1.78.0
* @see <a
href="https://s.apache.org/jcr-2.0-spec/3_Repository_Model.html#3.2.5.1%20Expanded%20Form";>JCR
2.0, 3.2.5.1 Expanded Form</a>
*/
@@ -296,9 +292,6 @@ public interface JackrabbitSession extends Session {
* Returns the expanded path of the given {@code Item}.
* @param item the item for which to retrieve the name
* @return the path of the item in expanded form.
- * @throws NamespaceException when no expanded name can
- * be determined (for instance, if the registered namespace
- * (name) is invalid)
* @throws RepositoryException if another error occurs.
* @since 1.78.0
* @see <a
href="https://s.apache.org/jcr-2.0-spec/3_Repository_Model.html#3.2.5.1%20Expanded%20Form";>JCR
2.0, 3.2.5.1 Expanded Form</a>
diff --git
a/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/session/SessionImpl.java
b/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/session/SessionImpl.java
index 6f37d57b0b..5eb76868cb 100644
---
a/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/session/SessionImpl.java
+++
b/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/session/SessionImpl.java
@@ -860,12 +860,7 @@ public class SessionImpl implements JackrabbitSession {
ItemImpl<?> itemImpl = checkItemImpl(item);
return
itemImpl.sessionContext.getExpandedJcrName(itemImpl.getOakName());
} catch (IllegalStateException e) {
- // unwrap RepositoryException when available
- if (e.getCause() instanceof RepositoryException) {
- throw (RepositoryException) e.getCause();
- } else {
- throw new RepositoryException("Namespace exception " +
e.getMessage());
- }
+ throw new RepositoryException("Namespace exception " +
e.getMessage());
}
}
diff --git
a/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/session/JackrabbitSessionTest.java
b/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/session/JackrabbitSessionTest.java
index 834afd47b2..f7c86562ad 100644
---
a/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/session/JackrabbitSessionTest.java
+++
b/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/session/JackrabbitSessionTest.java
@@ -24,7 +24,6 @@ import org.jetbrains.annotations.Nullable;
import javax.jcr.GuestCredentials;
import javax.jcr.Item;
-import javax.jcr.NamespaceException;
import javax.jcr.Node;
import javax.jcr.Property;
import javax.jcr.RepositoryException;
@@ -87,39 +86,20 @@ public class JackrabbitSessionTest extends AbstractJCRTest {
assertEquals("{}testroot", s.getExpandedName(testRootNode));
Node n = testRootNode.addNode("test:bar");
assertEquals("{http://www.apache.org/jackrabbit/test}bar";,
s.getExpandedName(n));
- // now remap namespace uri - should not affect expanded name
- assertEquals("prefix 'test' has unexpected mapping",
- "http://www.apache.org/jackrabbit/test";,
s.getNamespaceURI("test"));
+ // now remap namespace uri
s.setNamespacePrefix("test", "urn:foo");
- assertEquals("{http://www.apache.org/jackrabbit/test}bar";,
s.getExpandedName(n));
+ assertEquals("{urn:foo}bar", s.getExpandedName(n));
// use special namespace uri
n = testRootNode.addNode("rep:bar");
assertEquals("{internal}bar", s.getExpandedName(n));
}
- public void testGetExpandedNameBrokenNamespace() throws
RepositoryException {
- // empty namespace uri
- assertEquals("{}testroot", s.getExpandedName(testRootNode));
-
- // register broken namespace name
- s.getWorkspace().getNamespaceRegistry().registerNamespace("foo",
"bar");
- Node n = testRootNode.addNode("foo:qux");
-
- try {
- // there is no expanded name, thus we expect an exception here
- s.getExpandedName(n);
- fail("there is no expanded name in this case, so we expect the
call to fail");
- } catch (NamespaceException ex) {
- // expected
- }
- }
-
public void testGetExpandedPath() throws RepositoryException {
assertEquals("/{}testroot", s.getExpandedPath(testRootNode));
Node n = testRootNode.addNode("test:bar").addNode("rep:bar");
assertEquals("/{}testroot/{http://www.apache.org/jackrabbit/test}bar/{internal}bar";,
s.getExpandedPath(n));
- // now remap namespace uri - should not affect expanded name
+ // now remap namespace uri
s.setNamespacePrefix("test", "urn:foo");
-
assertEquals("/{}testroot/{http://www.apache.org/jackrabbit/test}bar/{internal}bar";,
s.getExpandedPath(n));
+ assertEquals("/{}testroot/{urn:foo}bar/{internal}bar",
s.getExpandedPath(n));
}
}
\ No newline at end of file
