fix: change sorting when order in filename (#387)

Author: dieppa

community/flamingock-auditstore-dynamodb/src/test/java/io/flamingock/community/dynamodb/changes/audit/NonTxTargetSystemChange.java

@@ -25,7 +25,7 @@
  * Uses custom target system for testing targetSystemId persistence.
  */
 @TargetSystem(id = "non-tx-system")
-@Change(id = "non-tx-target-system", order = "002", author = "test-author")
+@Change(id = "non-tx-target-system", order = "003", author = "test-author")
 public class NonTxTargetSystemChange {
 
     @Apply

community/flamingock-auditstore-dynamodb/src/test/java/io/flamingock/community/dynamodb/changes/audit/TxSharedDefaultChange.java

@@ -26,7 +26,7 @@
  * Uses transactional execution with default audit storage DynamoDB client.
  */
 @TargetSystem(id = "dynamodb")
-@Change(id = "tx-shared-default", order = "003", author = "test-author")
+@Change(id = "tx-shared-default", order = "002", author = "test-author")
 public class TxSharedDefaultChange {
 
     @Apply

community/flamingock-auditstore-mongodb-sync/src/test/java/io/flamingock/community/mongodb/sync/changes/audit/NonTxTargetSystemChange.java

@@ -24,7 +24,7 @@
  * Used for testing audit persistence of NON_TX transaction type with custom target system.
  */
 @TargetSystem(id = "non-tx-system")
-@Change(id = "non-tx-target-system", order = "002", author = "aperezdieppa")
+@Change(id = "non-tx-target-system", order = "003", author = "aperezdieppa")
 public class NonTxTargetSystemChange {
 
     @Apply

community/flamingock-auditstore-mongodb-sync/src/test/java/io/flamingock/community/mongodb/sync/changes/audit/TxSharedDefaultChange.java

@@ -23,7 +23,7 @@
  * Used for testing audit persistence of TX_SHARED transaction type.
  */
 @TargetSystem(id = "mongodb")
-@Change(id = "tx-shared-default", order = "003", transactional = true, author = "aperezdieppa")
+@Change(id = "tx-shared-default", order = "002", transactional = true, author = "aperezdieppa")
 public class TxSharedDefaultChange {
 
     @Apply

core/flamingock-core-commons/src/main/java/io/flamingock/internal/common/core/preview/PreviewStage.java

@@ -334,7 +334,8 @@ public T build() {
             }
 
             Collection<AbstractPreviewTask> templatedTasksDescriptors = getTemplatedTaskDescriptors(resourcesDirectories);
-            Collection<AbstractPreviewTask> allDescriptors = mergeDescriptors(templatedTasksDescriptors, changeUnitClassesList);
+            Collection<AbstractPreviewTask> allDescriptors = Stream.concat(templatedTasksDescriptors.stream(), changeUnitClassesList.stream())
+                    .collect(Collectors.toList());
 
 
             return buildInstance(name, description, sourcesPackage, resourcesDir, allDescriptors);
@@ -347,33 +348,6 @@ abstract protected T buildInstance(String name,
                                            String resourcesDir,
                                            Collection<AbstractPreviewTask> allDescriptors);
 
-        /**
-         * Merges and returns a single collection of task descriptors from both templated files and provided classes.
-         * Ensures all tasks are consistently ordered if applicable.
-         *
-         * @param templatedDescriptors   tasks parsed from YAML files
-         * @param descriptorsFromClasses tasks provided directly
-         * @return merged collection of {@link AbstractPreviewTask}
-         * @throws IllegalArgumentException if only some tasks are sortable
-         */
-        private Collection<AbstractPreviewTask> mergeDescriptors(Collection<? extends AbstractPreviewTask> templatedDescriptors,
-                                                                 Collection<? extends AbstractPreviewTask> descriptorsFromClasses) {
-
-            Collection<AbstractPreviewTask> descriptors = Stream
-                    .concat(templatedDescriptors.stream(), descriptorsFromClasses.stream())
-                    .collect(Collectors.toList());
-
-            if (descriptors.stream().allMatch(AbstractPreviewTask::isSortable)) {
-                return descriptors.stream().sorted().collect(Collectors.toList());
-
-            } else if (descriptors.parallelStream().anyMatch(AbstractPreviewTask::isSortable)) {
-                throw new IllegalArgumentException("Either all tasks are ordered or none is");
-
-            } else {
-                return descriptors;
-            }
-        }
-
         /**
          * Parses and builds templated {@link AbstractPreviewTask} descriptors from YAML files located in the given directories.
          *

core/flamingock-core/src/main/java/io/flamingock/internal/core/pipeline/loaded/stage/AbstractLoadedStage.java

@@ -193,6 +193,7 @@ public AbstractLoadedStage build() {
             List<AbstractLoadedTask> loadedTasks = previewStage.getTasks()
                     .stream()
                     .map(LoadedTaskBuilder::build)
+                    .sorted()
                     .collect(Collectors.toList());
             switch(previewStage.getType()) {
                 case LEGACY: