SPI Fly R8 conformance fixes

spi-fly/spi-fly-core/src/main/java/org/apache/aries/spifly/ConsumerBundleTrackerCustomizer.java

@@ -19,7 +19,8 @@
 package org.apache.aries.spifly;
 
 import org.osgi.framework.Bundle;
-import org.osgi.framework.BundleEvent;
+import org.osgi.framework.BundleEvent;
+import org.osgi.framework.wiring.BundleRevision;
 import org.osgi.util.tracker.BundleTrackerCustomizer;
 
 public class ConsumerBundleTrackerCustomizer implements BundleTrackerCustomizer {
@@ -31,24 +32,31 @@ public ConsumerBundleTrackerCustomizer(BaseActivator baseActivator, String consu
         headerName = consumerHeaderName;
     }
 
-    @Override
-    public Object addingBundle(Bundle bundle, BundleEvent event) {
-        try {
-            activator.addConsumerWeavingData(bundle, headerName);
+    @Override
+    public Object addingBundle(Bundle bundle, BundleEvent event) {
+        try {
+            BundleRevision revision = bundle.adapt(BundleRevision.class);
+            if (revision != null
+                    && (revision.getTypes() & BundleRevision.TYPE_FRAGMENT) != 0) {
+                activator.fragmentAttached(bundle, headerName);
+                return bundle;
+            }
+            activator.addConsumerWeavingData(bundle, headerName);
         } catch (Exception e) {
             throw new RuntimeException(e);
         }
         return bundle;
     }
 
-    @Override
-    public void modifiedBundle(Bundle bundle, BundleEvent event, Object object) {
-        removedBundle(bundle, event, object);
-        addingBundle(bundle, event);
-    }
+    @Override
+    public void modifiedBundle(Bundle bundle, BundleEvent event, Object object) {
+        activator.removeWeavingData(bundle);
+        addingBundle(bundle, event);
+    }
 
     @Override
-    public void removedBundle(Bundle bundle, BundleEvent event, Object object) {
-        activator.removeWeavingData(bundle);
-    }
-}
+    public void removedBundle(Bundle bundle, BundleEvent event, Object object) {
+        activator.removeWeavingData(bundle);
+        activator.forgetConsumerProviderUses(bundle);
+    }
+}

spi-fly/spi-fly-core/src/main/java/org/apache/aries/spifly/ConsumerHeaderProcessor.java

@@ -18,9 +18,10 @@
  */
 package org.apache.aries.spifly;
 
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Dictionary;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.Dictionary;
 import java.util.HashSet;
 import java.util.Hashtable;
 import java.util.List;
@@ -177,15 +178,21 @@ public static Set<WeavingData> processHeader(String consumerHeaderName, String c
 
             weavingData.add(createWeavingData(className, methodName, methodRestriction, allowedBundles));
 
-            if (serviceLoader) {
-                className = ServiceLoader.class.getName();
-                methodName = "load";
+            if (serviceLoader) {
+                className = ServiceLoader.class.getName();
+                methodName = "load";
                 ArgRestrictions argRestrictions = new ArgRestrictions();
                 argRestrictions.addRestriction(0, Class.class.getName());
                 argRestrictions.addRestriction(1, ClassLoader.class.getName());
-                methodRestriction = new MethodRestriction(methodName, argRestrictions);
-                weavingData.add(createWeavingData(className, methodName, methodRestriction, allowedBundles));
-            }
+                methodRestriction = new MethodRestriction(methodName, argRestrictions);
+                weavingData.add(createWeavingData(className, methodName, methodRestriction, allowedBundles));
+
+                methodName = "loadInstalled";
+                argRestrictions = new ArgRestrictions();
+                argRestrictions.addRestriction(0, Class.class.getName());
+                methodRestriction = new MethodRestriction(methodName, argRestrictions);
+                weavingData.add(createWeavingData(className, methodName, methodRestriction, allowedBundles));
+            }
         }
         return weavingData;
     }
@@ -197,8 +204,8 @@ private static Set<WeavingData> processRequireCapabilityHeader(String consumerHe
         Entry<String, ? extends Map<String, String>> extenderRequirement = findRequirement(requirements, SpiFlyConstants.EXTENDER_CAPABILITY_NAMESPACE, SpiFlyConstants.PROCESSOR_EXTENDER_NAME);
         Collection<Entry<String, ? extends Map<String, String>>> serviceLoaderRequirements = findAllMetadata(requirements, SpiFlyConstants.SERVICELOADER_CAPABILITY_NAMESPACE);
 
-        if (extenderRequirement != null) {
-            List<BundleDescriptor> allowedBundles = new ArrayList<BundleDescriptor>();
+        if (extenderRequirement != null) {
+            List<BundleDescriptor> allowedBundles = new ArrayList<BundleDescriptor>();
             for (Entry<String, ? extends Map<String, String>> req : serviceLoaderRequirements) {
                 String slFilterString = req.getValue().get(SpiFlyConstants.FILTER_DIRECTIVE);
                 if (slFilterString != null) {
@@ -207,26 +214,47 @@ private static Set<WeavingData> processRequireCapabilityHeader(String consumerHe
                 }
             }
 
-            // ServiceLoader.load(Class)
-            {
-                ArgRestrictions ar = new ArgRestrictions();
-                ar.addRestriction(0, Class.class.getName());
-                MethodRestriction mr = new MethodRestriction("load", ar);
-                weavingData.add(createWeavingData(ServiceLoader.class.getName(), "load", mr, allowedBundles));
-            }
-
-            // ServiceLoader.load(Class, ClassLoader)
-            {
-                ArgRestrictions ar = new ArgRestrictions();
-                ar.addRestriction(0, Class.class.getName());
-                ar.addRestriction(1, ClassLoader.class.getName());
-                MethodRestriction mr = new MethodRestriction("load", ar);
-                weavingData.add(createWeavingData(ServiceLoader.class.getName(), "load", mr, allowedBundles));
-            }
-        }
-
-        return weavingData;
-    }
+            weavingData.addAll(createServiceLoaderWeavingData(allowedBundles));
+        }
+
+        return weavingData;
+    }
+
+    static Set<WeavingData> createServiceLoaderWeavingData() {
+        return createServiceLoaderWeavingData(Collections.<BundleDescriptor>emptyList());
+    }
+
+    private static Set<WeavingData> createServiceLoaderWeavingData(List<BundleDescriptor> allowedBundles) {
+        Set<WeavingData> weavingData = new HashSet<WeavingData>();
+
+        // ServiceLoader.load(Class)
+        {
+            ArgRestrictions ar = new ArgRestrictions();
+            ar.addRestriction(0, Class.class.getName());
+            MethodRestriction mr = new MethodRestriction("load", ar);
+            weavingData.add(createWeavingData(ServiceLoader.class.getName(), "load", mr, allowedBundles));
+        }
+
+        // ServiceLoader.load(Class, ClassLoader)
+        {
+            ArgRestrictions ar = new ArgRestrictions();
+            ar.addRestriction(0, Class.class.getName());
+            ar.addRestriction(1, ClassLoader.class.getName());
+            MethodRestriction mr = new MethodRestriction("load", ar);
+            weavingData.add(createWeavingData(ServiceLoader.class.getName(), "load", mr, allowedBundles));
+        }
+
+        // ServiceLoader.loadInstalled(Class)
+        {
+            ArgRestrictions ar = new ArgRestrictions();
+            ar.addRestriction(0, Class.class.getName());
+            MethodRestriction mr = new MethodRestriction("loadInstalled", ar);
+            weavingData.add(createWeavingData(
+                    ServiceLoader.class.getName(), "loadInstalled", mr, allowedBundles));
+        }
+
+        return weavingData;
+    }
 
     private static WeavingData createWeavingData(String className, String methodName,
             MethodRestriction methodRestriction, List<BundleDescriptor> allowedBundles) {