You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by mp...@apache.org on 2015/02/20 13:41:40 UTC
svn commit: r1661109 - in /sling/trunk/bundles/extensions/serviceusermapper:
./ src/main/java/org/apache/sling/serviceusermapping/
src/main/java/org/apache/sling/serviceusermapping/impl/
src/test/java/org/apache/sling/serviceusermapping/impl/
Author: mpetria
Date: Fri Feb 20 12:41:40 2015
New Revision: 1661109
URL: http://svn.apache.org/r1661109
Log:
SLING-4312: revert revision 1661081 due to a compile error on java 1.6
Removed:
sling/trunk/bundles/extensions/serviceusermapper/src/main/java/org/apache/sling/serviceusermapping/ServiceUserMapping.java
sling/trunk/bundles/extensions/serviceusermapper/src/main/java/org/apache/sling/serviceusermapping/impl/ServiceUserMappingBundleFilter.java
Modified:
sling/trunk/bundles/extensions/serviceusermapper/pom.xml
sling/trunk/bundles/extensions/serviceusermapper/src/main/java/org/apache/sling/serviceusermapping/impl/Mapping.java
sling/trunk/bundles/extensions/serviceusermapper/src/main/java/org/apache/sling/serviceusermapping/impl/ServiceUserMapperImpl.java
sling/trunk/bundles/extensions/serviceusermapper/src/test/java/org/apache/sling/serviceusermapping/impl/ServiceUserMapperImplTest.java
Modified: sling/trunk/bundles/extensions/serviceusermapper/pom.xml
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/serviceusermapper/pom.xml?rev=1661109&r1=1661108&r2=1661109&view=diff
==============================================================================
--- sling/trunk/bundles/extensions/serviceusermapper/pom.xml (original)
+++ sling/trunk/bundles/extensions/serviceusermapper/pom.xml Fri Feb 20 12:41:40 2015
@@ -97,8 +97,6 @@
<dependency>
<groupId>org.osgi</groupId>
<artifactId>org.osgi.core</artifactId>
- <version>4.3.0</version>
- <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.osgi</groupId>
@@ -128,7 +126,7 @@
<dependency>
<groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.commons.testing</artifactId>
- <version>2.0.16</version>
+ <version>2.0.6</version>
<scope>test</scope>
<exclusions>
<!-- slf4j simple implementation logs INFO + higher to stdout (we don't want that behaviour) -->
Modified: sling/trunk/bundles/extensions/serviceusermapper/src/main/java/org/apache/sling/serviceusermapping/impl/Mapping.java
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/serviceusermapper/src/main/java/org/apache/sling/serviceusermapping/impl/Mapping.java?rev=1661109&r1=1661108&r2=1661109&view=diff
==============================================================================
--- sling/trunk/bundles/extensions/serviceusermapper/src/main/java/org/apache/sling/serviceusermapping/impl/Mapping.java (original)
+++ sling/trunk/bundles/extensions/serviceusermapper/src/main/java/org/apache/sling/serviceusermapping/impl/Mapping.java Fri Feb 20 12:41:40 2015
@@ -18,14 +18,11 @@
*/
package org.apache.sling.serviceusermapping.impl;
-import org.apache.sling.serviceusermapping.ServiceUserMapping;
-
/**
* The <code>Mapping</code> class defines the mapping of a service's name and
* optional service information to a user name.
*/
-class Mapping implements ServiceUserMapping, Comparable<Mapping> {
-
+class Mapping {
private final String serviceName;
@@ -96,44 +93,4 @@ class Mapping implements ServiceUserMapp
return "Mapping [serviceName=" + serviceName + ", subServiceName="
+ subServiceName + ", userName=" + userName + "]";
}
-
- public String getServiceName() {
- return serviceName;
- }
-
- public String getSubServiceName() {
- return subServiceName;
- }
-
-
- public int compareTo(Mapping o) {
- if (o == null) {
- return -1;
- }
-
- int result = compare(this.serviceName, o.serviceName);
- if (result == 0) {
- result = compare(this.subServiceName, o.subServiceName);
- if (result == 0) {
- result = compare(this.userName, o.userName);
- }
- }
- return result;
- }
-
- private int compare(String str1, String str2) {
- if (str1 == str2) {
- return 0;
- }
-
- if (str1 == null) {
- return -1;
- }
-
- if (str2 == null) {
- return 1;
- }
-
- return str1.hashCode() - str2.hashCode();
- }
}
Modified: sling/trunk/bundles/extensions/serviceusermapper/src/main/java/org/apache/sling/serviceusermapping/impl/ServiceUserMapperImpl.java
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/serviceusermapper/src/main/java/org/apache/sling/serviceusermapping/impl/ServiceUserMapperImpl.java?rev=1661109&r1=1661108&r2=1661109&view=diff
==============================================================================
--- sling/trunk/bundles/extensions/serviceusermapper/src/main/java/org/apache/sling/serviceusermapping/impl/ServiceUserMapperImpl.java (original)
+++ sling/trunk/bundles/extensions/serviceusermapper/src/main/java/org/apache/sling/serviceusermapping/impl/ServiceUserMapperImpl.java Fri Feb 20 12:41:40 2015
@@ -19,19 +19,11 @@
package org.apache.sling.serviceusermapping.impl;
import java.util.ArrayList;
-import java.util.Collection;
import java.util.Collections;
-import java.util.Dictionary;
import java.util.HashMap;
-import java.util.Hashtable;
-import java.util.Iterator;
import java.util.List;
import java.util.Map;
import java.util.Vector;
-import java.util.SortedMap;
-import java.util.SortedSet;
-import java.util.TreeMap;
-import java.util.TreeSet;
import org.apache.felix.scr.annotations.Activate;
import org.apache.felix.scr.annotations.Component;
@@ -46,12 +38,8 @@ import org.apache.felix.scr.annotations.
import org.apache.sling.commons.osgi.PropertiesUtil;
import org.apache.sling.serviceusermapping.ServiceUserMapper;
import org.apache.sling.serviceusermapping.ServiceUserValidator;
-import org.apache.sling.serviceusermapping.ServiceUserMapping;
import org.osgi.framework.Bundle;
-import org.osgi.framework.BundleContext;
import org.osgi.framework.Constants;
-import org.osgi.framework.ServiceRegistration;
-import org.osgi.framework.hooks.service.ListenerHook;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -107,14 +95,9 @@ public class ServiceUserMapperImpl imple
private Vector <ServiceUserValidator> validators = new Vector<ServiceUserValidator>();
- private SortedMap<Mapping, ServiceRegistration> activeMappingRegistrations = new TreeMap<Mapping, ServiceRegistration>();
-
- private BundleContext bundleContext;
-
@Activate
@Modified
- void configure(BundleContext bundleContext, final Map<String, Object> config) {
- this.bundleContext = bundleContext;
+ void configure(final Map<String, Object> config) {
final String[] props = PropertiesUtil.toStringArray(config.get(PROP_SERVICE2USER_MAPPING),
PROP_SERVICE2USER_MAPPING_DEFAULT);
@@ -202,43 +185,7 @@ public class ServiceUserMapperImpl imple
mappings.add(m);
}
}
-
-
activeMappings = mappings.toArray(new Mapping[mappings.size()]);
-
- registerServiceMappings(mappings);
-
- }
-
-
- void registerServiceMappings(List<Mapping> newMappings) {
-
- SortedSet<Mapping> orderedActiveMappings = new TreeSet<Mapping>(newMappings);
-
-
- Iterator<Map.Entry<Mapping, ServiceRegistration>> it = activeMappingRegistrations.entrySet().iterator();
- while (it.hasNext()) {
- Map.Entry<Mapping, ServiceRegistration> registrationEntry = it.next();
-
- if (!orderedActiveMappings.contains(registrationEntry.getKey())) {
- registrationEntry.getValue().unregister();
- it.remove();
- }
- }
-
- if (bundleContext == null) {
- return;
- }
-
- for (Mapping mapping: orderedActiveMappings) {
- if (!activeMappingRegistrations.containsKey(mapping)) {
- Dictionary<String, Object> properties = new Hashtable<String, Object>();
- properties.put(ServiceUserMapping.SUBSERVICENAME, mapping.getSubServiceName() == null ? "" : mapping.getSubServiceName());
- properties.put(ServiceUserMapping.SERVICENAME, mapping.getServiceName());
- ServiceRegistration registration = bundleContext.registerService(ServiceUserMapping.class.getName(), mapping, properties);
- activeMappingRegistrations.put(mapping, registration);
- }
- }
}
private String internalGetUserId(String serviceName, String subServiceName) {
Modified: sling/trunk/bundles/extensions/serviceusermapper/src/test/java/org/apache/sling/serviceusermapping/impl/ServiceUserMapperImplTest.java
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/serviceusermapper/src/test/java/org/apache/sling/serviceusermapping/impl/ServiceUserMapperImplTest.java?rev=1661109&r1=1661108&r2=1661109&view=diff
==============================================================================
--- sling/trunk/bundles/extensions/serviceusermapper/src/test/java/org/apache/sling/serviceusermapping/impl/ServiceUserMapperImplTest.java (original)
+++ sling/trunk/bundles/extensions/serviceusermapper/src/test/java/org/apache/sling/serviceusermapping/impl/ServiceUserMapperImplTest.java Fri Feb 20 12:41:40 2015
@@ -18,7 +18,6 @@
*/
package org.apache.sling.serviceusermapping.impl;
-import java.util.Dictionary;
import java.util.HashMap;
import java.util.Hashtable;
import java.util.Map;
@@ -26,15 +25,10 @@ import java.util.Map;
import junit.framework.TestCase;
import org.apache.sling.commons.testing.osgi.MockBundle;
-import org.apache.sling.serviceusermapping.ServiceUserMapping;
import org.apache.sling.serviceusermapping.ServiceUserValidator;
-import org.apache.sling.commons.testing.osgi.MockBundleContext;
import org.junit.Test;
import org.osgi.framework.Bundle;
-import org.osgi.framework.BundleContext;
import org.osgi.framework.Constants;
-import org.osgi.framework.ServiceReference;
-import org.osgi.framework.ServiceRegistration;
public class ServiceUserMapperImplTest {
private static final String BUNDLE_SYMBOLIC1 = "bundle1";
@@ -70,7 +64,6 @@ public class ServiceUserMapperImplTest {
};
};
-
private static final Bundle BUNDLE2 = new MockBundle(10) {
@Override
public String getSymbolicName() {
@@ -83,7 +76,6 @@ public class ServiceUserMapperImplTest {
};
};
-
@Test
public void test_getServiceUserID() {
@SuppressWarnings("serial")
@@ -100,7 +92,7 @@ public class ServiceUserMapperImplTest {
};
final ServiceUserMapperImpl sum = new ServiceUserMapperImpl();
- sum.configure(null, config);
+ sum.configure(config);
TestCase.assertEquals(SAMPLE, sum.getServiceUserID(BUNDLE1, null));
TestCase.assertEquals(ANOTHER, sum.getServiceUserID(BUNDLE2, null));
@@ -126,7 +118,7 @@ public class ServiceUserMapperImplTest {
};
final ServiceUserMapperImpl sum = new ServiceUserMapperImpl();
- sum.configure(null, config);
+ sum.configure(config);
ServiceUserValidator serviceUserValidator = new ServiceUserValidator() {
public boolean isValid(String serviceUserId, String serviceName,
@@ -161,7 +153,7 @@ public class ServiceUserMapperImplTest {
};
final ServiceUserMapperImpl sum = new ServiceUserMapperImpl();
- sum.configure(null, config);
+ sum.configure(config);
final MappingConfigAmendment mca1 = new MappingConfigAmendment();
@SuppressWarnings("serial")
final Map<String, Object> mca1Config = new HashMap<String, Object>() {
@@ -203,7 +195,7 @@ public class ServiceUserMapperImplTest {
};
final ServiceUserMapperImpl sum = new ServiceUserMapperImpl();
- sum.configure(null, config);
+ sum.configure(config);
final MappingConfigAmendment mca1 = new MappingConfigAmendment();
@SuppressWarnings("serial")
@@ -229,102 +221,4 @@ public class ServiceUserMapperImplTest {
TestCase.assertEquals(ANOTHER_SUB, sum.getServiceUserID(BUNDLE2, ""));
}
-
-
-
- @Test
- public void test_amendmentServiceUserMapping() {
- @SuppressWarnings("serial")
- Map<String, Object> config = new HashMap<String, Object>() {
- {
- put("user.mapping", new String[] {
- BUNDLE_SYMBOLIC1 + "=" + SAMPLE, //
- BUNDLE_SYMBOLIC1 + ":" + SUB + "=" + SAMPLE_SUB, //
- });
- put("user.default", NONE);
- }
- };
-
- final ServiceUserMapperImpl sum = new ServiceUserMapperImpl();
- final ServiceRegistrationContext bundleContext = new ServiceRegistrationContext();
- sum.configure(bundleContext, config);
-
- TestCase.assertEquals(2, bundleContext.getRegistrations(ServiceUserMapping.class.getName()).size());
-
- final MappingConfigAmendment mca1 = new MappingConfigAmendment();
- @SuppressWarnings("serial")
- final Map<String, Object> mca1Config = new HashMap<String, Object>() {
- {
- put("user.mapping", new String [] {BUNDLE_SYMBOLIC2 + "=" + ANOTHER});
- put(Constants.SERVICE_ID, 1L);
- put(Constants.SERVICE_RANKING, 100);
- }
- };
- mca1.configure(mca1Config);
- sum.bindAmendment(mca1, mca1Config);
-
- TestCase.assertEquals(3, bundleContext.getRegistrations(ServiceUserMapping.class.getName()).size());
-
- final MappingConfigAmendment mca2 = new MappingConfigAmendment();
- @SuppressWarnings("serial")
- final Map<String, Object> mca2Config = new HashMap<String, Object>() {
- {
- put("user.mapping", new String [] {BUNDLE_SYMBOLIC2 + ":" + SUB + "=" + ANOTHER_SUB});
- put(Constants.SERVICE_ID, 2L);
- put(Constants.SERVICE_RANKING, 200);
- }
- };
- mca2.configure(mca2Config);
- sum.bindAmendment(mca2, mca2Config);
-
- TestCase.assertEquals(4, bundleContext.getRegistrations(ServiceUserMapping.class.getName()).size());
-
- sum.unbindAmendment(mca1, mca1Config);
-
- TestCase.assertEquals(3, bundleContext.getRegistrations(ServiceUserMapping.class.getName()).size());
- }
-
-
- private class ServiceRegistrationContext extends MockBundleContext {
-
-
-
- final Map<String, Map<Object, Dictionary>> registrations = new HashMap<String, Map<Object, Dictionary>>();
-
- public ServiceRegistrationContext() {
- super(null);
- }
-
- @Override
- public ServiceRegistration registerService(String string, Object o, Dictionary dictionary) {
- if (!registrations.containsKey(string)) {
- registrations.put(string, new HashMap<Object, Dictionary>());
- }
- final Map<Object, Dictionary> serviceRegistrations = registrations.get(string);
- serviceRegistrations.put(o, dictionary);
-
- final Object registeredObject = o;
-
-
- return new ServiceRegistration() {
- public ServiceReference getReference() {
- return null;
- }
-
- public void setProperties(Dictionary dictionary) {
-
- }
-
- public void unregister() {
- serviceRegistrations.remove(registeredObject);
- }
- };
- }
-
- public Map<Object, Dictionary> getRegistrations(String name) {
- return registrations.get(name);
- }
-
- }
-
}