(nifi) branch main updated: NIFI-14072 Restored support for partial updates of Labels (#9575)

[exceptionfactory]

This is an automated email from the ASF dual-hosted git repository.

exceptionfactory pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/nifi.git


The following commit(s) were added to refs/heads/main by this push:
     new 8d2db608b3 NIFI-14072 Restored support for partial updates of Labels 
(#9575)
8d2db608b3 is described below

commit 8d2db608b3a5bd438bec4ef85ac89920671ff904
Author: Pierre Villard <pierre.villard...@gmail.com>
AuthorDate: Sat Dec 14 15:13:46 2024 +0100

    NIFI-14072 Restored support for partial updates of Labels (#9575)
    
    Signed-off-by: David Handermann <exceptionfact...@apache.org>
---
 .../main/java/org/apache/nifi/web/dao/impl/StandardLabelDAO.java    | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git 
a/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/dao/impl/StandardLabelDAO.java
 
b/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/dao/impl/StandardLabelDAO.java
index 696f691c1f..f1d0f80bf0 100644
--- 
a/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/dao/impl/StandardLabelDAO.java
+++ 
b/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/dao/impl/StandardLabelDAO.java
@@ -27,6 +27,8 @@ import org.apache.nifi.web.dao.LabelDAO;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Repository;
 
+import java.util.HashMap;
+import java.util.Map;
 import java.util.Set;
 
 @Repository
@@ -99,7 +101,9 @@ public class StandardLabelDAO extends ComponentDAO 
implements LabelDAO {
             label.setPosition(new Position(labelDTO.getPosition().getX(), 
labelDTO.getPosition().getY()));
         }
         if (labelDTO.getStyle() != null) {
-            label.setStyle(labelDTO.getStyle());
+            final Map<String, String> updatedStyles = new 
HashMap<>(label.getStyle());
+            updatedStyles.putAll(labelDTO.getStyle());
+            label.setStyle(updatedStyles);
         }
         if (labelDTO.getLabel() != null) {
             label.setValue(labelDTO.getLabel());