This is an automated email from the ASF dual-hosted git repository.
ieb pushed a commit to branch master
in repository
https://gitbox.apache.org/repos/asf/sling-org-apache-sling-jcr-resource.git
The following commit(s) were added to refs/heads/master by this push:
new 82e62f9 SLING-7140 Support redirects to URLs provided by the
underlying resource provider Refactored to take account of Sling API changes.
82e62f9 is described below
commit 82e62f951145134bc0afc0155146a23072e2e3fd
Author: Ian Boston <i...@tfd.co.uk>
AuthorDate: Mon Oct 23 11:48:10 2017 +0100
SLING-7140 Support redirects to URLs provided by the underlying resource
provider
Refactored to take account of Sling API changes.
---
pom.xml | 7 +------
.../java/org/apache/sling/jcr/resource/internal/HelperData.java | 2 +-
.../internal/helper/jcr/JcrExternalizableInputStream.java | 9 +++------
.../sling/jcr/resource/internal/helper/jcr/JcrNodeResource.java | 6 +++---
.../resource/internal/helper/jcr/JcrProviderStateFactory.java | 2 +-
.../jcr/resource/internal/helper/jcr/JcrResourceProvider.java | 2 +-
.../sling/jcr/resource/internal/JcrModifiableValueMapTest.java | 2 +-
.../resource/internal/helper/JcrNodeResourceIteratorTest.java | 2 +-
.../resource/internal/helper/jcr/JcrItemResourceFactoryTest.java | 2 +-
.../jcr/resource/internal/helper/jcr/JcrNodeResourceTest.java | 2 +-
.../jcr/resource/internal/helper/jcr/JcrTestNodeResource.java | 2 +-
11 files changed, 15 insertions(+), 23 deletions(-)
diff --git a/pom.xml b/pom.xml
index a52b705..64fc9c0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -157,7 +157,7 @@
<dependency>
<groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.api</artifactId>
- <version>2.16.0</version>
+ <version>2.16.3-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
@@ -224,11 +224,6 @@
<version>1.4</version>
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>org.apache.sling</groupId>
- <artifactId>org.apache.sling.api</artifactId>
- <version>2.16.3-SNAPSHOT</version>
- </dependency>
</dependencies>
</project>
diff --git
a/src/main/java/org/apache/sling/jcr/resource/internal/HelperData.java
b/src/main/java/org/apache/sling/jcr/resource/internal/HelperData.java
index d9cad01..3c6eda4 100644
--- a/src/main/java/org/apache/sling/jcr/resource/internal/HelperData.java
+++ b/src/main/java/org/apache/sling/jcr/resource/internal/HelperData.java
@@ -23,7 +23,7 @@ import java.util.concurrent.atomic.AtomicReference;
import javax.jcr.RepositoryException;
import javax.jcr.Session;
-import org.apache.sling.api.resource.URIProvider;
+import org.apache.sling.api.resource.external.URIProvider;
import org.apache.sling.commons.classloader.DynamicClassLoaderManager;
/**
diff --git
a/src/main/java/org/apache/sling/jcr/resource/internal/helper/jcr/JcrExternalizableInputStream.java
b/src/main/java/org/apache/sling/jcr/resource/internal/helper/jcr/JcrExternalizableInputStream.java
index 068f1e1..94d461b 100644
---
a/src/main/java/org/apache/sling/jcr/resource/internal/helper/jcr/JcrExternalizableInputStream.java
+++
b/src/main/java/org/apache/sling/jcr/resource/internal/helper/jcr/JcrExternalizableInputStream.java
@@ -18,7 +18,8 @@
package org.apache.sling.jcr.resource.internal.helper.jcr;
-import org.apache.sling.api.resource.ExternalizableInputStream;
+
+import org.apache.sling.api.resource.external.ExternalizableInputStream;
import javax.jcr.Property;
import javax.jcr.RepositoryException;
@@ -32,7 +33,7 @@ import java.net.URI;
* can be used without consuming any local IO resources.
*
* If a non any other form of URI is require, (ie Internal) then the
URIProvider should be used directly. This
- * class is written intentionally to *only* support public URIs.
+ * class is written intentionally to *only* support URIs that may be used
where the client is external and/or internal.
*/
public class JcrExternalizableInputStream extends InputStream implements
ExternalizableInputStream {
private final Property data;
@@ -77,8 +78,4 @@ public class JcrExternalizableInputStream extends InputStream
implements Externa
return uri;
}
- @Override
- public URI getPrivateURI() {
- return null;
- }
}
diff --git
a/src/main/java/org/apache/sling/jcr/resource/internal/helper/jcr/JcrNodeResource.java
b/src/main/java/org/apache/sling/jcr/resource/internal/helper/jcr/JcrNodeResource.java
index 685c9fc..9949cfe 100644
---
a/src/main/java/org/apache/sling/jcr/resource/internal/helper/jcr/JcrNodeResource.java
+++
b/src/main/java/org/apache/sling/jcr/resource/internal/helper/jcr/JcrNodeResource.java
@@ -36,12 +36,12 @@ import javax.jcr.Value;
import org.apache.sling.adapter.annotations.Adaptable;
import org.apache.sling.adapter.annotations.Adapter;
-import org.apache.sling.api.resource.ExternalizableInputStream;
import org.apache.sling.api.resource.ModifiableValueMap;
import org.apache.sling.api.resource.Resource;
import org.apache.sling.api.resource.ResourceResolver;
-import org.apache.sling.api.resource.URIProvider;
import org.apache.sling.api.resource.ValueMap;
+import org.apache.sling.api.resource.external.ExternalizableInputStream;
+import org.apache.sling.api.resource.external.URIProvider;
import org.apache.sling.jcr.resource.api.JcrResourceConstants;
import org.apache.sling.jcr.resource.internal.HelperData;
import org.apache.sling.jcr.resource.internal.JcrModifiableValueMap;
@@ -231,7 +231,7 @@ class JcrNodeResource extends JcrItemResource<Node> { //
this should be package
*/
private URI convertToPublicURI() {
for (URIProvider up : helper.getURIProviders()) {
- URI u = up.toURI(URIProvider.Scope.PUBLIC, this);
+ URI u = up.toURI(this, URIProvider.Scope.EXTERNAL,
URIProvider.Operation.READ);
if ( u != null) {
return u;
}
diff --git
a/src/main/java/org/apache/sling/jcr/resource/internal/helper/jcr/JcrProviderStateFactory.java
b/src/main/java/org/apache/sling/jcr/resource/internal/helper/jcr/JcrProviderStateFactory.java
index ef2ef87..70280e1 100644
---
a/src/main/java/org/apache/sling/jcr/resource/internal/helper/jcr/JcrProviderStateFactory.java
+++
b/src/main/java/org/apache/sling/jcr/resource/internal/helper/jcr/JcrProviderStateFactory.java
@@ -35,7 +35,7 @@ import javax.jcr.SimpleCredentials;
import org.apache.sling.api.resource.LoginException;
import org.apache.sling.api.resource.ResourceResolver;
import org.apache.sling.api.resource.ResourceResolverFactory;
-import org.apache.sling.api.resource.URIProvider;
+import org.apache.sling.api.resource.external.URIProvider;
import org.apache.sling.commons.classloader.DynamicClassLoaderManager;
import org.apache.sling.jcr.api.SlingRepository;
import org.apache.sling.jcr.resource.api.JcrResourceConstants;
diff --git
a/src/main/java/org/apache/sling/jcr/resource/internal/helper/jcr/JcrResourceProvider.java
b/src/main/java/org/apache/sling/jcr/resource/internal/helper/jcr/JcrResourceProvider.java
index aaa892c..0590435 100644
---
a/src/main/java/org/apache/sling/jcr/resource/internal/helper/jcr/JcrResourceProvider.java
+++
b/src/main/java/org/apache/sling/jcr/resource/internal/helper/jcr/JcrResourceProvider.java
@@ -47,7 +47,7 @@ import org.apache.sling.api.resource.PersistenceException;
import org.apache.sling.api.resource.Resource;
import org.apache.sling.api.resource.ResourceResolverFactory;
import org.apache.sling.api.resource.ResourceUtil;
-import org.apache.sling.api.resource.URIProvider;
+import org.apache.sling.api.resource.external.URIProvider;
import org.apache.sling.commons.classloader.DynamicClassLoaderManager;
import org.apache.sling.jcr.api.SlingRepository;
import org.apache.sling.jcr.resource.api.JcrResourceConstants;
diff --git
a/src/test/java/org/apache/sling/jcr/resource/internal/JcrModifiableValueMapTest.java
b/src/test/java/org/apache/sling/jcr/resource/internal/JcrModifiableValueMapTest.java
index a396622..205bb2b 100644
---
a/src/test/java/org/apache/sling/jcr/resource/internal/JcrModifiableValueMapTest.java
+++
b/src/test/java/org/apache/sling/jcr/resource/internal/JcrModifiableValueMapTest.java
@@ -45,8 +45,8 @@ import javax.jcr.nodetype.NodeType;
import org.apache.commons.io.IOUtils;
import org.apache.jackrabbit.util.Text;
import org.apache.sling.api.resource.ModifiableValueMap;
-import org.apache.sling.api.resource.URIProvider;
import org.apache.sling.api.resource.ValueMap;
+import org.apache.sling.api.resource.external.URIProvider;
import org.apache.sling.commons.classloader.DynamicClassLoaderManager;
import org.apache.sling.commons.testing.jcr.RepositoryTestBase;
diff --git
a/src/test/java/org/apache/sling/jcr/resource/internal/helper/JcrNodeResourceIteratorTest.java
b/src/test/java/org/apache/sling/jcr/resource/internal/helper/JcrNodeResourceIteratorTest.java
index 90c3118..700d47a 100644
---
a/src/test/java/org/apache/sling/jcr/resource/internal/helper/JcrNodeResourceIteratorTest.java
+++
b/src/test/java/org/apache/sling/jcr/resource/internal/helper/JcrNodeResourceIteratorTest.java
@@ -26,7 +26,7 @@ import javax.jcr.NodeIterator;
import javax.jcr.RepositoryException;
import org.apache.sling.api.resource.Resource;
-import org.apache.sling.api.resource.URIProvider;
+import org.apache.sling.api.resource.external.URIProvider;
import org.apache.sling.commons.classloader.DynamicClassLoaderManager;
import org.apache.sling.commons.testing.jcr.MockNode;
import org.apache.sling.commons.testing.jcr.MockNodeIterator;
diff --git
a/src/test/java/org/apache/sling/jcr/resource/internal/helper/jcr/JcrItemResourceFactoryTest.java
b/src/test/java/org/apache/sling/jcr/resource/internal/helper/jcr/JcrItemResourceFactoryTest.java
index d08211d..7467e3c 100644
---
a/src/test/java/org/apache/sling/jcr/resource/internal/helper/jcr/JcrItemResourceFactoryTest.java
+++
b/src/test/java/org/apache/sling/jcr/resource/internal/helper/jcr/JcrItemResourceFactoryTest.java
@@ -29,7 +29,7 @@ import javax.jcr.RepositoryException;
import javax.jcr.Session;
import org.apache.jackrabbit.commons.JcrUtils;
-import org.apache.sling.api.resource.URIProvider;
+import org.apache.sling.api.resource.external.URIProvider;
import org.apache.sling.commons.classloader.DynamicClassLoaderManager;
import org.apache.sling.commons.testing.jcr.RepositoryTestBase;
import org.apache.sling.jcr.resource.internal.HelperData;
diff --git
a/src/test/java/org/apache/sling/jcr/resource/internal/helper/jcr/JcrNodeResourceTest.java
b/src/test/java/org/apache/sling/jcr/resource/internal/helper/jcr/JcrNodeResourceTest.java
index a9bff78..e576915 100644
---
a/src/test/java/org/apache/sling/jcr/resource/internal/helper/jcr/JcrNodeResourceTest.java
+++
b/src/test/java/org/apache/sling/jcr/resource/internal/helper/jcr/JcrNodeResourceTest.java
@@ -32,7 +32,7 @@ import javax.jcr.Session;
import org.apache.jackrabbit.JcrConstants;
import org.apache.sling.api.resource.Resource;
import org.apache.sling.api.resource.ResourceMetadata;
-import org.apache.sling.api.resource.URIProvider;
+import org.apache.sling.api.resource.external.URIProvider;
import org.apache.sling.commons.classloader.DynamicClassLoaderManager;
import org.apache.sling.jcr.resource.api.JcrResourceConstants;
import org.apache.sling.jcr.resource.internal.HelperData;
diff --git
a/src/test/java/org/apache/sling/jcr/resource/internal/helper/jcr/JcrTestNodeResource.java
b/src/test/java/org/apache/sling/jcr/resource/internal/helper/jcr/JcrTestNodeResource.java
index e78f80a..0f73916 100644
---
a/src/test/java/org/apache/sling/jcr/resource/internal/helper/jcr/JcrTestNodeResource.java
+++
b/src/test/java/org/apache/sling/jcr/resource/internal/helper/jcr/JcrTestNodeResource.java
@@ -24,7 +24,7 @@ import javax.jcr.Node;
import javax.jcr.RepositoryException;
import org.apache.sling.api.resource.ResourceResolver;
-import org.apache.sling.api.resource.URIProvider;
+import org.apache.sling.api.resource.external.URIProvider;
import org.apache.sling.commons.classloader.DynamicClassLoaderManager;
import org.apache.sling.jcr.resource.internal.HelperData;
--
To stop receiving notification emails like this one, please contact
['"commits@sling.apache.org" <commits@sling.apache.org>'].
