You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2020/02/29 13:44:42 UTC

[camel] 01/02: Source code generated for configurer should use sorted a..z so they are not reordered during re-build

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

davsclaus pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git

commit 85eb207be0ad31b29d443feb681d6aebfb78880a
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Sat Feb 29 13:52:16 2020 +0100

    Source code generated for configurer should use sorted a..z so they are not reordered during re-build
---
 .../apache/camel/maven/packaging/PropertyConfigurerGenerator.java    | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PropertyConfigurerGenerator.java b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PropertyConfigurerGenerator.java
index efc8fb8..bd3e683 100644
--- a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PropertyConfigurerGenerator.java
+++ b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PropertyConfigurerGenerator.java
@@ -19,7 +19,9 @@ package org.apache.camel.maven.packaging;
 import java.io.IOException;
 import java.io.Writer;
 import java.util.Collection;
+import java.util.Comparator;
 import java.util.Optional;
+import java.util.stream.Collectors;
 
 import org.apache.camel.tooling.model.BaseOptionModel;
 
@@ -46,6 +48,9 @@ public final class PropertyConfigurerGenerator {
         w.write("\n");
         if (!options.isEmpty() || !hasSuper) {
 
+            // sort options A..Z so they always have same order
+            options = options.stream().sorted(Comparator.comparing(BaseOptionModel::getName)).collect(Collectors.toList());
+
             if (component) {
                 // if its a component configurer then configuration classes are optional and we need
                 // to generate a method that can lazy create a new configuration if it was null