refactor: removed order in file content

Author: dieppa

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

@@ -0,0 +1,78 @@
+/*
+ * Copyright 2025 Flamingock (https://www.flamingock.io)
+ *
+ * Licensed 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 io.flamingock.internal.common.core.preview;
+
+import io.flamingock.internal.common.core.error.FlamingockException;
+
+import java.util.Optional;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+public final class ChangeOrderExtractor {
+
+
+    // For template files: must start with _order__ (e.g., _002__whatever.yaml, _V1_2_3__whatever.yaml)
+    // Recommended format: _YYYYMMDD_NN__description (e.g., _20250101_01__create_users.yaml)
+    // Captures ORDER before double underscore separator
+    private static final Pattern SIMPLE_FILE_ORDER_REGEX_PATTERN = Pattern.compile("^_(.+?)__(.+)$");
+
+    // For class names: must have _order__ at the beginning of the class name after package
+    // (e.g., com.mycompany.mypackage._002__MyChange or com.mycompany.OuterClass$_V1_2_3__InnerChange)
+    // Captures ORDER before double underscore separator
+    private static final Pattern FILE_WITH_PACKAGE_ORDER_REGEX_PATTERN = Pattern.compile("[.$]_(.+?)__(.+)$");
+
+    private ChangeOrderExtractor() {
+    }
+
+    /**
+     * For TemplateLoadedChange - validates order from template file name
+     */
+    public static String extractOrderFromFile(String changeId, String fileName) {
+        return getOrderFromFileName(fileName, false)
+                .orElseThrow(() -> getFlamingockException(changeId,  "fileName", "yaml"));
+    }
+
+    /**
+     * For CodeLoadedChange - validates order from class name
+     */
+    public static String extractOrderFromClassName(String changeId, String classPath) {
+        return getOrderFromFileName(classPath, true)
+                .orElseThrow(() -> getFlamingockException(changeId, "className", "java"));
+    }
+
+
+    private static Optional<String> getOrderFromFileName(String fileName, boolean withPackage) {
+        if (fileName == null) {
+            return Optional.empty();
+        }
+        Pattern pattern = withPackage ? FILE_WITH_PACKAGE_ORDER_REGEX_PATTERN : SIMPLE_FILE_ORDER_REGEX_PATTERN;
+
+        Matcher matcher = pattern.matcher(fileName);
+
+        if (matcher.find()) {
+            return Optional.ofNullable(matcher.group(1));
+        }
+
+        return Optional.empty();
+    }
+
+
+    private static FlamingockException getFlamingockException(String changeId, String fileType, String fileExt) {
+        return new FlamingockException(String.format("Change[%s] : order must be present in the %s(e.g. _0001__%s.%s)",
+                changeId, fileType, changeId, fileExt));
+    }
+
+}

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

@@ -20,6 +20,7 @@
 import io.flamingock.api.annotations.Recovery;
 import io.flamingock.api.annotations.Rollback;
 import io.flamingock.api.annotations.TargetSystem;
+import io.flamingock.internal.common.core.preview.ChangeOrderExtractor;
 import io.flamingock.internal.common.core.preview.CodePreviewChange;
 import io.flamingock.internal.common.core.preview.PreviewMethod;
 import io.flamingock.internal.common.core.task.RecoveryDescriptor;
@@ -135,11 +136,15 @@ CodePreviewTaskBuilder setTypeElement(TypeElement typeElement) {
         Change changeAnnotation = typeElement.getAnnotation(Change.class);
         TargetSystem targetSystemAnnotation = typeElement.getAnnotation(TargetSystem.class);
         Recovery recoveryAnnotation = typeElement.getAnnotation(Recovery.class);
+
         if(changeAnnotation != null) {
-            setId(changeAnnotation.id());
-            setOrder(null);//TODO replace with order from class
+            String changeId = changeAnnotation.id();
+            String classPath = typeElement.getQualifiedName().toString();
+            String order = ChangeOrderExtractor.extractOrderFromClassName(changeId, classPath);
+            setId(changeId);
+            setOrder(order);
             setAuthor(changeAnnotation.author());
-            setSourceClassPath(typeElement.getQualifiedName().toString());
+            setSourceClassPath(classPath);
             setExecutionMethod(getAnnotatedMethodInfo(typeElement, Apply.class).orElse(null));
             setRollbackMethod(getAnnotatedMethodInfo(typeElement, Rollback.class).orElse(null));
             setBeforeExecutionMethod(getAnnotatedMethodInfo(typeElement, BeforeExecution.class).orElse(null));

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

@@ -15,6 +15,7 @@
  */
 package io.flamingock.internal.common.core.preview.builder;
 
+import io.flamingock.internal.common.core.preview.ChangeOrderExtractor;
 import io.flamingock.internal.common.core.template.ChangeTemplateFileContent;
 import io.flamingock.internal.common.core.preview.TemplatePreviewChange;
 import io.flamingock.internal.common.core.task.RecoveryDescriptor;
@@ -31,7 +32,6 @@ class TemplatePreviewTaskBuilder implements PreviewTaskBuilder<TemplatePreviewCh
 
     private String fileName;
     private String id;
-    private String order;
     private String author;
     private String templateClassPath;
     private String profilesString;
@@ -65,11 +65,6 @@ public TemplatePreviewTaskBuilder setId(String id) {
         return this;
     }
 
-    public TemplatePreviewTaskBuilder setOrder(String order) {
-        this.order = order;
-        return this;
-    }
-
     public TemplatePreviewTaskBuilder setAuthor(String author) {
         this.author = author;
         return this;
@@ -117,6 +112,8 @@ public void setRecovery(RecoveryDescriptor recovery) {
     public TemplatePreviewChange build() {
 
         List<String> profiles = getProfiles();
+        String order = ChangeOrderExtractor.extractOrderFromFile(id, fileName);
+
         return new TemplatePreviewChange(
                 fileName,
                 id,
@@ -147,8 +144,9 @@ private List<String> getProfiles() {
 
 
     TemplatePreviewTaskBuilder setFromDefinition(ChangeTemplateFileContent templateTaskDescriptor) {
+        //fileName is set in "setFileName" method
+        //order is extract from the fileName in the "build" method
         setId(templateTaskDescriptor.getId());
-        setOrder(templateTaskDescriptor.getOrder());
         setAuthor(templateTaskDescriptor.getAuthor());
         setTemplate(templateTaskDescriptor.getTemplate());
         setProfilesString(templateTaskDescriptor.getProfiles());

core/flamingock-core-commons/src/main/java/io/flamingock/internal/common/core/template/ChangeTemplateFileContent.java

@@ -20,7 +20,6 @@
 
 public class ChangeTemplateFileContent {
     private String id;
-    private String order;
     private String author;
     private String template;
     private String profiles; //colon-separated list of profiles
@@ -35,7 +34,6 @@ public ChangeTemplateFileContent() {
     }
 
     public ChangeTemplateFileContent(String id,
-                                     String order,
                                      String author,
                                      String template,
                                      String profiles,
@@ -46,7 +44,6 @@ public ChangeTemplateFileContent(String id,
                                      TargetSystemDescriptor targetSystem,
                                      RecoveryDescriptor recovery) {
         this.id = id;
-        this.order = order;
         this.author = author;
         this.template = template;
         this.profiles = profiles;
@@ -67,14 +64,6 @@ public void setId(String id) {
         this.id = id;
     }
 
-    public String getOrder() {
-        return order;
-    }
-
-    public void setOrder(String order) {
-        this.order = order;
-    }
-
     public String getAuthor() {
         return author;
     }
@@ -99,7 +88,6 @@ public void setProfiles(String profiles) {
         this.profiles = profiles;
     }
 
-
     public Boolean getTransactional() {
         return transactional;
     }

platform-plugins/flamingock-springboot-integration/src/test/java/io/flamingock/springboot/SpringProfileFilterTemplateTaskTest.java

@@ -109,7 +109,6 @@ private AbstractLoadedTask getTemplateLoadedChange(String profiles) {
 
         ChangeTemplateFileContent changeFileDescriptor = new ChangeTemplateFileContent(
                 "template-base-change-id",
-                "1",
                 "test-author",
                 TemplateSimulate.class.getSimpleName(),
                 profiles,
@@ -121,7 +120,7 @@ private AbstractLoadedTask getTemplateLoadedChange(String profiles) {
                 RecoveryDescriptor.getDefault()
         );
 
-        TemplatePreviewChange preview = PreviewTaskBuilder.getTemplateBuilder("TemplateBase.yaml", changeFileDescriptor).build();
+        TemplatePreviewChange preview = PreviewTaskBuilder.getTemplateBuilder("_0001__ChangeUsingTemplate.yaml", changeFileDescriptor).build();
 
         return LoadedTaskBuilder.getInstance(preview).build();