You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by ss...@apache.org on 2021/12/04 11:08:42 UTC
[sling-org-apache-sling-models-integration-tests] branch master updated: switch to getServiceResourceResolver to avoid deprecated getAdministrativeResourceResolver
This is an automated email from the ASF dual-hosted git repository.
sseifert pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-models-integration-tests.git
The following commit(s) were added to refs/heads/master by this push:
new f1ee422 switch to getServiceResourceResolver to avoid deprecated getAdministrativeResourceResolver
f1ee422 is described below
commit f1ee422e2bc80673eabb40225675711b8dd82994
Author: Stefan Seifert <st...@users.noreply.github.com>
AuthorDate: Sat Dec 4 12:08:30 2021 +0100
switch to getServiceResourceResolver to avoid deprecated getAdministrativeResourceResolver
---
.../apache/sling/models/testing/DecoratedIT.java | 4 +-
.../sling/models/testing/ImplementsExtendsIT.java | 5 +-
.../testing/InjectorSpecificAnnotationIT.java | 4 +-
.../sling/models/testing/ModelFactorySimpleIT.java | 4 +-
.../sling/models/testing/PathBoundServletIT.java | 9 +--
.../ServiceInjectionWithDifferentRankingIT.java | 4 +-
.../org/apache/sling/models/testing/SimpleIT.java | 4 +-
.../org/apache/sling/models/testing/ViaIT.java | 4 +-
.../models/testing/delegate/DelegateRequestIT.java | 21 ++----
.../testing/delegate/DelegateResourceIT.java | 20 ++----
.../sling/models/testing/exporter/ExporterIT.java | 75 ++++------------------
.../testing/rtbound/ResourceTypeBindingIT.java | 28 ++------
.../rtboundpicker/ResourceTypePickerIT.java | 19 +-----
src/test/provisioning/sling.txt | 12 +++-
14 files changed, 51 insertions(+), 162 deletions(-)
diff --git a/src/test/java/org/apache/sling/models/testing/DecoratedIT.java b/src/test/java/org/apache/sling/models/testing/DecoratedIT.java
index 7cd7d18..d9832a8 100644
--- a/src/test/java/org/apache/sling/models/testing/DecoratedIT.java
+++ b/src/test/java/org/apache/sling/models/testing/DecoratedIT.java
@@ -47,11 +47,11 @@ public class DecoratedIT {
private Resource resourceWithCustomAdaptToWrapper;
@Before
- @SuppressWarnings({ "null", "deprecation" })
+ @SuppressWarnings("null")
public void setUp() throws Exception {
ResourceResolverFactory rrFactory = teleporter.getService(ResourceResolverFactory.class);
modelFactory = teleporter.getService(ModelFactory.class);
- resolver = rrFactory.getAdministrativeResourceResolver(null);
+ resolver = rrFactory.getServiceResourceResolver(null);
Session session = resolver.adaptTo(Session.class);
Node rootNode = session.getRootNode();
Node createdNode = rootNode.addNode("test_" + RandomStringUtils.randomAlphanumeric(10));
diff --git a/src/test/java/org/apache/sling/models/testing/ImplementsExtendsIT.java b/src/test/java/org/apache/sling/models/testing/ImplementsExtendsIT.java
index e0b2e9d..e7bdc0a 100644
--- a/src/test/java/org/apache/sling/models/testing/ImplementsExtendsIT.java
+++ b/src/test/java/org/apache/sling/models/testing/ImplementsExtendsIT.java
@@ -56,14 +56,14 @@ public class ImplementsExtendsIT {
private Node createdNode;
@Before
- @SuppressWarnings({ "null", "deprecation" })
+ @SuppressWarnings("null")
public void setUp() throws Exception {
ResourceResolverFactory rrFactory = teleporter.getService(ResourceResolverFactory.class);
adapterManager = teleporter.getService(AdapterManager.class);
firstValue = RandomStringUtils.randomAlphanumeric(10);
thirdValue = RandomStringUtils.randomAlphanumeric(10);
- resolver = rrFactory.getAdministrativeResourceResolver(null);
+ resolver = rrFactory.getServiceResourceResolver(null);
Session session = resolver.adaptTo(Session.class);
Node rootNode = session.getRootNode();
createdNode = rootNode.addNode("test_" + RandomStringUtils.randomAlphanumeric(10));
@@ -76,7 +76,6 @@ public class ImplementsExtendsIT {
@After
public void after() throws Exception {
-
if (resolver != null) {
resolver.close();
}
diff --git a/src/test/java/org/apache/sling/models/testing/InjectorSpecificAnnotationIT.java b/src/test/java/org/apache/sling/models/testing/InjectorSpecificAnnotationIT.java
index 2e1f526..d79cde9 100644
--- a/src/test/java/org/apache/sling/models/testing/InjectorSpecificAnnotationIT.java
+++ b/src/test/java/org/apache/sling/models/testing/InjectorSpecificAnnotationIT.java
@@ -37,7 +37,7 @@ public class InjectorSpecificAnnotationIT {
public final TeleporterRule teleporter = TeleporterRule.forClass(getClass(), "SM_Teleporter");
@Test
- @SuppressWarnings({ "null", "deprecation" })
+ @SuppressWarnings("null")
public void test() throws Exception {
ResourceResolverFactory rrFactory = teleporter.getService(ResourceResolverFactory.class);
String value = RandomStringUtils.randomAlphanumeric(10);
@@ -45,7 +45,7 @@ public class InjectorSpecificAnnotationIT {
ResourceResolver resolver = null;
Node createdNode = null;
try {
- resolver = rrFactory.getAdministrativeResourceResolver(null);
+ resolver = rrFactory.getServiceResourceResolver(null);
Session session = resolver.adaptTo(Session.class);
Node rootNode = session.getRootNode();
createdNode = rootNode.addNode("test_" + RandomStringUtils.randomAlphanumeric(10));
diff --git a/src/test/java/org/apache/sling/models/testing/ModelFactorySimpleIT.java b/src/test/java/org/apache/sling/models/testing/ModelFactorySimpleIT.java
index 46aa9c5..e5bc8cc 100644
--- a/src/test/java/org/apache/sling/models/testing/ModelFactorySimpleIT.java
+++ b/src/test/java/org/apache/sling/models/testing/ModelFactorySimpleIT.java
@@ -53,13 +53,13 @@ public class ModelFactorySimpleIT {
private Node createdNode;
@Before
- @SuppressWarnings({ "null", "deprecation" })
+ @SuppressWarnings("null")
public void setUp() throws Exception {
ResourceResolverFactory rrFactory = teleporter.getService(ResourceResolverFactory.class);
modelFactory = teleporter.getService(ModelFactory.class);
value = RandomStringUtils.randomAlphanumeric(10);
- resolver = rrFactory.getAdministrativeResourceResolver(null);
+ resolver = rrFactory.getServiceResourceResolver(null);
Session session = resolver.adaptTo(Session.class);
Node rootNode = session.getRootNode();
createdNode = rootNode.addNode("test_" + RandomStringUtils.randomAlphanumeric(10));
diff --git a/src/test/java/org/apache/sling/models/testing/PathBoundServletIT.java b/src/test/java/org/apache/sling/models/testing/PathBoundServletIT.java
index e281045..521cb7d 100644
--- a/src/test/java/org/apache/sling/models/testing/PathBoundServletIT.java
+++ b/src/test/java/org/apache/sling/models/testing/PathBoundServletIT.java
@@ -43,19 +43,12 @@ public class PathBoundServletIT {
}
@Test
- @SuppressWarnings("deprecation")
public void testDoubledServlets() throws Exception {
- ResourceResolver resolver = null;
- try {
- resolver = rrFactory.getAdministrativeResourceResolver(null);
+ try (ResourceResolver resolver = rrFactory.getServiceResourceResolver(null);) {
FakeResponse response = new FakeResponse();
slingRequestProcessor.processRequest(new FakeRequest("/apps/rtpickerrequest"), response, resolver);
Assert.assertEquals(200, response.getStatus());
- } finally {
- if (resolver != null && resolver.isLive()) {
- resolver.close();
- }
}
}
diff --git a/src/test/java/org/apache/sling/models/testing/ServiceInjectionWithDifferentRankingIT.java b/src/test/java/org/apache/sling/models/testing/ServiceInjectionWithDifferentRankingIT.java
index 5ac0484..74305af 100644
--- a/src/test/java/org/apache/sling/models/testing/ServiceInjectionWithDifferentRankingIT.java
+++ b/src/test/java/org/apache/sling/models/testing/ServiceInjectionWithDifferentRankingIT.java
@@ -62,13 +62,13 @@ public class ServiceInjectionWithDifferentRankingIT {
private Collection<ServiceRegistration> serviceRegistrations;
@Before
- @SuppressWarnings({ "null", "deprecation" })
+ @SuppressWarnings("null")
public void setUp() throws Exception {
ResourceResolverFactory rrFactory = teleporter.getService(ResourceResolverFactory.class);
modelFactory = teleporter.getService(ModelFactory.class);
value = RandomStringUtils.randomAlphanumeric(10);
- resolver = rrFactory.getAdministrativeResourceResolver(null);
+ resolver = rrFactory.getServiceResourceResolver(null);
Session session = resolver.adaptTo(Session.class);
Node rootNode = session.getRootNode();
createdNode = rootNode.addNode("test_" + RandomStringUtils.randomAlphanumeric(10));
diff --git a/src/test/java/org/apache/sling/models/testing/SimpleIT.java b/src/test/java/org/apache/sling/models/testing/SimpleIT.java
index 6ac49c4..b9d3e84 100644
--- a/src/test/java/org/apache/sling/models/testing/SimpleIT.java
+++ b/src/test/java/org/apache/sling/models/testing/SimpleIT.java
@@ -48,13 +48,13 @@ public class SimpleIT {
private Node createdNode;
@Before
- @SuppressWarnings({ "null", "deprecation" })
+ @SuppressWarnings("null")
public void setUp() throws Exception {
ResourceResolverFactory rrFactory = teleporter.getService(ResourceResolverFactory.class);
value = RandomStringUtils.randomAlphanumeric(10);
childValue = RandomStringUtils.randomAlphanumeric(10);
- resolver = rrFactory.getAdministrativeResourceResolver(null);
+ resolver = rrFactory.getServiceResourceResolver(null);
Session session = resolver.adaptTo(Session.class);
Node rootNode = session.getRootNode();
createdNode = rootNode.addNode("test_" + RandomStringUtils.randomAlphanumeric(10));
diff --git a/src/test/java/org/apache/sling/models/testing/ViaIT.java b/src/test/java/org/apache/sling/models/testing/ViaIT.java
index 870e8f5..f774bbd 100644
--- a/src/test/java/org/apache/sling/models/testing/ViaIT.java
+++ b/src/test/java/org/apache/sling/models/testing/ViaIT.java
@@ -39,7 +39,7 @@ public class ViaIT {
public final TeleporterRule teleporter = TeleporterRule.forClass(getClass(), "SM_Teleporter");
@Test
- @SuppressWarnings({ "null", "deprecation" })
+ @SuppressWarnings("null")
public void test() throws Exception {
ResourceResolverFactory rrFactory = teleporter.getService(ResourceResolverFactory.class);
AdapterManager adapterManager = teleporter.getService(AdapterManager.class);
@@ -49,7 +49,7 @@ public class ViaIT {
ResourceResolver resolver = null;
Node createdNode = null;
try {
- resolver = rrFactory.getAdministrativeResourceResolver(null);
+ resolver = rrFactory.getServiceResourceResolver(null);
Session session = resolver.adaptTo(Session.class);
Node rootNode = session.getRootNode();
createdNode = rootNode.addNode("test_" + RandomStringUtils.randomAlphanumeric(10));
diff --git a/src/test/java/org/apache/sling/models/testing/delegate/DelegateRequestIT.java b/src/test/java/org/apache/sling/models/testing/delegate/DelegateRequestIT.java
index 80fec48..fb3d67b 100644
--- a/src/test/java/org/apache/sling/models/testing/delegate/DelegateRequestIT.java
+++ b/src/test/java/org/apache/sling/models/testing/delegate/DelegateRequestIT.java
@@ -53,13 +53,12 @@ public class DelegateRequestIT {
private final String extendedComponentPath = "/content/delegate/extendedComponent";
@Before
- @SuppressWarnings({ "null", "deprecation" })
+ @SuppressWarnings("null")
public void setup() throws LoginException, PersistenceException {
rrFactory = teleporter.getService(ResourceResolverFactory.class);
modelFactory = teleporter.getService(ModelFactory.class);
- ResourceResolver adminResolver = null;
- try {
- adminResolver = rrFactory.getAdministrativeResourceResolver(null);
+ try (ResourceResolver adminResolver = rrFactory.getServiceResourceResolver(null);) {
+
Map<String, Object> properties = new HashMap<String, Object>();
properties.put("text", "baseTESTValue");
properties.put("other", "baseOther");
@@ -81,19 +80,12 @@ public class DelegateRequestIT {
properties.clear();
adminResolver.commit();
- } finally {
- if (adminResolver != null && adminResolver.isLive()) {
- adminResolver.close();
- }
}
}
@Test
- @SuppressWarnings("deprecation")
public void testCreateDelegateModel() throws LoginException {
- ResourceResolver resolver = null;
- try {
- resolver = rrFactory.getAdministrativeResourceResolver(null);
+ try (ResourceResolver resolver = rrFactory.getServiceResourceResolver(null);) {
final Resource baseComponentResource = resolver.getResource(baseComponentPath);
assertNotNull(baseComponentResource);
final FakeRequest baseRequest = new FakeRequest(baseComponentResource);
@@ -111,10 +103,7 @@ public class DelegateRequestIT {
assertTrue("Model should be DelegateExtendedModel", modelFromExtended instanceof DelegateExtendedModel);
assertEquals("EXTENDEDTESTVALUE", modelFromExtended.getText());
assertEquals("extendedOther", modelFromExtended.getOther());
- } finally {
- if (resolver != null && resolver.isLive()) {
- resolver.close();
- }
}
}
+
}
diff --git a/src/test/java/org/apache/sling/models/testing/delegate/DelegateResourceIT.java b/src/test/java/org/apache/sling/models/testing/delegate/DelegateResourceIT.java
index ffa7600..71b4790 100644
--- a/src/test/java/org/apache/sling/models/testing/delegate/DelegateResourceIT.java
+++ b/src/test/java/org/apache/sling/models/testing/delegate/DelegateResourceIT.java
@@ -49,12 +49,10 @@ public class DelegateResourceIT {
private final String extendedComponentPath = "/content/delegate/extendedComponent";
@Before
- @SuppressWarnings({"null", "deprecation"})
+ @SuppressWarnings("null")
public void setup() throws LoginException, PersistenceException {
rrFactory = teleporter.getService(ResourceResolverFactory.class);
- ResourceResolver adminResolver = null;
- try {
- adminResolver = rrFactory.getAdministrativeResourceResolver(null);
+ try (ResourceResolver adminResolver = rrFactory.getServiceResourceResolver(null);) {
Map<String, Object> properties = new HashMap<String, Object>();
properties.put("text", "baseTESTValue");
properties.put("other", "baseOther");
@@ -76,19 +74,12 @@ public class DelegateResourceIT {
properties.clear();
adminResolver.commit();
- } finally {
- if (adminResolver != null && adminResolver.isLive()) {
- adminResolver.close();
- }
}
}
@Test
- @SuppressWarnings("deprecation")
public void testCreateDelegateModel() throws LoginException {
- ResourceResolver resolver = null;
- try {
- resolver = rrFactory.getAdministrativeResourceResolver(null);
+ try (ResourceResolver resolver = rrFactory.getServiceResourceResolver(null);) {
final Resource baseComponentResource = resolver.getResource(baseComponentPath);
assertNotNull(baseComponentResource);
final DelegateInterface modelFromBase = baseComponentResource.adaptTo(DelegateInterface.class);
@@ -104,10 +95,7 @@ public class DelegateResourceIT {
assertTrue("Model should be DelegateExtendedModel", modelFromExtended instanceof DelegateExtendedModel);
assertEquals("EXTENDEDTESTVALUE", modelFromExtended.getText());
assertEquals("extendedOther", modelFromExtended.getOther());
- } finally {
- if (resolver != null && resolver.isLive()) {
- resolver.close();
- }
}
}
+
}
diff --git a/src/test/java/org/apache/sling/models/testing/exporter/ExporterIT.java b/src/test/java/org/apache/sling/models/testing/exporter/ExporterIT.java
index 698c28d..70f7ae9 100644
--- a/src/test/java/org/apache/sling/models/testing/exporter/ExporterIT.java
+++ b/src/test/java/org/apache/sling/models/testing/exporter/ExporterIT.java
@@ -71,15 +71,13 @@ public class ExporterIT {
private Format dateFormat = FastDateFormat.getInstance("yyyy-MM-dd'T'HH:mm:ss.SSSZ", TimeZone.getTimeZone("UTC"));
@Before
- @SuppressWarnings({"null", "deprecation"})
+ @SuppressWarnings("null")
public void setup() throws Exception {
rrFactory = teleporter.getService(ResourceResolverFactory.class);
modelFactory = teleporter.getService(ModelFactory.class);
slingRequestProcessor = teleporter.getService(SlingRequestProcessor.class);
- ResourceResolver adminResolver = null;
- try {
- adminResolver = rrFactory.getAdministrativeResourceResolver(null);
+ try (ResourceResolver adminResolver = rrFactory.getServiceResourceResolver(null);) {
Map<String, Object> properties = new HashMap<String, Object>();
properties.put("sampleValue", "baseTESTValue");
properties.put("sampleBooleanValue", true);
@@ -142,19 +140,13 @@ public class ExporterIT {
adminResolver.commit();
- } finally {
- if (adminResolver != null && adminResolver.isLive()) {
- adminResolver.close();
- }
}
}
@Test
- @SuppressWarnings({"null", "deprecation"})
+ @SuppressWarnings("null")
public void testExportToJSON() throws Exception {
- ResourceResolver resolver = null;
- try {
- resolver = rrFactory.getAdministrativeResourceResolver(null);
+ try (ResourceResolver resolver = rrFactory.getServiceResourceResolver(null);) {
final Resource baseComponentResource = resolver.getResource(baseComponentPath);
Assert.assertNotNull(baseComponentResource);
String jsonData = modelFactory.exportModelForResource(baseComponentResource, "jackson", String.class,
@@ -185,19 +177,12 @@ public class ExporterIT {
Collections.<String, String> emptyMap());
Assert.assertTrue("JSON Data should contain the property value",
StringUtils.contains(jsonData, "interfaceTESTValue"));
- } finally {
- if (resolver != null && resolver.isLive()) {
- resolver.close();
- }
}
}
- @SuppressWarnings("deprecation")
@Test
public void testExportToTidyJSON() throws Exception {
- ResourceResolver resolver = null;
- try {
- resolver = rrFactory.getAdministrativeResourceResolver(null);
+ try (ResourceResolver resolver = rrFactory.getServiceResourceResolver(null);) {
final Resource baseComponentResource = resolver.getResource(baseComponentPath);
Assert.assertNotNull(baseComponentResource);
String jsonData = modelFactory.exportModelForResource(baseComponentResource, "jackson", String.class,
@@ -207,38 +192,25 @@ public class ExporterIT {
jsonData = modelFactory.exportModelForResource(baseComponentResource, "jackson", String.class,
Collections.<String, String>singletonMap("tidy", "true"));
Assert.assertTrue(jsonData.contains(System.lineSeparator()));
- } finally {
- if (resolver != null && resolver.isLive()) {
- resolver.close();
- }
}
}
- @SuppressWarnings({ "deprecation", "unchecked" })
+ @SuppressWarnings("unchecked")
@Test
public void testExportToMap() throws Exception {
- ResourceResolver resolver = null;
- try {
- resolver = rrFactory.getAdministrativeResourceResolver(null);
+ try (ResourceResolver resolver = rrFactory.getServiceResourceResolver(null);) {
final Resource baseComponentResource = resolver.getResource(baseComponentPath);
Assert.assertNotNull(baseComponentResource);
Map<String, Object> data = modelFactory.exportModelForResource(baseComponentResource, "jackson", Map.class,
Collections.<String, String> emptyMap());
Assert.assertEquals("Should have resource value", "baseTESTValue", data.get("sampleValue"));
Assert.assertEquals("Should have resource value", "BASETESTVALUE", data.get("UPPER"));
- } finally {
- if (resolver != null && resolver.isLive()) {
- resolver.close();
- }
}
}
@Test
- @SuppressWarnings("deprecation")
public void testResourceServlets() throws Exception {
- ResourceResolver resolver = null;
- try {
- resolver = rrFactory.getAdministrativeResourceResolver(null);
+ try (ResourceResolver resolver = rrFactory.getServiceResourceResolver(null);) {
FakeResponse response = new FakeResponse();
slingRequestProcessor.processRequest(new FakeRequest(baseComponentPath + ".model.json"), response, resolver);
JsonObject obj = Json.createReader(new StringReader((response.getStringWriter().toString()))).readObject();
@@ -262,19 +234,12 @@ public class ExporterIT {
Assert.assertEquals("UTF-8", response.getCharacterEncoding());
Assert.assertEquals(interfaceComponentPath, obj.getString("id"));
Assert.assertEquals("interfaceTESTValue", obj.getString("sampleValue"));
- } finally {
- if (resolver != null && resolver.isLive()) {
- resolver.close();
- }
}
}
@Test
- @SuppressWarnings("deprecation")
public void testRequestServlets() throws Exception {
- ResourceResolver resolver = null;
- try {
- resolver = rrFactory.getAdministrativeResourceResolver(null);
+ try (ResourceResolver resolver = rrFactory.getServiceResourceResolver(null);) {
FakeResponse response = new FakeResponse();
slingRequestProcessor.processRequest(new FakeRequest(baseRequestComponentPath + ".model.json"), response, resolver);
String stringOutput = response.getStringWriter().toString();
@@ -308,19 +273,12 @@ public class ExporterIT {
Assert.assertEquals("UTF-8", response.getCharacterEncoding());
Assert.assertEquals(interfaceRequestComponentPath, obj.getString("id"));
Assert.assertEquals("interfaceTESTValue", obj.getString("sampleValue"));
- } finally {
- if (resolver != null && resolver.isLive()) {
- resolver.close();
- }
}
}
@Test
- @SuppressWarnings("deprecation")
public void testDoubledServlets() throws Exception {
- ResourceResolver resolver = null;
- try {
- resolver = rrFactory.getAdministrativeResourceResolver(null);
+ try (ResourceResolver resolver = rrFactory.getServiceResourceResolver(null);) {
FakeResponse response = new FakeResponse();
slingRequestProcessor.processRequest(new FakeRequest(doubledComponentPath + ".firstmodel.json"), response, resolver);
@@ -333,30 +291,19 @@ public class ExporterIT {
obj = Json.createReader(new StringReader((response.getStringWriter().toString()))).readObject();
Assert.assertEquals("application/json", response.getContentType());
Assert.assertEquals("second", obj.getString("value"));
- } finally {
- if (resolver != null && resolver.isLive()) {
- resolver.close();
- }
}
}
@Test
- @SuppressWarnings("deprecation")
public void testFailedExport() throws Exception {
boolean thrown = false;
try {
- ResourceResolver resolver = null;
- try {
- resolver = rrFactory.getAdministrativeResourceResolver(null);
+ try (ResourceResolver resolver = rrFactory.getServiceResourceResolver(null);) {
final Resource baseComponentResource = resolver.getResource(baseComponentPath);
Assert.assertNotNull(baseComponentResource);
modelFactory.exportModelForResource(baseComponentResource, "jaxb", String.class,
Collections.<String, String>emptyMap());
Assert.fail("Should have thrown missing serializer error.");
- } finally {
- if (resolver != null && resolver.isLive()) {
- resolver.close();
- }
}
} catch (MissingExporterException e) {
thrown = true;
diff --git a/src/test/java/org/apache/sling/models/testing/rtbound/ResourceTypeBindingIT.java b/src/test/java/org/apache/sling/models/testing/rtbound/ResourceTypeBindingIT.java
index 0e5313d..09b4a10 100644
--- a/src/test/java/org/apache/sling/models/testing/rtbound/ResourceTypeBindingIT.java
+++ b/src/test/java/org/apache/sling/models/testing/rtbound/ResourceTypeBindingIT.java
@@ -52,14 +52,12 @@ public class ResourceTypeBindingIT {
private final String fromRequestComponentPath = "/content/rt/fromRequest";
@Before
- @SuppressWarnings({ "null", "deprecation" })
+ @SuppressWarnings("null")
public void setup() throws LoginException, PersistenceException {
rrFactory = teleporter.getService(ResourceResolverFactory.class);
modelFactory = teleporter.getService(ModelFactory.class);
- ResourceResolver adminResolver = null;
- try {
- adminResolver = rrFactory.getAdministrativeResourceResolver(null);
+ try (ResourceResolver adminResolver = rrFactory.getServiceResourceResolver(null);) {
Map<String, Object> properties = new HashMap<String, Object>();
properties.put("sampleValue", "baseTESTValue");
properties.put(SlingConstants.NAMESPACE_PREFIX + ":" + SlingConstants.PROPERTY_RESOURCE_TYPE,
@@ -97,19 +95,12 @@ public class ResourceTypeBindingIT {
ResourceUtil.getOrCreateResource(adminResolver, fromRequestComponentPath, properties, null, false);
adminResolver.commit();
- } finally {
- if (adminResolver != null && adminResolver.isLive()) {
- adminResolver.close();
- }
}
}
@Test
- @SuppressWarnings("deprecation")
public void testClientModelCreateFromResource() throws LoginException {
- ResourceResolver resolver = null;
- try {
- resolver = rrFactory.getAdministrativeResourceResolver(null);
+ try (ResourceResolver resolver = rrFactory.getServiceResourceResolver(null);) {
final Resource baseComponentResource = resolver.getResource(baseComponentPath);
Assert.assertNotNull(baseComponentResource);
final Object baseModel = modelFactory.getModelFromResource(baseComponentResource);
@@ -134,29 +125,18 @@ public class ResourceTypeBindingIT {
Assert.assertNotNull("Model should not be null", extendedModel);
Assert.assertTrue("Model should be a BaseComponent", extendedModel instanceof BaseComponent);
Assert.assertTrue("Model should be an ExtendedComponent", extendedModel instanceof ExtendedComponent);
- } finally {
- if (resolver != null && resolver.isLive()) {
- resolver.close();
- }
}
}
@Test
- @SuppressWarnings("deprecation")
public void testClientModelCreateFromRequest() throws LoginException {
- ResourceResolver resolver = null;
- try {
- resolver = rrFactory.getAdministrativeResourceResolver(null);
+ try (ResourceResolver resolver = rrFactory.getServiceResourceResolver(null);) {
final Resource baseComponentResource = resolver.getResource(fromRequestComponentPath);
Assert.assertNotNull(baseComponentResource);
final Object baseModel = modelFactory.getModelFromRequest(new FakeRequest(baseComponentResource));
Assert.assertNotNull("Model should not be null", baseModel);
Assert.assertTrue("Model should be a FromRequestComponent", baseModel instanceof FromRequestComponent);
- } finally {
- if (resolver != null && resolver.isLive()) {
- resolver.close();
- }
}
}
diff --git a/src/test/java/org/apache/sling/models/testing/rtboundpicker/ResourceTypePickerIT.java b/src/test/java/org/apache/sling/models/testing/rtboundpicker/ResourceTypePickerIT.java
index 9a1b8b4..c3ff8ed 100644
--- a/src/test/java/org/apache/sling/models/testing/rtboundpicker/ResourceTypePickerIT.java
+++ b/src/test/java/org/apache/sling/models/testing/rtboundpicker/ResourceTypePickerIT.java
@@ -46,12 +46,10 @@ public class ResourceTypePickerIT {
private final String childComponentPath = "/content/rtpicker/childComponent";
@Before
- @SuppressWarnings({ "null", "deprecation" })
+ @SuppressWarnings("null")
public void setup() throws LoginException, PersistenceException {
rrFactory = teleporter.getService(ResourceResolverFactory.class);
- ResourceResolver adminResolver = null;
- try {
- adminResolver = rrFactory.getAdministrativeResourceResolver(null);
+ try (ResourceResolver adminResolver = rrFactory.getServiceResourceResolver(null);) {
Map<String, Object> properties = new HashMap<String, Object>();
properties.put(SlingConstants.NAMESPACE_PREFIX + ":" + SlingConstants.PROPERTY_RESOURCE_TYPE,
"sling/rtpicker/base");
@@ -66,19 +64,12 @@ public class ResourceTypePickerIT {
properties.clear();
adminResolver.commit();
- } finally {
- if (adminResolver != null && adminResolver.isLive()) {
- adminResolver.close();
- }
}
}
@Test
- @SuppressWarnings("deprecation")
public void testClientModelCreateFromResource() throws LoginException {
- ResourceResolver resolver = null;
- try {
- resolver = rrFactory.getAdministrativeResourceResolver(null);
+ try (ResourceResolver resolver = rrFactory.getServiceResourceResolver(null);) {
final Resource baseComponentResource = resolver.getResource(baseComponentPath);
Assert.assertNotNull(baseComponentResource);
TestComponent baseModel = baseComponentResource.adaptTo(TestComponent.class);
@@ -90,10 +81,6 @@ public class ResourceTypePickerIT {
baseModel = childComponentResource.adaptTo(TestComponent.class);
Assert.assertNotNull("Model should not be null", baseModel);
Assert.assertTrue("Model should be a SubRTComponent", baseModel instanceof SubRTComponent);
- } finally {
- if (resolver != null && resolver.isLive()) {
- resolver.close();
- }
}
}
}
diff --git a/src/test/provisioning/sling.txt b/src/test/provisioning/sling.txt
index fef1bba..432d466 100644
--- a/src/test/provisioning/sling.txt
+++ b/src/test/provisioning/sling.txt
@@ -32,6 +32,12 @@
org.apache.sling/org.apache.sling.models.integration-tests
[configurations]
- # Allow login administrative for org.apache.sling.junit.core
- org.apache.sling.jcr.base.internal.LoginAdminWhitelist
- whitelist.bundles.regexp="org\.apache\.sling\.junit\.core"
+ # configure service user mapping for junit core (being used in the IT itself)
+ org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended-junit
+ user.mapping=["org.apache.sling.junit.core\=models-it"]
+
+[:repoinit]
+ create service user models-it
+ set ACL for models-it
+ allow jcr:all on /
+ end