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

[jbonofre]

Author: jbonofre
Date: Tue Dec 11 17:43:32 2018
New Revision: 1848700

URL: http://svn.apache.org/viewvc?rev=1848700&view=rev
Log:
[FELIX-5997] Remove hashcode and equals from AbstractCapabilityRequirement to 
deal with fragment. This closes #164

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=1848700&r1=1848699&r2=1848700&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
 Tue Dec 11 17:43:32 2018
@@ -76,23 +76,6 @@ abstract class AbstractCapabilityRequire
         return resource;
     }
 
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) return true;
-        if (o == null || getClass() != o.getClass()) return false;
-        AbstractCapabilityRequirement that = (AbstractCapabilityRequirement) o;
-        return Objects.equals(resource, that.resource) &&
-                Objects.equals(namespace, that.namespace) &&
-                Objects.equals(attributes, that.attributes) &&
-                Objects.equals(directives, that.directives);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(resource, namespace, attributes, directives);
-    }
-
     @Override
     public String toString() {
         return ResourceUtils.toString(getResource(), getNamespace(), 
getAttributes(), getDirectives());

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=1848700&r1=1848699&r2=1848700&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
 Tue Dec 11 17:43:32 2018
@@ -52,12 +52,10 @@ public class CapabilityImplTest extends
         assertEquals(res, c1.getResource());
 
         CapabilityImpl c2 = new CapabilityImpl(res, "org.foo.bar", dirs, 
attrs);
-        assertEquals(c1, c2);
-        assertEquals(c1.hashCode(), c2.hashCode());
+        assertEquals(c1.toString(), c2.toString());
 
         CapabilityImpl c3 = new CapabilityImpl(res, "org.foo.bar2", dirs, 
attrs);
-        assertNotEquals(c1, c3);
-        assertFalse(c1.hashCode() == c3.hashCode());
+        assertNotEquals(c1.toString(), c3.toString());
     }
 
     public void testCopyCapability() {
@@ -71,6 +69,6 @@ public class CapabilityImplTest extends
         assertNotEquals("Should not be equal, the resources are different", c, 
c2);
 
         CapabilityImpl c3 = new CapabilityImpl(res, c);
-        assertEquals(c, c3);
+        assertEquals(c.toString(), c3.toString());
     }
 }

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=1848700&r1=1848699&r2=1848700&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
 Tue Dec 11 17:43:32 2018
@@ -53,12 +53,10 @@ public class RequirementImplTest extends
         assertEquals(res, r1.getResource());
 
         RequirementImpl r2 = new RequirementImpl(res, "org.foo.bar", dirs, 
attrs);
-        assertEquals(r1, r2);
-        assertEquals(r1.hashCode(), r2.hashCode());
+        assertEquals(r1.toString(), r2.toString());
 
         RequirementImpl r3 = new RequirementImpl(res, "org.foo.bar2", dirs, 
attrs);
-        assertNotEquals(r1, r3);
-        assertNotEquals(r1.hashCode(), r3.hashCode());
+        assertNotEquals(r1.toString(), r3.toString());
     }
 
     public void testRequirementFilter() {
@@ -86,7 +84,7 @@ public class RequirementImplTest extends
         assertNotEquals("Should not be equal, the resources are different", r, 
r2);
 
         RequirementImpl r3 = new RequirementImpl(res1, r);
-        assertEquals(r, r3);
+        assertEquals(r.toString(), r3.toString());
     }
 
     public void testOptional() {