svn commit: r1829637 - in /felix/trunk/bundlerepository/src: main/java/org/apache/felix/bundlerepository/impl/ test/java/org/apache/felix/bundlerepository/impl/

[da...@apache.org]

Author: davidb
Date: Fri Apr 20 08:42:03 2018
New Revision: 1829637

URL: http://svn.apache.org/viewvc?rev=1829637&view=rev
Log:
Use latest capabilities from utils project.

Remove reliance on setResource()

Modified:
    felix/trunk/bundlerepository/src/main/java/org/apache/felix/bundlerepository/impl/FelixResourceAdapter.java
    felix/trunk/bundlerepository/src/main/java/org/apache/felix/bundlerepository/impl/OSGiRepositoryImpl.java
    felix/trunk/bundlerepository/src/test/java/org/apache/felix/bundlerepository/impl/OSGiRepositoryImplTest.java
    felix/trunk/bundlerepository/src/test/java/org/apache/felix/bundlerepository/impl/OSGiRepositoryXMLTest.java
    felix/trunk/bundlerepository/src/test/java/org/apache/felix/bundlerepository/impl/OSGiRequirementAdapterTest.java

Modified: felix/trunk/bundlerepository/src/main/java/org/apache/felix/bundlerepository/impl/FelixResourceAdapter.java
URL: http://svn.apache.org/viewvc/felix/trunk/bundlerepository/src/main/java/org/apache/felix/bundlerepository/impl/FelixResourceAdapter.java?rev=1829637&r1=1829636&r2=1829637&view=diff
==============================================================================
--- felix/trunk/bundlerepository/src/main/java/org/apache/felix/bundlerepository/impl/FelixResourceAdapter.java (original)
+++ felix/trunk/bundlerepository/src/main/java/org/apache/felix/bundlerepository/impl/FelixResourceAdapter.java Fri Apr 20 08:42:03 2018
@@ -19,7 +19,7 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 
-import org.apache.felix.utils.capabilities.CapabilityImpl;
+import org.apache.felix.utils.resource.CapabilityImpl;
 import org.osgi.framework.namespace.IdentityNamespace;
 import org.osgi.resource.Capability;
 import org.osgi.resource.Requirement;
@@ -42,14 +42,12 @@ public class FelixResourceAdapter implem
 
         if (namespace == null || namespace.equals(IdentityNamespace.IDENTITY_NAMESPACE))
         {
-            CapabilityImpl c = OSGiRepositoryImpl.newOSGiIdentityCapability(resource);
-            c.setResource(this);
+            CapabilityImpl c = OSGiRepositoryImpl.newOSGiIdentityCapability(resource, this);
             result.add(c);
         }
         if (namespace == null || namespace.equals(ContentNamespace.CONTENT_NAMESPACE))
         {
-            CapabilityImpl c = OSGiRepositoryImpl.newOSGiContentCapability(resource);
-            c.setResource(this);
+            CapabilityImpl c = OSGiRepositoryImpl.newOSGiContentCapability(resource, this);
             result.add(c);
         }
 

Modified: felix/trunk/bundlerepository/src/main/java/org/apache/felix/bundlerepository/impl/OSGiRepositoryImpl.java
URL: http://svn.apache.org/viewvc/felix/trunk/bundlerepository/src/main/java/org/apache/felix/bundlerepository/impl/OSGiRepositoryImpl.java?rev=1829637&r1=1829636&r2=1829637&view=diff
==============================================================================
--- felix/trunk/bundlerepository/src/main/java/org/apache/felix/bundlerepository/impl/OSGiRepositoryImpl.java (original)
+++ felix/trunk/bundlerepository/src/main/java/org/apache/felix/bundlerepository/impl/OSGiRepositoryImpl.java Fri Apr 20 08:42:03 2018
@@ -33,15 +33,15 @@ import java.util.Map;
 import java.util.concurrent.Callable;
 
 import org.apache.felix.bundlerepository.RepositoryAdmin;
-import org.apache.felix.bundlerepository.Resource;
 import org.apache.felix.bundlerepository.impl.LazyHashMap.LazyValue;
-import org.apache.felix.utils.capabilities.CapabilityImpl;
+import org.apache.felix.utils.resource.CapabilityImpl;
 import org.osgi.framework.Filter;
 import org.osgi.framework.FrameworkUtil;
 import org.osgi.framework.namespace.IdentityNamespace;
 import org.osgi.resource.Capability;
 import org.osgi.resource.Namespace;
 import org.osgi.resource.Requirement;
+import org.osgi.resource.Resource;
 import org.osgi.service.repository.ContentNamespace;
 import org.osgi.service.repository.Repository;
 
@@ -120,7 +120,8 @@ class OSGiRepositoryImpl implements Repo
         caps.add(idCap);
     }
 
-    static CapabilityImpl newOSGiIdentityCapability(org.apache.felix.bundlerepository.Resource res)
+    static CapabilityImpl newOSGiIdentityCapability(org.apache.felix.bundlerepository.Resource res,
+            org.osgi.resource.Resource targetResource)
     {
         @SuppressWarnings("unchecked")
         Map<String, Object> idAttrs = new HashMap<String, Object>(res.getProperties());
@@ -131,10 +132,11 @@ class OSGiRepositoryImpl implements Repo
         if (idAttrs.get(IdentityNamespace.CAPABILITY_TYPE_ATTRIBUTE) == null)
             idAttrs.put(IdentityNamespace.CAPABILITY_TYPE_ATTRIBUTE, IdentityNamespace.TYPE_BUNDLE);
 
-        return new CapabilityImpl(IdentityNamespace.IDENTITY_NAMESPACE, idAttrs, Collections.<String, String> emptyMap());
+        return new CapabilityImpl(IdentityNamespace.IDENTITY_NAMESPACE, idAttrs, Collections.<String, String> emptyMap(), targetResource);
     }
 
-    static CapabilityImpl newOSGiContentCapability(Resource resource)
+    static CapabilityImpl newOSGiContentCapability(org.apache.felix.bundlerepository.Resource resource,
+            org.osgi.resource.Resource targetResource)
     {
         final String uri = resource.getURI();
         LazyValue<String, Object> lazyValue =
@@ -155,7 +157,7 @@ class OSGiRepositoryImpl implements Repo
         contentAttrs.put(ContentNamespace.CAPABILITY_MIME_ATTRIBUTE, mime);
         contentAttrs.put(ContentNamespace.CAPABILITY_SIZE_ATTRIBUTE, resource.getSize());
         contentAttrs.put(ContentNamespace.CAPABILITY_URL_ATTRIBUTE, uri);
-        return new ContentCapabilityImpl(contentAttrs);
+        return new ContentCapabilityImpl(contentAttrs, targetResource);
     }
 
     static String getSHA256(String uri) throws IOException, NoSuchAlgorithmException // TODO find a good place for this
@@ -186,8 +188,8 @@ class OSGiRepositoryImpl implements Repo
     private static class ContentCapabilityImpl extends CapabilityImpl implements Capability {
         private final Map<String, Object> contentAttributes;
 
-        public ContentCapabilityImpl(Map<String, Object> contentAttrs) {
-            super(ContentNamespace.CONTENT_NAMESPACE, null, null);
+        public ContentCapabilityImpl(Map<String, Object> contentAttrs, Resource targetResource) {
+            super(ContentNamespace.CONTENT_NAMESPACE, null, null, targetResource);
             contentAttributes = Collections.unmodifiableMap(contentAttrs);
         }
 

Modified: felix/trunk/bundlerepository/src/test/java/org/apache/felix/bundlerepository/impl/OSGiRepositoryImplTest.java
URL: http://svn.apache.org/viewvc/felix/trunk/bundlerepository/src/test/java/org/apache/felix/bundlerepository/impl/OSGiRepositoryImplTest.java?rev=1829637&r1=1829636&r2=1829637&view=diff
==============================================================================
--- felix/trunk/bundlerepository/src/test/java/org/apache/felix/bundlerepository/impl/OSGiRepositoryImplTest.java (original)
+++ felix/trunk/bundlerepository/src/test/java/org/apache/felix/bundlerepository/impl/OSGiRepositoryImplTest.java Fri Apr 20 08:42:03 2018
@@ -22,9 +22,9 @@ import junit.framework.TestCase;
 
 import org.apache.felix.bundlerepository.Reason;
 import org.apache.felix.bundlerepository.Resolver;
-import org.apache.felix.utils.capabilities.CapabilityImpl;
-import org.apache.felix.utils.capabilities.RequirementImpl;
 import org.apache.felix.utils.log.Logger;
+import org.apache.felix.utils.resource.CapabilityImpl;
+import org.apache.felix.utils.resource.RequirementImpl;
 import org.mockito.Mockito;
 import org.osgi.framework.Bundle;
 import org.osgi.framework.BundleContext;

Modified: felix/trunk/bundlerepository/src/test/java/org/apache/felix/bundlerepository/impl/OSGiRepositoryXMLTest.java
URL: http://svn.apache.org/viewvc/felix/trunk/bundlerepository/src/test/java/org/apache/felix/bundlerepository/impl/OSGiRepositoryXMLTest.java?rev=1829637&r1=1829636&r2=1829637&view=diff
==============================================================================
--- felix/trunk/bundlerepository/src/test/java/org/apache/felix/bundlerepository/impl/OSGiRepositoryXMLTest.java (original)
+++ felix/trunk/bundlerepository/src/test/java/org/apache/felix/bundlerepository/impl/OSGiRepositoryXMLTest.java Fri Apr 20 08:42:03 2018
@@ -30,8 +30,8 @@ import java.util.Map.Entry;
 import junit.framework.TestCase;
 
 import org.apache.felix.bundlerepository.Resolver;
-import org.apache.felix.utils.capabilities.RequirementImpl;
 import org.apache.felix.utils.log.Logger;
+import org.apache.felix.utils.resource.RequirementImpl;
 import org.mockito.Mockito;
 import org.osgi.framework.Bundle;
 import org.osgi.framework.BundleContext;

Modified: felix/trunk/bundlerepository/src/test/java/org/apache/felix/bundlerepository/impl/OSGiRequirementAdapterTest.java
URL: http://svn.apache.org/viewvc/felix/trunk/bundlerepository/src/test/java/org/apache/felix/bundlerepository/impl/OSGiRequirementAdapterTest.java?rev=1829637&r1=1829636&r2=1829637&view=diff
==============================================================================
--- felix/trunk/bundlerepository/src/test/java/org/apache/felix/bundlerepository/impl/OSGiRequirementAdapterTest.java (original)
+++ felix/trunk/bundlerepository/src/test/java/org/apache/felix/bundlerepository/impl/OSGiRequirementAdapterTest.java Fri Apr 20 08:42:03 2018
@@ -23,7 +23,7 @@ import java.util.Map;
 
 import junit.framework.TestCase;
 
-import org.apache.felix.utils.capabilities.RequirementImpl;
+import org.apache.felix.utils.resource.RequirementImpl;
 import org.osgi.resource.Requirement;
 
 public class OSGiRequirementAdapterTest extends TestCase