From 71cc786ea5889c745e336e0d69c8d086fc7a1231 Mon Sep 17 00:00:00 2001 From: Maxime Pierront Date: Sun, 23 Nov 2025 00:48:59 +0100 Subject: [PATCH 1/3] Add Jenkinsfile for CI/CD pipeline setup, including build, test, package, and deployment stages. --- Jenkinsfile | 1 + 1 file changed, 1 insertion(+) diff --git a/Jenkinsfile b/Jenkinsfile index aabcee6..ce89d8b 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -3,6 +3,7 @@ pipeline { tools { jdk 'jdk25' + maven 'maven-3.9' } stages { From ac66320f9a60d71979cb28e573aa07c1d68a20e5 Mon Sep 17 00:00:00 2001 From: Maxime Pierront Date: Sun, 23 Nov 2025 00:59:37 +0100 Subject: [PATCH 2/3] Add Jenkinsfile for CI/CD pipeline setup, including build, test, package, and deployment stages. --- Jenkinsfile | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/Jenkinsfile b/Jenkinsfile index ce89d8b..3460e2e 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -1,6 +1,12 @@ pipeline { agent any + + environment { + JAVA_HOME = '/var/lib/jenkins/tools/hudson.model.JDK/jdk25' + PATH = "${JAVA_HOME}/bin:${PATH}" + } + tools { jdk 'jdk25' maven 'maven-3.9' From 33b24c62d40fe1e3330ddb72772f0c3c275be60d Mon Sep 17 00:00:00 2001 From: Maxime Pierront Date: Sun, 23 Nov 2025 01:12:37 +0100 Subject: [PATCH 3/3] Refactor `InMemoryStatRepository` initialization with default stats constant, make `Application.main` public, update Java version to 21 in `pom.xml`, and remove redundant Jenkinsfile configuration. --- Jenkinsfile | 12 ------------ pom.xml | 2 +- .../automation/rock_paper_scissors/Application.java | 2 +- .../stat/spi/stub/InMemoryStatRepository.java | 8 ++++---- 4 files changed, 6 insertions(+), 18 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 3460e2e..8c37de4 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -1,17 +1,5 @@ pipeline { agent any - - - environment { - JAVA_HOME = '/var/lib/jenkins/tools/hudson.model.JDK/jdk25' - PATH = "${JAVA_HOME}/bin:${PATH}" - } - - tools { - jdk 'jdk25' - maven 'maven-3.9' - } - stages { stage('Compilation') { steps { diff --git a/pom.xml b/pom.xml index 9c9a72e..e9047ac 100644 --- a/pom.xml +++ b/pom.xml @@ -27,7 +27,7 @@ - 25 + 21 diff --git a/src/main/java/fr/iut_fbleau/info/but3/automation/rock_paper_scissors/Application.java b/src/main/java/fr/iut_fbleau/info/but3/automation/rock_paper_scissors/Application.java index 2a689e9..2f209ca 100644 --- a/src/main/java/fr/iut_fbleau/info/but3/automation/rock_paper_scissors/Application.java +++ b/src/main/java/fr/iut_fbleau/info/but3/automation/rock_paper_scissors/Application.java @@ -6,7 +6,7 @@ import org.springframework.boot.autoconfigure.SpringBootApplication; @SpringBootApplication public class Application { - static void main(String[] args) { + public static void main(String[] args) { SpringApplication.run(Application.class, args); } diff --git a/src/main/java/fr/iut_fbleau/info/but3/automation/rock_paper_scissors/stat/spi/stub/InMemoryStatRepository.java b/src/main/java/fr/iut_fbleau/info/but3/automation/rock_paper_scissors/stat/spi/stub/InMemoryStatRepository.java index 34ff941..b09b831 100644 --- a/src/main/java/fr/iut_fbleau/info/but3/automation/rock_paper_scissors/stat/spi/stub/InMemoryStatRepository.java +++ b/src/main/java/fr/iut_fbleau/info/but3/automation/rock_paper_scissors/stat/spi/stub/InMemoryStatRepository.java @@ -10,11 +10,11 @@ import java.util.Map; @Stub public record InMemoryStatRepository(Map stats) implements StatRepository { + + private final static HashMap DEFAULT_STATS = new HashMap<>(Map.of("joe", 1,"eoj", 3)); + public InMemoryStatRepository() { - HashMap stats1 = new HashMap<>(); - stats1.put("joe", 1); - stats1.put("eoj", 3); - this(stats1); + this(DEFAULT_STATS); } @Override