Merge pull request #1924 from eclipse-ditto/bugfix/fix-if-match-headers-weak-etag-handling

fix weak eTag handling of If-Match and If-None-Match headers

Author: thjaeckle

internal/utils/conditional-headers/src/main/java/org/eclipse/ditto/internal/utils/headers/conditional/IfMatchPreconditionHeader.java

@@ -59,7 +59,13 @@ public boolean meetsConditionFor(@Nullable final EntityTag entityTag) {
             return false;
         }
 
-        return entityTagsToMatch.stream().anyMatch(entityTagToMatch -> entityTagToMatch.strongMatch(entityTag));
+        return entityTagsToMatch.stream().anyMatch(entityTagToMatch -> {
+            if (entityTag.isWeak()) {
+                return entityTagToMatch.weakMatch(entityTag);
+            } else {
+                return entityTagToMatch.strongMatch(entityTag);
+            }
+        });
     }
 
     /**

internal/utils/conditional-headers/src/main/java/org/eclipse/ditto/internal/utils/headers/conditional/IfNoneMatchPreconditionHeader.java

@@ -56,7 +56,13 @@ public boolean meetsConditionFor(@Nullable final EntityTag entityTag) {
             return true;
         }
 
-        return entityTagsToMatch.stream().noneMatch(entityTagToMatch -> entityTagToMatch.weakMatch(entityTag));
+        return entityTagsToMatch.stream().noneMatch(entityTagToMatch -> {
+            if (entityTag.isWeak()) {
+                return entityTagToMatch.weakMatch(entityTag);
+            } else {
+                return entityTagToMatch.strongMatch(entityTag);
+            }
+        });
     }
 
     /**