(nifi) branch main updated: NIFI-16264 Set order for Resource Types and Scopes in Manifest (#11598)

[pvillard]

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

pvillard31 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 8f56dfb2686 NIFI-16264 Set order for Resource Types and Scopes in 
Manifest (#11598)
8f56dfb2686 is described below

commit 8f56dfb26860fa901ea1ad8b35fe0d97fe7cef5d
Author: David Handermann <exceptionfact...@apache.org>
AuthorDate: Mon Aug 31 04:03:02 2026 -0500

    NIFI-16264 Set order for Resource Types and Scopes in Manifest (#11598)
---
 .../nifi/runtime/manifest/impl/StandardRuntimeManifestBuilder.java | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git 
a/nifi-manifest/nifi-runtime-manifest-core/src/main/java/org/apache/nifi/runtime/manifest/impl/StandardRuntimeManifestBuilder.java
 
b/nifi-manifest/nifi-runtime-manifest-core/src/main/java/org/apache/nifi/runtime/manifest/impl/StandardRuntimeManifestBuilder.java
index d3409859eec..7bd28132a8a 100644
--- 
a/nifi-manifest/nifi-runtime-manifest-core/src/main/java/org/apache/nifi/runtime/manifest/impl/StandardRuntimeManifestBuilder.java
+++ 
b/nifi-manifest/nifi-runtime-manifest-core/src/main/java/org/apache/nifi/runtime/manifest/impl/StandardRuntimeManifestBuilder.java
@@ -80,6 +80,7 @@ import org.slf4j.LoggerFactory;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.LinkedHashMap;
+import java.util.LinkedHashSet;
 import java.util.List;
 import java.util.Map;
 import java.util.TreeSet;
@@ -624,10 +625,11 @@ public class StandardRuntimeManifestBuilder implements 
RuntimeManifestBuilder {
             final org.apache.nifi.c2.protocol.component.api.Stateful 
componentStateful = new org.apache.nifi.c2.protocol.component.api.Stateful();
             componentStateful.setDescription(stateful.getDescription());
             if (stateful.getScopes() != null) {
+                // Collect to LinkedHashSet for deterministic ordering of 
Scopes
                 componentStateful.setScopes(
                         stateful.getScopes().stream()
                                 .map(this::getScope)
-                                .collect(Collectors.toSet())
+                                
.collect(Collectors.toCollection(LinkedHashSet::new))
                 );
                 extensionComponent.setStateful(componentStateful);
             }
@@ -755,10 +757,11 @@ public class StandardRuntimeManifestBuilder implements 
RuntimeManifestBuilder {
         };
         propertyResourceDefinition.setCardinality(cardinality);
 
+        // Collect to LinkedHashSet for deterministic ordering of Resource 
Types
         propertyResourceDefinition.setResourceTypes(
                 resourceDefinition.getResourceTypes().stream()
                         .map(this::getResourceType)
-                        .collect(Collectors.toSet())
+                        .collect(Collectors.toCollection(LinkedHashSet::new))
         );
 
         return propertyResourceDefinition;