Support Reqour_Java and mark Repour-java as deprecated

Author: Name Surname

adjuster/pom.xml

@@ -101,6 +101,11 @@
             <artifactId>quarkus-wiremock-test</artifactId>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-junit5-internal</artifactId>
+            <scope>test</scope>
+        </dependency>
     </dependencies>
 
     <build>

adjuster/src/main/java/org/jboss/pnc/reqour/adjust/config/manipulator/common/CommonManipulatorConfigUtils.java

@@ -30,6 +30,7 @@
 import org.jboss.pnc.reqour.adjust.model.UserSpecifiedAlignmentParameters;
 import org.jboss.pnc.reqour.common.utils.IOUtils;
 import org.jboss.pnc.reqour.config.ConfigConstants;
+import org.slf4j.Logger;
 
 import lombok.extern.slf4j.Slf4j;
 
@@ -177,11 +178,13 @@ public static boolean isPreferPersistentEnabled(AdjustRequest request) {
      * Get the location of the java within the container environment. In case user specified none, defaults to java
      * {@value DEFAULT_JAVA_VERSION}.
      */
-    public static Path getJavaLocation(List<String> userSpecifiedAlignmentParameters) {
+    public static Path getJavaLocation(Logger userLogger, List<String> userSpecifiedAlignmentParameters) {
         Optional<String> jvmLocationSystemProperty = userSpecifiedAlignmentParameters.stream()
-                .filter(p -> p.startsWith("-DRepour_Java"))
+                .filter(p -> p.startsWith("-DRepour_Java") || p.startsWith("-DReqour_Java"))
                 .findFirst();
-
+        if (jvmLocationSystemProperty.isPresent() && jvmLocationSystemProperty.get().startsWith("-DRepour_Java")) {
+            userLogger.warn("-DRepour_Java is deprecated; use -DReqour_Java");
+        }
         String javaVersion = jvmLocationSystemProperty.map(s -> s.split("=")[1])
                 .orElse(DEFAULT_JAVA_VERSION);
         log.debug("Parsed java version: {}", javaVersion);

adjuster/src/main/java/org/jboss/pnc/reqour/adjust/provider/GradleProvider.java

@@ -100,7 +100,8 @@ private void validateConfig() {
 
     @Override
     List<String> prepareCommand() {
-        Path javaLocation = CommonManipulatorConfigUtils.getJavaLocation(config.getUserSpecifiedAlignmentParameters());
+        Path javaLocation = CommonManipulatorConfigUtils
+                .getJavaLocation(userLogger, config.getUserSpecifiedAlignmentParameters());
         List<String> targetAndInit = getTargetAndInit();
 
         return AdjustmentSystemPropertiesUtils.joinSystemPropertiesListsIntoList(

adjuster/src/main/java/org/jboss/pnc/reqour/adjust/provider/MvnProvider.java

@@ -121,7 +121,8 @@ private void validateConfig() {
 
     @Override
     List<String> prepareCommand() {
-        Path javaLocation = CommonManipulatorConfigUtils.getJavaLocation(config.getUserSpecifiedAlignmentParameters());
+        Path javaLocation = CommonManipulatorConfigUtils
+                .getJavaLocation(userLogger, config.getUserSpecifiedAlignmentParameters());
         return AdjustmentSystemPropertiesUtils.joinSystemPropertiesListsIntoList(
                 List.of(
                         List.of(javaLocation.toString(), "-jar", config.getCliJarPath().toString()),

adjuster/src/main/java/org/jboss/pnc/reqour/adjust/provider/NpmProvider.java

@@ -84,7 +84,8 @@ private void validateConfig() {
 
     @Override
     List<String> prepareCommand() {
-        Path javaLocation = CommonManipulatorConfigUtils.getJavaLocation(config.getUserSpecifiedAlignmentParameters());
+        Path javaLocation = CommonManipulatorConfigUtils
+                .getJavaLocation(userLogger, config.getUserSpecifiedAlignmentParameters());
         return AdjustmentSystemPropertiesUtils.joinSystemPropertiesListsIntoList(
                 List.of(
                         List.of(javaLocation.toString(), "-jar", config.getCliJarPath().toString()),

adjuster/src/test/java/org/jboss/pnc/reqour/adjust/config/manipulator/common/CommonManipulatorConfigUtilsTest.java

@@ -6,12 +6,14 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 import java.nio.file.Path;
 import java.util.Collections;
 import java.util.List;
 import java.util.Map;
 import java.util.Optional;
+import java.util.logging.LogRecord;
 
 import org.jboss.pnc.api.constants.BuildConfigurationParameterKeys;
 import org.jboss.pnc.api.reqour.dto.AdjustRequest;
@@ -20,6 +22,18 @@
 import org.jboss.pnc.reqour.adjust.model.UserSpecifiedAlignmentParameters;
 import org.junit.jupiter.api.Test;
 
+import io.quarkus.test.LogCollectingTestResource;
+import io.quarkus.test.common.QuarkusTestResource;
+import io.quarkus.test.common.ResourceArg;
+import io.quarkus.test.junit.QuarkusTest;
+import lombok.extern.slf4j.Slf4j;
+
+@QuarkusTest
+@QuarkusTestResource(
+        value = LogCollectingTestResource.class,
+        restrictToAnnotatedClass = true,
+        initArgs = @ResourceArg(name = LogCollectingTestResource.LEVEL, value = "FINE"))
+@Slf4j
 class CommonManipulatorConfigUtilsTest {
 
     @Test
@@ -221,13 +235,25 @@ void parseUserSpecifiedAlignmentParametersWithoutLocation_newlineInUsersParamete
 
     @Test
     void getJavaLocation_noJavaVersionOverride_defaultIsUsed() {
-        assertThat(CommonManipulatorConfigUtils.getJavaLocation(Collections.emptyList())).isEqualTo(
+        assertThat(CommonManipulatorConfigUtils.getJavaLocation(log, Collections.emptyList())).isEqualTo(
                 CommonManipulatorConfigUtils.getJavaOfVersion(CommonManipulatorConfigUtils.DEFAULT_JAVA_VERSION));
     }
 
     @Test
-    void getJavaLocation_java17VersionOverrideGiven_overrideIsUsed() {
-        assertThat(CommonManipulatorConfigUtils.getJavaLocation(List.of("-DRepour_Java=17")))
+    void getJavaLocation_java17VersionOverrideGiven_overrideIsUsedForRepour() {
+        assertThat(CommonManipulatorConfigUtils.getJavaLocation(log, List.of("-DRepour_Java=17")))
+                .isEqualTo(CommonManipulatorConfigUtils.getJavaOfVersion("17"));
+        List<LogRecord> logRecords = LogCollectingTestResource.current().getRecords();
+        assertTrue(
+                logRecords.stream()
+                        .anyMatch(
+                                r -> LogCollectingTestResource.format(r)
+                                        .contains("-DRepour_Java is deprecated")));
+    }
+
+    @Test
+    void getJavaLocation_java17VersionOverrideGiven_overrideIsUsedForReqour() {
+        assertThat(CommonManipulatorConfigUtils.getJavaLocation(log, List.of("-DReqour_Java=17")))
                 .isEqualTo(CommonManipulatorConfigUtils.getJavaOfVersion("17"));
     }
 
@@ -239,13 +265,13 @@ void getJavaLocation_java24VersionOverrideGiven_overrideIsUsed() {
 
     @Test
     void getJavaLocation_java8VersionOverrideGiven_overrideIsUsed() {
-        assertThat(CommonManipulatorConfigUtils.getJavaLocation(List.of("-DRepour_Java=1.8.0")))
+        assertThat(CommonManipulatorConfigUtils.getJavaLocation(log, List.of("-DRepour_Java=1.8.0")))
                 .isEqualTo(CommonManipulatorConfigUtils.getJavaOfVersion("1.8.0"));
     }
 
     @Test
     void getJavaLocation_invalidJavaVersionOverrideGiven_throwsException() {
-        assertThatThrownBy(() -> CommonManipulatorConfigUtils.getJavaLocation(List.of("-DRepour_Java=invalid")))
+        assertThatThrownBy(() -> CommonManipulatorConfigUtils.getJavaLocation(log, List.of("-DRepour_Java=invalid")))
                 .isInstanceOf(AdjusterException.class)
                 .hasMessage("Invalid Java version 'invalid' provided.");
     }

pom.xml

@@ -213,6 +213,10 @@
                 <artifactId>pom-manipulation-common</artifactId>
                 <version>${version.pom-manipulation-common}</version>
                 <exclusions>
+                    <exclusion>
+                        <groupId>ch.qos.logback</groupId>
+                        <artifactId>logback-classic</artifactId>
+                    </exclusion>
                     <exclusion>
                         <groupId>org.commonjava.maven.galley</groupId>
                         <artifactId>galley-maven</artifactId>
@@ -390,6 +394,7 @@
                         <java.util.logging.manager>org.jboss.logmanager.LogManager</java.util.logging.manager>
                         <maven.home>${maven.home}</maven.home>
                     </systemPropertyVariables>
+                    <redirectTestOutputToFile>true</redirectTestOutputToFile>
                 </configuration>
             </plugin>
             <plugin>