You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@aries.apache.org by ro...@apache.org on 2019/03/05 01:15:02 UTC

svn commit: r1854808 - in /aries/trunk/spi-fly: spi-fly-core/src/main/java/org/apache/aries/spifly/ spi-fly-core/src/test/java/org/apache/aries/spifly/ spi-fly-dynamic-bundle/ spi-fly-dynamic-framework-extension/ spi-fly-static-bundle/

Author: rotty3000
Date: Tue Mar  5 01:15:02 2019
New Revision: 1854808

URL: http://svn.apache.org/viewvc?rev=1854808&view=rev
Log:
ARIES-1901 Spi Fly not properly handling multiple providers described in the same descriptor as services

Modified:
    aries/trunk/spi-fly/spi-fly-core/src/main/java/org/apache/aries/spifly/ProviderBundleTrackerCustomizer.java
    aries/trunk/spi-fly/spi-fly-core/src/test/java/org/apache/aries/spifly/ProviderBundleTrackerCustomizerTest.java
    aries/trunk/spi-fly/spi-fly-dynamic-bundle/resolve.bndrun
    aries/trunk/spi-fly/spi-fly-dynamic-framework-extension/resolve.bndrun
    aries/trunk/spi-fly/spi-fly-static-bundle/resolve.bndrun

Modified: aries/trunk/spi-fly/spi-fly-core/src/main/java/org/apache/aries/spifly/ProviderBundleTrackerCustomizer.java
URL: http://svn.apache.org/viewvc/aries/trunk/spi-fly/spi-fly-core/src/main/java/org/apache/aries/spifly/ProviderBundleTrackerCustomizer.java?rev=1854808&r1=1854807&r2=1854808&view=diff
==============================================================================
--- aries/trunk/spi-fly/spi-fly-core/src/main/java/org/apache/aries/spifly/ProviderBundleTrackerCustomizer.java (original)
+++ aries/trunk/spi-fly/spi-fly-core/src/main/java/org/apache/aries/spifly/ProviderBundleTrackerCustomizer.java Tue Mar  5 01:15:02 2019
@@ -47,6 +47,7 @@ import org.osgi.framework.wiring.BundleW
 import org.osgi.framework.wiring.BundleWiring;
 import org.osgi.util.tracker.BundleTrackerCustomizer;
 
+import aQute.bnd.header.Attrs;
 import aQute.bnd.header.OSGiHeader;
 import aQute.bnd.header.Parameters;
 
@@ -294,30 +295,34 @@ public class ProviderBundleTrackerCustom
             return null;
 
         Parameters capabilities = OSGiHeader.parseHeader(capabilityHeader.toString());
-        Entry<String, ? extends Map<String, String>> cap = ConsumerHeaderProcessor.findCapability(capabilities, SpiFlyConstants.SERVICELOADER_CAPABILITY_NAMESPACE, spiName);
 
-        Hashtable<String, Object> properties = new Hashtable<String, Object>();
-        if (cap != null) {
-            for (Map.Entry<String, String> entry : cap.getValue().entrySet()) {
-                String key = ConsumerHeaderProcessor.removeDuplicateMarker(entry.getKey());
-                if (SpiFlyConstants.SERVICELOADER_CAPABILITY_NAMESPACE.equals(key))
+        for (Map.Entry<String, Attrs> entry : capabilities.entrySet()) {
+            String key = ConsumerHeaderProcessor.removeDuplicateMarker(entry.getKey());
+            Attrs attrs = entry.getValue();
+
+            if (!SpiFlyConstants.SERVICELOADER_CAPABILITY_NAMESPACE.equals(key))
+                continue;
+
+            if (!attrs.containsKey(SpiFlyConstants.SERVICELOADER_CAPABILITY_NAMESPACE) ||
+                    !attrs.get(SpiFlyConstants.SERVICELOADER_CAPABILITY_NAMESPACE).equals(spiName))
+                continue;
+
+            if (attrs.containsKey(SpiFlyConstants.REGISTER_DIRECTIVE) &&
+                    !attrs.get(SpiFlyConstants.REGISTER_DIRECTIVE).equals(implName))
+                continue;
+
+            Hashtable<String, Object> properties = new Hashtable<String, Object>();
+            for (Map.Entry<String, String> prop : attrs.entrySet()) {
+                if (SpiFlyConstants.SERVICELOADER_CAPABILITY_NAMESPACE.equals(prop.getKey()) ||
+                        SpiFlyConstants.REGISTER_DIRECTIVE.equals(prop.getKey()) ||
+                        key.startsWith("."))
                     continue;
 
-                if (!key.startsWith("."))
-                    properties.put(entry.getKey(), entry.getValue());
+                properties.put(prop.getKey(), prop.getValue());
             }
-        }
-
-        String registerDirective = cap.getValue().get(SpiFlyConstants.REGISTER_DIRECTIVE);
-        if (registerDirective == null) {
             return properties;
-        } else {
-            if ("".equals(registerDirective.trim()))
-                return null;
-
-            if (implName.equals(registerDirective.trim()))
-                return properties;
         }
+
         return null;
     }
 

Modified: aries/trunk/spi-fly/spi-fly-core/src/test/java/org/apache/aries/spifly/ProviderBundleTrackerCustomizerTest.java
URL: http://svn.apache.org/viewvc/aries/trunk/spi-fly/spi-fly-core/src/test/java/org/apache/aries/spifly/ProviderBundleTrackerCustomizerTest.java?rev=1854808&r1=1854807&r2=1854808&view=diff
==============================================================================
--- aries/trunk/spi-fly/spi-fly-core/src/test/java/org/apache/aries/spifly/ProviderBundleTrackerCustomizerTest.java (original)
+++ aries/trunk/spi-fly/spi-fly-core/src/test/java/org/apache/aries/spifly/ProviderBundleTrackerCustomizerTest.java Tue Mar  5 01:15:02 2019
@@ -25,6 +25,7 @@ import static org.junit.Assert.assertSam
 
 import java.net.URL;
 import java.net.URLClassLoader;
+import java.util.Arrays;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.Dictionary;
@@ -156,13 +157,25 @@ public class ProviderBundleTrackerCustom
         EasyMock.verify(implBC);
     }
 
+    @Test
+    public void testMultipleProviderServices() throws Exception {
+        BundleContext implBC = mockSPIBundleContext(EasyMock.createNiceMock(ServiceRegistration.class));
+        Bundle implBundle = mockMultiSPIBundle(implBC);
+        Bundle spiBundle = EasyMock.createNiceMock(Bundle.class);
+        EasyMock.expect(spiBundle.getBundleId()).andReturn(25l).anyTimes();
+        EasyMock.replay(spiBundle);
+
+        ProviderBundleTrackerCustomizer customizer = new ProviderBundleTrackerCustomizer(EasyMock.createNiceMock(BaseActivator.class), spiBundle);
+        assertEquals(2, customizer.addingBundle(implBundle, null).size());
+    }
+
     @SuppressWarnings("unchecked")
     private BundleContext mockSPIBundleContext(ServiceRegistration sreg) {
         BundleContext implBC = EasyMock.createMock(BundleContext.class);
         EasyMock.<Object>expect(implBC.registerService(
-                EasyMock.eq("org.apache.aries.mytest.MySPI"),
+                EasyMock.anyString(),
                 EasyMock.isA(ServiceFactory.class),
-                (Dictionary<String,?>) EasyMock.anyObject())).andReturn(sreg);
+                (Dictionary<String,?>) EasyMock.anyObject())).andReturn(sreg).anyTimes();
         EasyMock.replay(implBC);
         return implBC;
     }
@@ -193,4 +206,38 @@ public class ProviderBundleTrackerCustom
         EasyMock.replay(implBundle);
         return implBundle;
     }
+
+    private Bundle mockMultiSPIBundle(BundleContext implBC) throws ClassNotFoundException {
+        Bundle implBundle = EasyMock.createNiceMock(Bundle.class);
+        EasyMock.expect(implBundle.getBundleContext()).andReturn(implBC).anyTimes();
+
+        Dictionary<String, String> headers = new Hashtable<String, String>();
+        headers.put(
+                Constants.REQUIRE_CAPABILITY,
+                "osgi.extender;filter:='(osgi.extender=osgi.serviceloader.registrar)'"
+        );
+        headers.put(
+            Constants.PROVIDE_CAPABILITY,
+            "osgi.serviceloader;osgi.serviceloader='org.apache.aries.mytest.MySPI2';register:='org.apache.aries.spifly.impl4.MySPIImpl4b';foo='bbb'," +
+            "osgi.serviceloader;osgi.serviceloader='org.apache.aries.mytest.MySPI2';register:='org.apache.aries.spifly.impl4.MySPIImpl4c';foo='ccc'"
+        );
+        EasyMock.expect(implBundle.getHeaders()).andReturn(headers).anyTimes();
+
+        // List the resources found at META-INF/services in the test bundle
+        URL dir = getClass().getResource("impl4/META-INF/services");
+        assertNotNull("precondition", dir);
+        EasyMock.expect(implBundle.getResource("/META-INF/services")).andReturn(dir).anyTimes();
+        URL resA = getClass().getResource("impl4/META-INF/services/org.apache.aries.mytest.MySPI");
+        assertNotNull("precondition", resA);
+        URL resB = getClass().getResource("impl4/META-INF/services/org.apache.aries.mytest.MySPI2");
+        assertNotNull("precondition", resB);
+        EasyMock.expect(implBundle.findEntries("META-INF/services", "*", false)).andReturn(
+                Collections.enumeration(Arrays.asList(resA, resB))).anyTimes();
+        Class<?> cls = getClass().getClassLoader().loadClass("org.apache.aries.spifly.impl4.MySPIImpl4b");
+        EasyMock.<Object>expect(implBundle.loadClass("org.apache.aries.spifly.impl4.MySPIImpl4b")).andReturn(cls).anyTimes();
+        cls = getClass().getClassLoader().loadClass("org.apache.aries.spifly.impl4.MySPIImpl4c");
+        EasyMock.<Object>expect(implBundle.loadClass("org.apache.aries.spifly.impl4.MySPIImpl4c")).andReturn(cls).anyTimes();
+        EasyMock.replay(implBundle);
+        return implBundle;
+    }
 }

Modified: aries/trunk/spi-fly/spi-fly-dynamic-bundle/resolve.bndrun
URL: http://svn.apache.org/viewvc/aries/trunk/spi-fly/spi-fly-dynamic-bundle/resolve.bndrun?rev=1854808&r1=1854807&r2=1854808&view=diff
==============================================================================
--- aries/trunk/spi-fly/spi-fly-dynamic-bundle/resolve.bndrun (original)
+++ aries/trunk/spi-fly/spi-fly-dynamic-bundle/resolve.bndrun Tue Mar  5 01:15:02 2019
@@ -15,4 +15,4 @@
 -runee: JavaSE-1.8
 -runfw: org.apache.felix.framework
 -runrequires: osgi.identity;filter:='(osgi.identity=${project.artifactId})'
--runbundles: org.apache.aries.spifly.dynamic.bundle;version='[1.2.0,1.2.1)'
+-runbundles: org.apache.aries.spifly.dynamic.bundle;version='[1.2.1,1.2.2)'

Modified: aries/trunk/spi-fly/spi-fly-dynamic-framework-extension/resolve.bndrun
URL: http://svn.apache.org/viewvc/aries/trunk/spi-fly/spi-fly-dynamic-framework-extension/resolve.bndrun?rev=1854808&r1=1854807&r2=1854808&view=diff
==============================================================================
--- aries/trunk/spi-fly/spi-fly-dynamic-framework-extension/resolve.bndrun (original)
+++ aries/trunk/spi-fly/spi-fly-dynamic-framework-extension/resolve.bndrun Tue Mar  5 01:15:02 2019
@@ -15,4 +15,4 @@
 -runee: JavaSE-1.8
 -runfw: org.apache.felix.framework
 -runrequires: osgi.identity;filter:='(osgi.identity=${project.artifactId})'
--runbundles: org.apache.aries.spifly.dynamic.framework.extension;version='[1.2.0,1.2.1)'
+-runbundles: org.apache.aries.spifly.dynamic.framework.extension;version='[1.2.1,1.2.2)'

Modified: aries/trunk/spi-fly/spi-fly-static-bundle/resolve.bndrun
URL: http://svn.apache.org/viewvc/aries/trunk/spi-fly/spi-fly-static-bundle/resolve.bndrun?rev=1854808&r1=1854807&r2=1854808&view=diff
==============================================================================
--- aries/trunk/spi-fly/spi-fly-static-bundle/resolve.bndrun (original)
+++ aries/trunk/spi-fly/spi-fly-static-bundle/resolve.bndrun Tue Mar  5 01:15:02 2019
@@ -15,4 +15,4 @@
 -runee: JavaSE-1.8
 -runfw: org.apache.felix.framework
 -runrequires: osgi.identity;filter:='(osgi.identity=${project.artifactId})'
--runbundles: org.apache.aries.spifly.static.bundle;version='[1.2.0,1.2.1)'
+-runbundles: org.apache.aries.spifly.static.bundle;version='[1.2.1,1.2.2)'