From 1a74794ae49aceae5a4c45893f31910af0363d38 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jean-Baptiste=20Onofr=C3=A9?= <jbonofre@apache.org>
Date: Tue, 11 Dec 2018 17:24:00 +0100
Subject: [PATCH] [FELIX-5997] Remove hashcode and equals from
 AbstractCapabilityRequirement to deal with fragment

---
 .../resource/AbstractCapabilityRequirement.java | 17 -----------------
 .../utils/resource/CapabilityImplTest.java      |  8 +++-----
 .../utils/resource/RequirementImplTest.java     |  8 +++-----
 3 files changed, 6 insertions(+), 27 deletions(-)

diff --git a/utils/src/main/java/org/apache/felix/utils/resource/AbstractCapabilityRequirement.java b/utils/src/main/java/org/apache/felix/utils/resource/AbstractCapabilityRequirement.java
index 13aa978cca1..2a505abf9e5 100644
--- a/utils/src/main/java/org/apache/felix/utils/resource/AbstractCapabilityRequirement.java
+++ b/utils/src/main/java/org/apache/felix/utils/resource/AbstractCapabilityRequirement.java
@@ -76,23 +76,6 @@ public Resource getResource() {
         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());
diff --git a/utils/src/test/java/org/apache/felix/utils/resource/CapabilityImplTest.java b/utils/src/test/java/org/apache/felix/utils/resource/CapabilityImplTest.java
index 6e0ccf6fd7f..25749b5932c 100644
--- a/utils/src/test/java/org/apache/felix/utils/resource/CapabilityImplTest.java
+++ b/utils/src/test/java/org/apache/felix/utils/resource/CapabilityImplTest.java
@@ -52,12 +52,10 @@ public void testCapabilityEqualsHashcode() {
         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 void testCopyCapability() {
         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());
     }
 }
diff --git a/utils/src/test/java/org/apache/felix/utils/resource/RequirementImplTest.java b/utils/src/test/java/org/apache/felix/utils/resource/RequirementImplTest.java
index edbcaab3511..a8862e187db 100644
--- a/utils/src/test/java/org/apache/felix/utils/resource/RequirementImplTest.java
+++ b/utils/src/test/java/org/apache/felix/utils/resource/RequirementImplTest.java
@@ -53,12 +53,10 @@ public void testRequirementEqualsHashcode() {
         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 void testCopyRequirement() {
         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() {