solve the issue for mutually exclusive tags validation for PUT API (o…

…pen-metadata#11428) * solve the issue for mutually exclusive tags validation for PUT API * checkstyle --------- Co-authored-by: Himank Mehta <[email protected]>
madsemildahlgaard · May 8, 2023 · 9d61d63 · 9d61d63
1 parent 2c9ba53
commit 9d61d63
Showing 1 changed file with 4 additions and 3 deletions.
diff --git a/openmetadata-service/src/main/java/org/openmetadata/service/jdbi3/EntityRepository.java b/openmetadata-service/src/main/java/org/openmetadata/service/jdbi3/EntityRepository.java
@@ -1453,14 +1453,15 @@ protected void updateTags(String fqn, String fieldName, List<TagLabel> origTags,
         return; // Nothing to update
       }
 
-      // Remove current entity tags in the database. It will be added back later from the merged tag list.
-      daoCollection.tagUsageDAO().deleteTagsByTarget(fqn);
-
       if (operation.isPut()) {
         // PUT operation merges tags in the request with what already exists
         EntityUtil.mergeTags(updatedTags, origTags);
+        checkMutuallyExclusive(updatedTags);
       }
 
+      // Remove current entity tags in the database. It will be added back later from the merged tag list.
+      daoCollection.tagUsageDAO().deleteTagsByTarget(fqn);
+
       List<TagLabel> addedTags = new ArrayList<>();
       List<TagLabel> deletedTags = new ArrayList<>();
       recordListChange(fieldName, origTags, updatedTags, addedTags, deletedTags, tagLabelMatch);