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

* they were not supporting both variants, but "If-Match" header assumed strong etags and "If-None-Match" assumed weak etags
eclipse-ditto · Apr 5, 2024 · c2a8f06 · c2a8f06
1 parent 6ee7ce0
commit c2a8f06
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 2 deletions.
diff --git a/.../java/org/eclipse/ditto/internal/utils/headers/conditional/IfMatchPreconditionHeader.java b/.../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);
+            }
+        });
     }
 
     /**

diff --git a/...a/org/eclipse/ditto/internal/utils/headers/conditional/IfNoneMatchPreconditionHeader.java b/...a/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);
+            }
+        });
     }
 
     /**