changed signature of Policy.isSemanticallySameAs to check for another…

… Policy Signed-off-by: Thomas Jaeckle <thomas.jaeckle@bosch.io>
eclipse-ditto · Sep 21, 2022 · 12dff0f · 12dff0f
1 parent 3011222
commit 12dff0f
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 14 deletions.
diff --git a/policies/model/src/main/java/org/eclipse/ditto/policies/model/ImmutablePolicy.java b/policies/model/src/main/java/org/eclipse/ditto/policies/model/ImmutablePolicy.java
@@ -438,9 +438,9 @@ public Stream<PolicyEntry> stream() {
     }
 
     @Override
-    public boolean isSemanticallySameAs(final Collection<PolicyEntry> otherPolicyEntries) {
+    public boolean isSemanticallySameAs(final Policy otherPolicy) {
         // sorting via the policy entry label is required in order to not depend on the order:
-        final Iterator<PolicyEntry> others = otherPolicyEntries.stream()
+        final Iterator<PolicyEntry> others = otherPolicy.stream()
                 .sorted(Comparator.comparing(e -> e.getLabel().toString()))
                 .collect(Collectors.toCollection(LinkedHashSet::new))
                 .iterator();

diff --git a/policies/model/src/main/java/org/eclipse/ditto/policies/model/Policy.java b/policies/model/src/main/java/org/eclipse/ditto/policies/model/Policy.java
@@ -14,7 +14,6 @@
 
 import static org.eclipse.ditto.base.model.common.ConditionChecker.checkNotNull;
 
-import java.util.Collection;
 import java.util.Objects;
 import java.util.Optional;
 import java.util.Set;
@@ -367,16 +366,14 @@ Optional<EffectedPermissions> getEffectedPermissionsFor(CharSequence label, Subj
     Stream<PolicyEntry> stream();
 
     /**
-     * Checks if the passed {@code otherPolicyEntries} are semantically the same as the in this policy contained policy
-     * entries.
+     * Checks if the passed {@code otherPolicy} is semantically the same as this policy.
      * I.e. that those contain the same policy entries with the same subject ids having the same resources.
      *
-     * @param otherPolicyEntries the other policy entries to check against.
-     * @return {@code true} if the other policy entries are semantically the same as the in this policy contained policy
-     * entries.
+     * @param otherPolicy the other policy to check against.
+     * @return {@code true} if the other policy is semantically the same as this policy.
      * @since 3.0.0
      */
-    boolean isSemanticallySameAs(Collection<PolicyEntry> otherPolicyEntries);
+    boolean isSemanticallySameAs(Policy otherPolicy);
 
     /**
      * Returns a JSON object representation of this policy to embed in another JSON object.

diff --git a/policies/model/src/test/java/org/eclipse/ditto/policies/model/ImmutablePolicyTest.java b/policies/model/src/test/java/org/eclipse/ditto/policies/model/ImmutablePolicyTest.java
@@ -355,7 +355,7 @@ public void ensureTwoPoliciesAreSemanticallyTheSameIfOnlySubjectPayloadDiffers()
                 .setResource(resource1)
                 .build();
 
-        assertThat(policyA.isSemanticallySameAs(policyB.getEntriesSet())).isTrue();
+        assertThat(policyA.isSemanticallySameAs(policyB)).isTrue();
     }
 
     @Test
@@ -383,7 +383,7 @@ public void ensureTwoPoliciesAreSemanticallyDifferentIfSubjectIdsDiffer() {
                 .setResource(resource2)
                 .build();
 
-        assertThat(policyA.isSemanticallySameAs(policyB.getEntriesSet())).isFalse();
+        assertThat(policyA.isSemanticallySameAs(policyB)).isFalse();
     }
 
     @Test
@@ -412,7 +412,7 @@ public void ensureTwoPoliciesAreSemanticallyDifferentIfResourcesDiffer() {
                 .setResource(resource3)
                 .build();
 
-        assertThat(policyA.isSemanticallySameAs(policyB.getEntriesSet())).isFalse();
+        assertThat(policyA.isSemanticallySameAs(policyB)).isFalse();
     }
 
     @Test
@@ -442,7 +442,7 @@ public void ensureTwoPoliciesAreSemanticallyDifferentIfOneContainsMoreEntries()
                 .setResource(resource2)
                 .build();
 
-        assertThat(policyA.isSemanticallySameAs(policyB.getEntriesSet())).isFalse();
+        assertThat(policyA.isSemanticallySameAs(policyB)).isFalse();
     }
 
 }
diff --git a/...in/java/org/eclipse/ditto/policies/service/persistence/actors/PolicyPersistenceActor.java b/...in/java/org/eclipse/ditto/policies/service/persistence/actors/PolicyPersistenceActor.java
@@ -190,7 +190,7 @@ protected void publishEvent(@Nullable final Policy previousEntity, final PolicyE
 
         if (null != previousEntity && null != entity) {
             if (previousEntity.hasLifecycle(PolicyLifecycle.DELETED) || entityExistsAsDeleted() ||
-                    !previousEntity.isSemanticallySameAs(entity.getEntriesSet())) {
+                    !previousEntity.isSemanticallySameAs(entity)) {
                 // however only publish the PolicyTag when the Policy semantically changed
                 // (e.g. not when only a "subject" payload changed but not the subjectId itself)
                 publishPolicyTag(event);