Introduce version check in base codestarts and use them

quarkusio · Jun 17, 2024 · 76bbdd5 · 76bbdd5
1 parent 59bad99
commit 76bbdd5
Show file tree

Hide file tree

Showing 4 changed files with 47 additions and 12 deletions.
diff --git a/...se-codestarts/src/main/resources/codestarts/quarkus/buildtool/maven/base/pom.tpl.qute.xml b/...se-codestarts/src/main/resources/codestarts/quarkus/buildtool/maven/base/pom.tpl.qute.xml
@@ -140,7 +140,7 @@
                             <goal>build</goal>
                             <goal>generate-code</goal>
                             <goal>generate-code-tests</goal>
-                            {#if generate-native}
+                            {#if generate-native and quarkus.platform.version.compareVersionTo("3.12") >= 0}
                             <goal>native-image-agent</goal>
                             {/if}
                         </goals>

diff --git a/independent-projects/tools/codestarts/pom.xml b/independent-projects/tools/codestarts/pom.xml
@@ -18,6 +18,10 @@
             <groupId>io.quarkus.qute</groupId>
             <artifactId>qute-core</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.apache.maven</groupId>
+            <artifactId>maven-artifact</artifactId>
+        </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
             <artifactId>quarkus-bootstrap-app-model</artifactId>

diff --git a/...rts/src/main/java/io/quarkus/devtools/codestarts/core/reader/QuteCodestartFileReader.java b/...rts/src/main/java/io/quarkus/devtools/codestarts/core/reader/QuteCodestartFileReader.java
@@ -6,30 +6,24 @@
 import java.util.Map;
 import java.util.Optional;
 import java.util.concurrent.CompletionStage;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
 
 import org.apache.commons.io.FilenameUtils;
+import org.apache.maven.artifact.versioning.ComparableVersion;
 
 import io.quarkus.devtools.codestarts.CodestartException;
 import io.quarkus.devtools.codestarts.CodestartResource;
 import io.quarkus.devtools.codestarts.CodestartResource.Source;
-import io.quarkus.qute.CompletedStage;
-import io.quarkus.qute.Engine;
-import io.quarkus.qute.EvalContext;
-import io.quarkus.qute.Expression;
-import io.quarkus.qute.ResultMapper;
-import io.quarkus.qute.Results;
-import io.quarkus.qute.TemplateException;
-import io.quarkus.qute.TemplateLocator;
-import io.quarkus.qute.TemplateNode;
-import io.quarkus.qute.ValueResolver;
-import io.quarkus.qute.Variant;
+import io.quarkus.qute.*;
 
 final class QuteCodestartFileReader implements CodestartFileReader {
 
     private static final String TPL_QUTE_FLAG = ".tpl.qute";
     private static final String ENTRY_QUTE_FLAG = ".entry.qute";
     public static final String INCLUDE_QUTE_FLAG = ".include.qute";
     public static final String SKIP_TAG = "<SKIP>";
+    private static final Pattern VERSION_PATTERN = Pattern.compile("^(\\d+)(\\.(\\d+))?(\\.(\\d+))?");
 
     @Override
     public boolean matches(String fileName) {
@@ -187,9 +181,24 @@ public CompletionStage<Object> resolve(EvalContext context) {
                             return CompletedStage.of(value.endsWith((String) e));
                         });
                     }
+
+                case "compareVersionTo":
+                    if (context.getParams().size() == 1) {
+                        return context.evaluate(context.getParams().get(0)).thenCompose(e -> {
+                            return CompletedStage.of(compareVersionTo(value, (String) e));
+                        });
+                    }
                 default:
                     return Results.notFound(context);
             }
         }
     }
+
+    static int compareVersionTo(String currentVersionString, String comparedVersionString) {
+        if (!VERSION_PATTERN.matcher(comparedVersionString).matches()) {
+            throw new IllegalArgumentException("Let's not put template condition on qualifier: " + comparedVersionString);
+        }
+        return new ComparableVersion(currentVersionString).compareTo(new ComparableVersion(comparedVersionString));
+    }
+
 }
diff --git a/...src/test/java/io/quarkus/devtools/codestarts/core/reader/QuteCodestartFileReaderTest.java b/...src/test/java/io/quarkus/devtools/codestarts/core/reader/QuteCodestartFileReaderTest.java
@@ -0,0 +1,22 @@
+package io.quarkus.devtools.codestarts.core.reader;
+
+import static io.quarkus.devtools.codestarts.core.reader.QuteCodestartFileReader.*;
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
+
+import org.junit.jupiter.api.Test;
+
+class QuteCodestartFileReaderTest {
+
+    @Test
+    void testCompareVersion() {
+        assertThat(compareVersionTo("3.12.0.Final", "1.0")).isGreaterThan(0);
+        assertThat(compareVersionTo("3.12.0.Final", "3.12")).isEqualTo(0);
+        assertThat(compareVersionTo("3.13.0", "3.12")).isGreaterThan(0);
+        assertThat(compareVersionTo("3.2.1", "3.12")).isLessThan(0);
+        assertThat(compareVersionTo("999-SNAPSHOT", "3.12")).isGreaterThan(0);
+        assertThat(compareVersionTo("1.0.0.Final-redhat-00001", "1.0")).isGreaterThan(0);
+        assertThat(compareVersionTo("1.0.1.Final-redhat-00001", "1.0")).isGreaterThan(0);
+        assertThatThrownBy(() -> compareVersionTo("999-SNAP", "1.0.1.Final-redhat-00001")).isInstanceOf(IllegalArgumentException.class);
+    }
+}