You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by cz...@apache.org on 2022/02/08 05:38:52 UTC
[sling-org-apache-sling-tenant] branch master updated: SLING-11128 : Escape tenant id - Remove dependency to commons.osgi
This is an automated email from the ASF dual-hosted git repository.
cziegeler pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-tenant.git
The following commit(s) were added to refs/heads/master by this push:
new fe95e57 SLING-11128 : Escape tenant id - Remove dependency to commons.osgi
fe95e57 is described below
commit fe95e573600a7a3348ae5c65277867a6286cbdeb
Author: Carsten Ziegeler <cz...@apache.org>
AuthorDate: Tue Feb 8 06:38:38 2022 +0100
SLING-11128 : Escape tenant id - Remove dependency to commons.osgi
---
pom.xml | 10 ++--------
.../sling/tenant/internal/TenantProviderImpl.java | 18 +++++++++---------
.../tenant/internal/console/WebConsolePlugin.java | 1 -
.../apache/sling/tenant/internal/TenantImplTest.java | 12 ------------
.../sling/tenant/internal/TenantProviderImplTest.java | 2 --
5 files changed, 11 insertions(+), 32 deletions(-)
diff --git a/pom.xml b/pom.xml
index b1779fe..e803e60 100644
--- a/pom.xml
+++ b/pom.xml
@@ -67,19 +67,13 @@
<dependency>
<groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.api</artifactId>
- <version>2.22.0</version>
+ <version>2.5.0</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.xss</artifactId>
- <version>2.2.14</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.sling</groupId>
- <artifactId>org.apache.sling.commons.osgi</artifactId>
- <version>2.1.0</version>
+ <version>2.2.0</version>
<scope>provided</scope>
</dependency>
<dependency>
diff --git a/src/main/java/org/apache/sling/tenant/internal/TenantProviderImpl.java b/src/main/java/org/apache/sling/tenant/internal/TenantProviderImpl.java
index bcd021c..1dd7483 100644
--- a/src/main/java/org/apache/sling/tenant/internal/TenantProviderImpl.java
+++ b/src/main/java/org/apache/sling/tenant/internal/TenantProviderImpl.java
@@ -36,7 +36,6 @@ import org.apache.sling.api.resource.Resource;
import org.apache.sling.api.resource.ResourceResolver;
import org.apache.sling.api.resource.ResourceResolverFactory;
import org.apache.sling.api.resource.ResourceUtil;
-import org.apache.sling.commons.osgi.ServiceUtil;
import org.apache.sling.tenant.Tenant;
import org.apache.sling.tenant.TenantManager;
import org.apache.sling.tenant.TenantProvider;
@@ -49,6 +48,7 @@ import org.osgi.framework.Constants;
import org.osgi.framework.Filter;
import org.osgi.framework.FrameworkUtil;
import org.osgi.framework.InvalidSyntaxException;
+import org.osgi.framework.ServiceReference;
import org.osgi.service.component.annotations.Activate;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Deactivate;
@@ -152,13 +152,13 @@ public class TenantProviderImpl implements TenantProvider, TenantManager {
}
@SuppressWarnings("unused")
- private synchronized void bindTenantSetup(TenantCustomizer action, Map<String, Object> config) {
- registeredTenantHandlers.put(ServiceUtil.getComparableForServiceRanking(config), action);
+ private synchronized void bindTenantSetup(TenantCustomizer action, ServiceReference<TenantCustomizer> ref) {
+ registeredTenantHandlers.put(ref, action);
}
@SuppressWarnings("unused")
- private synchronized void unbindTenantSetup(TenantCustomizer action, Map<String, Object> config) {
- registeredTenantHandlers.remove(ServiceUtil.getComparableForServiceRanking(config));
+ private synchronized void unbindTenantSetup(TenantCustomizer action, ServiceReference<TenantCustomizer> ref) {
+ registeredTenantHandlers.remove(ref);
}
private synchronized Collection<TenantCustomizer> getTenantHandlers() {
@@ -166,13 +166,13 @@ public class TenantProviderImpl implements TenantProvider, TenantManager {
}
@SuppressWarnings("unused")
- private synchronized void bindHook(TenantManagerHook action, Map<String, Object> config) {
- registeredHooks.put(ServiceUtil.getComparableForServiceRanking(config), action);
+ private synchronized void bindHook(TenantManagerHook action, ServiceReference<TenantCustomizer> ref) {
+ registeredHooks.put(ref, action);
}
@SuppressWarnings("unused")
- private synchronized void unbindHook(TenantManagerHook action, Map<String, Object> config) {
- registeredHooks.remove(ServiceUtil.getComparableForServiceRanking(config));
+ private synchronized void unbindHook(TenantManagerHook action, ServiceReference<TenantCustomizer> ref) {
+ registeredHooks.remove(ref);
}
private synchronized Collection<TenantManagerHook> getHooks() {
diff --git a/src/main/java/org/apache/sling/tenant/internal/console/WebConsolePlugin.java b/src/main/java/org/apache/sling/tenant/internal/console/WebConsolePlugin.java
index d028b15..72c5458 100644
--- a/src/main/java/org/apache/sling/tenant/internal/console/WebConsolePlugin.java
+++ b/src/main/java/org/apache/sling/tenant/internal/console/WebConsolePlugin.java
@@ -37,7 +37,6 @@ import org.apache.sling.xss.XSSAPI;
import org.osgi.framework.BundleContext;
import org.osgi.framework.Constants;
import org.osgi.framework.ServiceRegistration;
-import org.slf4j.LoggerFactory;
/**
* This is a webconsole plugin displaying the active queues, some statistics and
diff --git a/src/test/java/org/apache/sling/tenant/internal/TenantImplTest.java b/src/test/java/org/apache/sling/tenant/internal/TenantImplTest.java
index b8fd4bf..bd24266 100644
--- a/src/test/java/org/apache/sling/tenant/internal/TenantImplTest.java
+++ b/src/test/java/org/apache/sling/tenant/internal/TenantImplTest.java
@@ -39,23 +39,14 @@ public class TenantImplTest {
private static final String t1 = "t1";
- private static final String t2 = "t2";
-
private static final String pt1 = "/etc/tenants/" + t1;
- private static final String pt2 = "/etc/tenants/" + t2;
-
private static final String n1 = "name1";
- private static final String n2 = "name2";
-
private static final String d1 = "description1";
- private static final String d2 = "description2";
-
private static final String p1 = "prop1";
- @SuppressWarnings("serial")
private static final Set<String> propNamesDefault = new HashSet<String>() {
{
add(Tenant.PROP_NAME);
@@ -63,7 +54,6 @@ public class TenantImplTest {
}
};
- @SuppressWarnings("serial")
private static final Set<String> propNamesTest = new HashSet<String>() {
{
add(p1);
@@ -88,7 +78,6 @@ public class TenantImplTest {
@Test
public void test_name_description() {
- @SuppressWarnings("serial")
Resource r = new MockResource(pt1, new HashMap<String, Object>() {
{
put(Tenant.PROP_NAME, n1);
@@ -114,7 +103,6 @@ public class TenantImplTest {
@Test
public void test_property() {
- @SuppressWarnings("serial")
Resource r = new MockResource(pt1, new HashMap<String, Object>() {
{
put(p1, p1);
diff --git a/src/test/java/org/apache/sling/tenant/internal/TenantProviderImplTest.java b/src/test/java/org/apache/sling/tenant/internal/TenantProviderImplTest.java
index 0f47ec8..5b94a36 100644
--- a/src/test/java/org/apache/sling/tenant/internal/TenantProviderImplTest.java
+++ b/src/test/java/org/apache/sling/tenant/internal/TenantProviderImplTest.java
@@ -19,8 +19,6 @@
package org.apache.sling.tenant.internal;
import java.lang.annotation.Annotation;
-import java.lang.reflect.Field;
-import java.util.HashMap;
import java.util.Iterator;
import junit.framework.TestCase;