svn commit: r1185791 - /camel/trunk/components/camel-blueprint/src/main/java/org/apache/camel/blueprint/BlueprintContainerRegistry.java

[ha...@apache.org]

Author: hadrian
Date: Tue Oct 18 18:46:39 2011
New Revision: 1185791

URL: http://svn.apache.org/viewvc?rev=1185791&view=rev
Log:
CAMEL-4543. First patch applied with thanks to Aaron. Remove unnecessary dependency on Aries"

Modified:
    camel/trunk/components/camel-blueprint/src/main/java/org/apache/camel/blueprint/BlueprintContainerRegistry.java

Modified: camel/trunk/components/camel-blueprint/src/main/java/org/apache/camel/blueprint/BlueprintContainerRegistry.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-blueprint/src/main/java/org/apache/camel/blueprint/BlueprintContainerRegistry.java?rev=1185791&r1=1185790&r2=1185791&view=diff
==============================================================================
--- camel/trunk/components/camel-blueprint/src/main/java/org/apache/camel/blueprint/BlueprintContainerRegistry.java (original)
+++ camel/trunk/components/camel-blueprint/src/main/java/org/apache/camel/blueprint/BlueprintContainerRegistry.java Tue Oct 18 18:46:39 2011
@@ -18,14 +18,16 @@ package org.apache.camel.blueprint;
 
 import java.util.LinkedHashMap;
 import java.util.Map;
+import java.util.Set;
 
-import org.apache.aries.blueprint.ExtendedBeanMetadata;
-import org.apache.aries.blueprint.mutable.MutableReferenceMetadata;
 import org.apache.camel.NoSuchBeanException;
 import org.apache.camel.spi.Registry;
 import org.osgi.framework.Bundle;
 import org.osgi.service.blueprint.container.BlueprintContainer;
 import org.osgi.service.blueprint.container.NoSuchComponentException;
+import org.osgi.service.blueprint.reflect.BeanMetadata;
+import org.osgi.service.blueprint.reflect.ComponentMetadata;
+import org.osgi.service.blueprint.reflect.ReferenceMetadata;
 
 public class BlueprintContainerRegistry implements Registry {
 
@@ -66,32 +68,22 @@ public class BlueprintContainerRegistry 
     }
 
     public static <T> Map<String, T> lookupByType(BlueprintContainer blueprintContainer, Class<T> type) {
+        Bundle bundle = (Bundle) blueprintContainer.getComponentInstance("blueprintBundle");
         Map<String, T> objects = new LinkedHashMap<String, T>();
-        for (Object metadataObject : blueprintContainer.getMetadata(ExtendedBeanMetadata.class)) {
-            ExtendedBeanMetadata metadata = (ExtendedBeanMetadata) metadataObject;
+        @SuppressWarnings("unchecked")
+        Set<String> ids = blueprintContainer.getComponentIds();
+        for (String id : ids) {
             try {
-                Class cl = metadata.getRuntimeClass();
-                if (cl == null && metadata.getClassName() != null) {
-                    Bundle bundle = (Bundle) blueprintContainer.getComponentInstance("blueprintBundle");
-                    cl = bundle.loadClass(metadata.getClassName());
+                ComponentMetadata metadata = blueprintContainer.getComponentMetadata(id);
+                Class cl = null;
+                if (metadata instanceof BeanMetadata) {
+                    BeanMetadata beanMetadata = (BeanMetadata)metadata;
+                    cl = bundle.loadClass(beanMetadata.getClassName());
+                } else if (metadata instanceof ReferenceMetadata) {
+                    ReferenceMetadata referenceMetadata = (ReferenceMetadata)metadata;
+                    cl = bundle.loadClass(referenceMetadata.getInterface());
                 }
-                if (cl == null || type.isAssignableFrom(cl)) {
-                    Object o = blueprintContainer.getComponentInstance(metadata.getId());
-                    objects.put(metadata.getId(), type.cast(o));
-                }
-            } catch (Throwable t) {
-                // ignore
-            }
-        }
-        for (Object metadataObject : blueprintContainer.getMetadata(MutableReferenceMetadata.class)) {
-            MutableReferenceMetadata metadata = (MutableReferenceMetadata) metadataObject;
-            try {
-                Class cl = metadata.getRuntimeInterface();
-                if (cl == null && metadata.getInterface() != null) {
-                    Bundle bundle = (Bundle) blueprintContainer.getComponentInstance("blueprintBundle");
-                    cl = bundle.loadClass(metadata.getInterface());
-                }
-                if (cl == null || type.isAssignableFrom(cl)) {
+                if (cl != null && type.isAssignableFrom(cl)) {
                     Object o = blueprintContainer.getComponentInstance(metadata.getId());
                     objects.put(metadata.getId(), type.cast(o));
                 }
@@ -101,5 +93,4 @@ public class BlueprintContainerRegistry 
         }
         return objects;
     }
-
 }