svn commit: r1829650 - in /felix/trunk/utils/src: main/java/org/apache/felix/utils/resource/ test/java/org/apache/felix/utils/resource/

[da...@apache.org]

Author: davidb
Date: Fri Apr 20 12:40:25 2018
New Revision: 1829650

URL: http://svn.apache.org/viewvc?rev=1829650&view=rev
Log:
FELIX-5838 Add OSGi Resource implementations to Felix Utils

Allow null resources on requirements and capabilities, as allowed per Requirement.getResource() spec.

Modified:
    felix/trunk/utils/src/main/java/org/apache/felix/utils/resource/AbstractCapabilityRequirement.java
    felix/trunk/utils/src/test/java/org/apache/felix/utils/resource/CapabilityImplTest.java
    felix/trunk/utils/src/test/java/org/apache/felix/utils/resource/RequirementImplTest.java

Modified: felix/trunk/utils/src/main/java/org/apache/felix/utils/resource/AbstractCapabilityRequirement.java
URL: http://svn.apache.org/viewvc/felix/trunk/utils/src/main/java/org/apache/felix/utils/resource/AbstractCapabilityRequirement.java?rev=1829650&r1=1829649&r2=1829650&view=diff
==============================================================================
--- felix/trunk/utils/src/main/java/org/apache/felix/utils/resource/AbstractCapabilityRequirement.java (original)
+++ felix/trunk/utils/src/main/java/org/apache/felix/utils/resource/AbstractCapabilityRequirement.java Fri Apr 20 12:40:25 2018
@@ -38,7 +38,7 @@ abstract class AbstractCapabilityRequire
     protected final Map<String, Object> attributes;
 
     AbstractCapabilityRequirement(final Resource res, final String ns, final Map<String, String> dirs, final Map<String, Object> attrs) {
-        resource = Objects.requireNonNull(res, "Resource must not be null.");
+        resource = res;
         namespace = Objects.requireNonNull(ns, "Namespace must not be null.");
         directives = StringArrayMap.reduceMemory(dirs);
         attributes = StringArrayMap.reduceMemory(attrs);

Modified: felix/trunk/utils/src/test/java/org/apache/felix/utils/resource/CapabilityImplTest.java
URL: http://svn.apache.org/viewvc/felix/trunk/utils/src/test/java/org/apache/felix/utils/resource/CapabilityImplTest.java?rev=1829650&r1=1829649&r2=1829650&view=diff
==============================================================================
--- felix/trunk/utils/src/test/java/org/apache/felix/utils/resource/CapabilityImplTest.java (original)
+++ felix/trunk/utils/src/test/java/org/apache/felix/utils/resource/CapabilityImplTest.java Fri Apr 20 12:40:25 2018
@@ -32,7 +32,6 @@ import static org.junit.Assert.assertNot
 public class CapabilityImplTest extends TestCase {
 
     public void testCapability() {
-        Resource res = new ResourceImpl();
         Map<String, Object> attrs = Collections.<String,Object>singletonMap("foo", "bar");
         Map<String, String> dirs = Collections.emptyMap();
         CapabilityImpl c = new CapabilityImpl(Mockito.mock(Resource.class), "org.foo.bar", dirs, attrs);

Modified: felix/trunk/utils/src/test/java/org/apache/felix/utils/resource/RequirementImplTest.java
URL: http://svn.apache.org/viewvc/felix/trunk/utils/src/test/java/org/apache/felix/utils/resource/RequirementImplTest.java?rev=1829650&r1=1829649&r2=1829650&view=diff
==============================================================================
--- felix/trunk/utils/src/test/java/org/apache/felix/utils/resource/RequirementImplTest.java (original)
+++ felix/trunk/utils/src/test/java/org/apache/felix/utils/resource/RequirementImplTest.java Fri Apr 20 12:40:25 2018
@@ -33,12 +33,12 @@ public class RequirementImplTest extends
     public void testRequirement() {
         Map<String, Object> attrs = Collections.<String,Object>singletonMap("foo", "bar");
         Map<String, String> dirs = Collections.emptyMap();
-        RequirementImpl r = new RequirementImpl(Mockito.mock(Resource.class),"org.foo.bar", dirs, attrs);
+        RequirementImpl r = new RequirementImpl(null, "org.foo.bar", dirs, attrs);
 
         assertEquals("org.foo.bar", r.getNamespace());
         assertEquals(attrs, r.getAttributes());
         assertEquals(dirs, r.getDirectives());
-        assertNotNull(r.getResource());
+        assertNull(r.getResource());
     }
 
     public void testRequirementEqualsHashcode() {