Updating develop branch

.github/workflows/merged_master.yml

@@ -0,0 +1,47 @@
+name: maven build
+
+on:
+  pull_request:
+    types: [closed]
+
+jobs:
+  build:
+
+    runs-on: ubuntu-latest
+
+    steps:
+    - uses: actions/checkout@v4
+    - name: Set up JDK 21
+      uses: actions/setup-java@v4
+      with:
+        java-version: '21'
+        distribution: 'zulu'
+        cache: maven
+    - name: Build with Maven
+      run: mvn -B package --file pom.xml
+
+    - name: Generate JaCoCo Badge
+      uses: cicirello/jacoco-badge-generator@v2
+      with:
+        generate-branches-badge: true
+
+    - name: Log coverage percentage
+      run: |
+        echo "coverage = ${{ steps.jacoco.outputs.coverage }}"
+        echo "branch coverage = ${{ steps.jacoco.outputs.branches }}"
+
+    - name: Commit the badge (if it changed)
+      run: |
+        if [[ `git status --porcelain` ]]; then
+          git config --global user.name 'Luis'
+          git config --global user.email 'lpenap@users.noreply.github.com'
+          git add -A
+          git commit -m "Autogenerated JaCoCo coverage badge"
+          git push
+        fi
+
+    - name: Upload JaCoCo coverage report
+      uses: actions/upload-artifact@v4
+      with:
+        name: jacoco-report
+        path: target/site/jacoco/

.github/workflows/pull_request.yml

@@ -0,0 +1,18 @@
+name: PR Build
+
+on:
+  pull_request:
+    branches: ['**']
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - name: Set up JDK 21
+        uses: actions/setup-java@v4
+        with:
+          distribution: 'zulu'
+          java-version: '21'
+      - name: Build and Test
+        run: ./mvnw -B verify

.mvn/wrapper/MavenWrapperDownloader.java

@@ -33,7 +33,7 @@ public class MavenWrapperDownloader {
      * Default URL to download the maven-wrapper.jar from, if no 'downloadUrl' is provided.
      */
     private static final String DEFAULT_DOWNLOAD_URL =
-            "https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.4.2/maven-wrapper-0.4.2.jar";
+            "https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar";
 
     /**
      * Path to the maven-wrapper.properties file, which might contain a downloadUrl property to

.mvn/wrapper/maven-wrapper.properties

@@ -1 +1 @@
-distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.6.0/apache-maven-3.6.0-bin.zip
+distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.6/apache-maven-3.9.6-bin.zip

README.md

@@ -1,12 +1,13 @@
-[![codebeat badge](https://codebeat.co/badges/4c328c5d-1722-459f-aaa1-437a0ed6201f)](https://codebeat.co/projects/github-com-lpenap-java-patterns-and-constructs-master)
-[![Build Status](https://travis-ci.org/lpenap/java-patterns-and-constructs.svg)](https://travis-ci.org/lpenap/java-patterns-and-constructs)
+[![maven build](https://github.com/lpenap/java-patterns-and-constructs/actions/workflows/merged_master.yml/badge.svg)](https://github.com/lpenap/java-patterns-and-constructs/actions/workflows/merged_master.yml)
 [![GitHub release](https://img.shields.io/github/release/lpenap/java-patterns-and-constructs)](//github.com/lpenap/java-patterns-and-constructs/releases/latest)
+[![codebeat badge](https://codebeat.co/badges/4c328c5d-1722-459f-aaa1-437a0ed6201f)](https://codebeat.co/projects/github-com-lpenap-java-patterns-and-constructs-master)
+![Coverage](.github/badges/jacoco.svg)
 
 # Java Design Patterns and Constructs
 Collection of patterns and other constructs in Java for educational purposes. (See *Contributing* section if you would like to contribute).
 
 ## Quickstart
-* Install a Java 11 implementation (like openjdk11)
+* Install a Java 21 implementation (like openjdk21)
 * Clone and run the spring-boot maven goal:
 ```bash
 git clone https://github.com/lpenap/java-patterns-and-constructs
@@ -15,9 +16,15 @@ cd java-patterns-and-constructs
 ```
 ## Da List
 ### Patterns
+* [Abstract Factory](src/main/java/com/penapereira/example/constructs/abstractfactory/)
+* [Adapter](src/main/java/com/penapereira/example/constructs/adapter/)
+* [Decorator](src/main/java/com/penapereira/example/constructs/decorator/)
+* [Factory](src/main/java/com/penapereira/example/constructs/factory/)
 * [Factory Method](src/main/java/com/penapereira/example/constructs/factorymethod/)
 * [Observer](src/main/java/com/penapereira/example/constructs/observer/)
 * [Singleton](src/main/java/com/penapereira/example/constructs/singleton/)
+* [Strategy](src/main/java/com/penapereira/example/constructs/strategy/)
+* [Template Method](src/main/java/com/penapereira/example/constructs/templatemethod/)
 ### Constructs and Problems
 * [Producer/Consumer](src/main/java/com/penapereira/example/constructs/producerconsumer/), a multi-process synchronization problem.
 

pom.xml

@@ -2,21 +2,21 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
-	<parent>
-		<groupId>org.springframework.boot</groupId>
-		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>2.1.7.RELEASE</version>
-		<relativePath/> <!-- lookup parent from repository -->
-	</parent>
+        <parent>
+                <groupId>org.springframework.boot</groupId>
+                <artifactId>spring-boot-starter-parent</artifactId>
+                <version>3.2.5</version>
+                <relativePath/>
+        </parent>
 	<groupId>com.penapereira</groupId>
 	<artifactId>java-patterns-and-constructs</artifactId>
 	<version>0.0.2</version>
 	<name>java-patterns-and-constructs</name>
 	<description>Collection of patterns and other constructs in Java</description>
 
 	<properties>
-		<java.version>11</java.version>
-	</properties>
+                <java.version>21</java.version>
+        </properties>
 
 	<dependencies>
 		<dependency>
@@ -47,13 +47,67 @@
 		</dependency>
 	</dependencies>
 
-	<build>
-		<plugins>
-			<plugin>
-				<groupId>org.springframework.boot</groupId>
-				<artifactId>spring-boot-maven-plugin</artifactId>
-			</plugin>
-		</plugins>
-	</build>
+        <build>
+                <plugins>
+                <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-compiler-plugin</artifactId>
+                        <configuration>
+                                <release>${java.version}</release>
+                        </configuration>
+                </plugin>
+                <plugin>
+                        <groupId>org.jacoco</groupId>
+                        <artifactId>jacoco-maven-plugin</artifactId>
+                        <version>0.8.12</version>
+                        <executions>
+                                <execution>
+                                        <goals>
+                                                <goal>prepare-agent</goal>
+                                        </goals>
+                                </execution>
+                                <execution>
+                                        <id>generate-code-coverage-report</id>
+                                        <phase>test</phase>
+                                        <goals>
+                                                <goal>report</goal>
+                                                <goal>check</goal>
+                                        </goals>
+                                        <configuration>
+                                                <rules>
+                                                        <rule>
+                                                                <element>BUNDLE</element>
+                                                                <limits>
+                                                                        <limit>
+                                                                                <counter>INSTRUCTION</counter>
+                                                                                <value>COVEREDRATIO</value>
+                                                                                <minimum>0.90</minimum>
+                                                                        </limit>
+                                                                </limits>
+                                                        </rule>
+                                                </rules>
+                                                <excludes>
+                                                        <exclude>**/*ExampleRunner*</exclude>
+                                                        <exclude>**/AppCommandLineRunner*</exclude>
+                                                        <exclude>**/ExamplesCommandLineRunner*</exclude>
+                                                        <exclude>**/ProducerConsumerExampleRunner*</exclude>
+                                                        <exclude>**/Consumer*</exclude>
+                                                        <exclude>**/JavaPatternsAndConstructsApplication*</exclude>
+                                                        <exclude>**/MainWindow*</exclude>
+                                                        <exclude>**/Messages*</exclude>
+                                                        <exclude>**/ApplicationProperties*</exclude>
+                                                        <exclude>**/HyperlinkMouseListener*</exclude>
+                                                        <exclude>**/ObservableAbstract*</exclude>
+                                                </excludes>
+                                        </configuration>
+                                </execution>
+                        </executions>
+                </plugin>
+                <plugin>
+                        <groupId>org.springframework.boot</groupId>
+                        <artifactId>spring-boot-maven-plugin</artifactId>
+                </plugin>
+                </plugins>
+        </build>
 
 </project>

src/main/java/com/penapereira/example/constructs/abstractfactory/AbstractFactory.java

@@ -0,0 +1,6 @@
+package com.penapereira.example.constructs.abstractfactory;
+
+public interface AbstractFactory {
+        ProductA createProductA();
+        ProductB createProductB();
+}

src/main/java/com/penapereira/example/constructs/abstractfactory/AbstractFactoryExampleRunner.java

@@ -0,0 +1,28 @@
+package com.penapereira.example.constructs.abstractfactory;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.stereotype.Component;
+
+import com.penapereira.example.constructs.app.ExampleRunnerInterface;
+
+@Component
+public class AbstractFactoryExampleRunner implements ExampleRunnerInterface {
+
+        private static final Logger log =
+                        LoggerFactory.getLogger(AbstractFactoryExampleRunner.class);
+
+        @Override
+        public void runExample() throws Exception {
+                log.trace("Executing Abstract Factory Pattern Implementation:");
+
+                AbstractFactory factory1 = new Factory1();
+                AbstractFactory factory2 = new Factory2();
+
+                log.trace("  " + factory1.createProductA().name());
+                log.trace("  " + factory1.createProductB().name());
+
+                log.trace("  " + factory2.createProductA().name());
+                log.trace("  " + factory2.createProductB().name());
+        }
+}

src/main/java/com/penapereira/example/constructs/abstractfactory/Factory1.java

@@ -0,0 +1,14 @@
+package com.penapereira.example.constructs.abstractfactory;
+
+public class Factory1 implements AbstractFactory {
+
+        @Override
+        public ProductA createProductA() {
+                return new ProductA1();
+        }
+
+        @Override
+        public ProductB createProductB() {
+                return new ProductB1();
+        }
+}

src/main/java/com/penapereira/example/constructs/abstractfactory/Factory2.java

@@ -0,0 +1,14 @@
+package com.penapereira.example.constructs.abstractfactory;
+
+public class Factory2 implements AbstractFactory {
+
+        @Override
+        public ProductA createProductA() {
+                return new ProductA2();
+        }
+
+        @Override
+        public ProductB createProductB() {
+                return new ProductB2();
+        }
+}

src/main/java/com/penapereira/example/constructs/abstractfactory/ProductA.java

@@ -0,0 +1,5 @@
+package com.penapereira.example.constructs.abstractfactory;
+
+public interface ProductA {
+        String name();
+}

src/main/java/com/penapereira/example/constructs/abstractfactory/ProductA1.java

@@ -0,0 +1,9 @@
+package com.penapereira.example.constructs.abstractfactory;
+
+public class ProductA1 implements ProductA {
+
+        @Override
+        public String name() {
+                return "ProductA1";
+        }
+}

src/main/java/com/penapereira/example/constructs/abstractfactory/ProductA2.java

@@ -0,0 +1,9 @@
+package com.penapereira.example.constructs.abstractfactory;
+
+public class ProductA2 implements ProductA {
+
+        @Override
+        public String name() {
+                return "ProductA2";
+        }
+}

src/main/java/com/penapereira/example/constructs/abstractfactory/ProductB.java

@@ -0,0 +1,5 @@
+package com.penapereira.example.constructs.abstractfactory;
+
+public interface ProductB {
+        String name();
+}

src/main/java/com/penapereira/example/constructs/abstractfactory/ProductB1.java

@@ -0,0 +1,9 @@
+package com.penapereira.example.constructs.abstractfactory;
+
+public class ProductB1 implements ProductB {
+
+        @Override
+        public String name() {
+                return "ProductB1";
+        }
+}

src/main/java/com/penapereira/example/constructs/abstractfactory/ProductB2.java

@@ -0,0 +1,9 @@
+package com.penapereira.example.constructs.abstractfactory;
+
+public class ProductB2 implements ProductB {
+
+        @Override
+        public String name() {
+                return "ProductB2";
+        }
+}

src/main/java/com/penapereira/example/constructs/adapter/Adaptee.java

@@ -0,0 +1,7 @@
+package com.penapereira.example.constructs.adapter;
+
+public class Adaptee {
+    public String specificRequest() {
+        return "Adaptee";
+    }
+}

src/main/java/com/penapereira/example/constructs/adapter/Adapter.java

@@ -0,0 +1,14 @@
+package com.penapereira.example.constructs.adapter;
+
+public class Adapter implements Target {
+    private final Adaptee adaptee;
+
+    public Adapter(Adaptee adaptee) {
+        this.adaptee = adaptee;
+    }
+
+    @Override
+    public String request() {
+        return "Adapter(" + adaptee.specificRequest() + ")";
+    }
+}

src/main/java/com/penapereira/example/constructs/adapter/AdapterExampleRunner.java

@@ -0,0 +1,23 @@
+package com.penapereira.example.constructs.adapter;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.stereotype.Component;
+
+import com.penapereira.example.constructs.app.ExampleRunnerInterface;
+
+@Component
+public class AdapterExampleRunner implements ExampleRunnerInterface {
+
+    private static final Logger log = LoggerFactory.getLogger(AdapterExampleRunner.class);
+
+    @Override
+    public void runExample() throws Exception {
+        log.trace("Executing Adapter Pattern Implementation");
+
+        Adaptee adaptee = new Adaptee();
+        Target target = new Adapter(adaptee);
+
+        log.trace("  " + target.request());
+    }
+}