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 e9e214a9b6 NIFI-14556 Sorted by Component ID in Git Flow Registry
Serialized JSON (#9948)
e9e214a9b6 is described below
commit e9e214a9b60e0b6728c6c58fc8f9f31f1963706d
Author: Pierre Villard <[email protected]>
AuthorDate: Fri May 16 16:09:57 2025 +0200
NIFI-14556 Sorted by Component ID in Git Flow Registry Serialized JSON
(#9948)
Signed-off-by: David Handermann <[email protected]>
---
.../VersionedComponentCollectionSerializer.java | 59 ++++++++++++++++++++++
.../git/serialize/VersionedComponentModule.java | 7 ++-
2 files changed, 65 insertions(+), 1 deletion(-)
diff --git
a/nifi-extension-bundles/nifi-extension-utils/nifi-git-flow-registry/src/main/java/org/apache/nifi/registry/flow/git/serialize/VersionedComponentCollectionSerializer.java
b/nifi-extension-bundles/nifi-extension-utils/nifi-git-flow-registry/src/main/java/org/apache/nifi/registry/flow/git/serialize/VersionedComponentCollectionSerializer.java
new file mode 100644
index 0000000000..1a711838db
--- /dev/null
+++
b/nifi-extension-bundles/nifi-extension-utils/nifi-git-flow-registry/src/main/java/org/apache/nifi/registry/flow/git/serialize/VersionedComponentCollectionSerializer.java
@@ -0,0 +1,59 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.nifi.registry.flow.git.serialize;
+
+import com.fasterxml.jackson.core.JsonGenerator;
+import com.fasterxml.jackson.databind.SerializerProvider;
+import com.fasterxml.jackson.databind.ser.std.StdSerializer;
+import org.apache.nifi.flow.VersionedComponent;
+
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Comparator;
+import java.util.List;
+
+public class VersionedComponentCollectionSerializer extends
StdSerializer<Collection<?>> {
+
+ public VersionedComponentCollectionSerializer() {
+ super((Class<Collection<?>>) (Class<?>) Collection.class);
+ }
+
+ @Override
+ public void serialize(final Collection<?> value, final JsonGenerator gen,
final SerializerProvider serializers) throws IOException {
+ // shortcut for empty:
+ if (value.isEmpty()) {
+ gen.writeStartArray();
+ gen.writeEndArray();
+ return;
+ }
+
+ // only sort if these are VersionedComponent instances
+ List<?> list = new ArrayList<>(value);
+ if (list.get(0) instanceof VersionedComponent) {
+ list.sort(Comparator.comparing(c -> ((VersionedComponent)
c).getIdentifier()));
+ }
+
+ // now write the (possibly sorted) list
+ gen.writeStartArray();
+ for (Object e : list) {
+ serializers.defaultSerializeValue(e, gen);
+ }
+ gen.writeEndArray();
+ }
+}
diff --git
a/nifi-extension-bundles/nifi-extension-utils/nifi-git-flow-registry/src/main/java/org/apache/nifi/registry/flow/git/serialize/VersionedComponentModule.java
b/nifi-extension-bundles/nifi-extension-utils/nifi-git-flow-registry/src/main/java/org/apache/nifi/registry/flow/git/serialize/VersionedComponentModule.java
index fd797f74d1..ba49d692bb 100644
---
a/nifi-extension-bundles/nifi-extension-utils/nifi-git-flow-registry/src/main/java/org/apache/nifi/registry/flow/git/serialize/VersionedComponentModule.java
+++
b/nifi-extension-bundles/nifi-extension-utils/nifi-git-flow-registry/src/main/java/org/apache/nifi/registry/flow/git/serialize/VersionedComponentModule.java
@@ -36,10 +36,15 @@ public class VersionedComponentModule extends SimpleModule {
private static final Set<String> EXCLUDE_JSON_FIELDS =
Set.of("instanceIdentifier", "instanceGroupId");
+ public VersionedComponentModule() {
+ super("VersionedComponentModule");
+ addSerializer(new VersionedComponentCollectionSerializer());
+ }
+
@Override
public void setupModule(final SetupContext context) {
- super.setupModule(context);
context.addBeanSerializerModifier(new
VersionedComponentBeanSerializerModifier());
+ super.setupModule(context);
}
private static class VersionedComponentBeanSerializerModifier extends
BeanSerializerModifier {
