Merge pull request #20816 from glefloch/fix/add-annotation-processor-…

…test

Add gradle integration test leveraging annotation processor

integration-tests/gradle/pom.xml

@@ -15,6 +15,10 @@
     <name>Quarkus - Integration Tests - Gradle tooling</name>
     <description>Quarkus - Integration Tests - Gradle tooling</description>
 
+    <properties>
+        <mapstruct.version>1.4.2.Final</mapstruct.version>
+    </properties>
+
     <dependencies>
         <!-- All the following dependencies shall enforce the right build order
              and proper upstream/downstream detection for incremental build.

integration-tests/gradle/src/main/resources/annotation-processor-multi-module/application/build.gradle

@@ -0,0 +1,8 @@
+plugins {
+    id 'io.quarkus'
+}
+
+dependencies {
+    implementation project(":common")
+    implementation 'io.quarkus:quarkus-resteasy-jackson'
+}

integration-tests/gradle/src/main/resources/annotation-processor-multi-module/application/src/main/java/org/acme/quarkus/sample/HelloResource.java

@@ -0,0 +1,27 @@
+package org.acme.quarkus.sample;
+
+import javax.ws.rs.GET;
+import javax.ws.rs.Path;
+import javax.ws.rs.Produces;
+import javax.ws.rs.core.MediaType;
+
+import org.acme.common.CarMapper;
+import org.acme.common.domain.Car;
+import org.acme.common.domain.CarDTO;
+
+@Path("/hello")
+public class HelloResource {
+
+    private final CarMapper carMapper;
+
+    public HelloResource(CarMapper carMapper) {
+        this.carMapper = carMapper;
+    }
+
+    @GET
+    @Produces(MediaType.APPLICATION_JSON)
+    public CarDTO hello() {
+        Car car = new Car("foo", 4);
+        return carMapper.carToCarDTO(car);
+    }
+}

integration-tests/gradle/src/main/resources/annotation-processor-multi-module/application/src/test/java/org/acme/quarkus/sample/HelloResourceTest.java

@@ -0,0 +1,20 @@
+package org.acme.quarkus.sample;
+
+import io.quarkus.test.junit.QuarkusTest;
+import org.junit.jupiter.api.Test;
+
+import static io.restassured.RestAssured.given;
+import static org.hamcrest.CoreMatchers.containsString;
+
+@QuarkusTest
+public class HelloResourceTest {
+
+    @Test
+    public void testHelloEndpoint() {
+        given()
+            .when().get("/hello")
+            .then()
+            .statusCode(200)
+            .body(containsString("seatNumber"));
+    }
+}

integration-tests/gradle/src/main/resources/annotation-processor-multi-module/build.gradle

@@ -0,0 +1,52 @@
+buildscript {
+    repositories {
+        if (System.properties.containsKey('maven.repo.local')) {
+            maven {
+                url System.properties.get('maven.repo.local')
+            }
+        } else {
+            mavenLocal()
+        }
+        mavenCentral()
+        gradlePluginPortal()
+    }
+}
+
+apply plugin: 'java'
+
+group = 'com.quarkus.demo'
+version = '1.0'
+
+
+subprojects {
+
+    apply plugin: 'java'
+
+    test {
+        dependsOn 'cleanTest'
+        useJUnitPlatform()
+        forkEvery 1
+    }
+
+    repositories {
+        if (System.properties.containsKey('maven.repo.local')) {
+            maven {
+                url System.properties.get('maven.repo.local')
+            }
+        } else {
+            mavenLocal()
+        }
+        mavenCentral()
+    }
+
+    dependencies {
+
+        implementation 'io.quarkus:quarkus-resteasy'
+
+        testImplementation 'io.quarkus:quarkus-junit5'
+        testImplementation 'io.rest-assured:rest-assured'
+
+        implementation enforcedPlatform("${quarkusPlatformGroupId}:${quarkusPlatformArtifactId}:${quarkusPlatformVersion}")
+
+    }
+}

integration-tests/gradle/src/main/resources/annotation-processor-multi-module/common/build.gradle

@@ -0,0 +1,9 @@
+plugins {
+    id 'java-library'
+}
+
+dependencies {
+    implementation "org.mapstruct:mapstruct:${mapstructVersion}"
+
+    annotationProcessor "org.mapstruct:mapstruct-processor:${mapstructVersion}"
+}

integration-tests/gradle/src/main/resources/annotation-processor-multi-module/common/src/main/java/org/acme/common/CarMapper.java

@@ -0,0 +1,15 @@
+package org.acme.common;
+
+import org.acme.common.domain.Car;
+import org.acme.common.domain.CarDTO;
+import org.mapstruct.InjectionStrategy;
+import org.mapstruct.Mapper;
+import org.mapstruct.Mapping;
+
+@Mapper(componentModel = "cdi", injectionStrategy = InjectionStrategy.CONSTRUCTOR)
+public interface CarMapper {
+
+    @Mapping(source = "numberOfSeats", target = "seatNumber")
+    CarDTO carToCarDTO(Car car);
+
+}

integration-tests/gradle/src/main/resources/annotation-processor-multi-module/common/src/main/java/org/acme/common/domain/Car.java

@@ -0,0 +1,30 @@
+package org.acme.common.domain;
+
+public class Car {
+    private String type;
+    private Integer numberOfSeats;
+
+    public Car() {
+    }
+
+    public Car(String type, Integer numberOfSeats) {
+        this.type = type;
+        this.numberOfSeats = numberOfSeats;
+    }
+
+    public String getType() {
+        return type;
+    }
+
+    public void setType(String type) {
+        this.type = type;
+    }
+
+    public Integer getNumberOfSeats() {
+        return numberOfSeats;
+    }
+
+    public void setNumberOfSeats(Integer numberOfSeats) {
+        this.numberOfSeats = numberOfSeats;
+    }
+}

integration-tests/gradle/src/main/resources/annotation-processor-multi-module/common/src/main/java/org/acme/common/domain/CarDTO.java

@@ -0,0 +1,30 @@
+package org.acme.common.domain;
+
+public class CarDTO {
+    private String type;
+    private Integer seatNumber;
+
+    public CarDTO() {
+    }
+
+    public CarDTO(String type, Integer seatNumber) {
+        this.type = type;
+        this.seatNumber = seatNumber;
+    }
+
+    public String getType() {
+        return type;
+    }
+
+    public void setType(String type) {
+        this.type = type;
+    }
+
+    public Integer getSeatNumber() {
+        return seatNumber;
+    }
+
+    public void setSeatNumber(Integer seatNumber) {
+        this.seatNumber = seatNumber;
+    }
+}

integration-tests/gradle/src/main/resources/annotation-processor-multi-module/gradle.properties

@@ -0,0 +1,4 @@
+quarkusPlatformArtifactId=quarkus-bom
+quarkusPlatformGroupId=io.quarkus
+
+mapstructVersion=${mapstruct.version}

integration-tests/gradle/src/main/resources/annotation-processor-multi-module/settings.gradle

@@ -0,0 +1,23 @@
+pluginManagement {
+    repositories {
+        if (System.properties.containsKey('maven.repo.local')) {
+            maven {
+                url System.properties.get('maven.repo.local')
+            }
+        } else {
+            mavenLocal()
+        }
+        mavenCentral()
+        gradlePluginPortal()
+    }
+    //noinspection GroovyAssignabilityCheck
+    plugins {
+        id 'io.quarkus' version "${quarkusPluginVersion}"
+    }
+}
+
+rootProject.name = 'quarkus-annotation-processor-multi-module-build'
+
+include ':common'
+include ':application'
+

integration-tests/gradle/src/main/resources/annotation-processor-simple-module/build.gradle

@@ -0,0 +1,40 @@
+plugins {
+    id 'java'
+    id 'io.quarkus'
+}
+
+group = 'com.quarkus.demo'
+version = '1.0'
+
+test {
+    dependsOn 'cleanTest'
+    useJUnitPlatform()
+    forkEvery 1
+}
+
+repositories {
+    if (System.properties.containsKey('maven.repo.local')) {
+        maven {
+            url System.properties.get('maven.repo.local')
+        }
+    } else {
+        mavenLocal()
+    }
+    mavenCentral()
+}
+
+dependencies {
+
+    implementation 'io.quarkus:quarkus-resteasy'
+    implementation 'io.quarkus:quarkus-resteasy-jackson'
+    implementation "org.mapstruct:mapstruct:${mapstructVersion}"
+
+    annotationProcessor "org.mapstruct:mapstruct-processor:${mapstructVersion}"
+
+    testImplementation 'io.quarkus:quarkus-junit5'
+    testImplementation 'io.rest-assured:rest-assured'
+
+    implementation enforcedPlatform("${quarkusPlatformGroupId}:${quarkusPlatformArtifactId}:${quarkusPlatformVersion}")
+
+}
+

integration-tests/gradle/src/main/resources/annotation-processor-simple-module/gradle.properties

@@ -0,0 +1,4 @@
+quarkusPlatformArtifactId=quarkus-bom
+quarkusPlatformGroupId=io.quarkus
+
+mapstructVersion=${mapstruct.version}

integration-tests/gradle/src/main/resources/annotation-processor-simple-module/settings.gradle

@@ -0,0 +1,23 @@
+pluginManagement {
+    repositories {
+        if (System.properties.containsKey('maven.repo.local')) {
+            maven {
+                url System.properties.get('maven.repo.local')
+            }
+        } else {
+            mavenLocal()
+        }
+        mavenCentral()
+        gradlePluginPortal()
+    }
+    //noinspection GroovyAssignabilityCheck
+    plugins {
+        id 'io.quarkus' version "${quarkusPluginVersion}"
+    }
+}
+
+rootProject.name = 'quarkus-annotation-processor-multi-module-build'
+
+include ':common'
+include ':application'
+

integration-tests/gradle/src/main/resources/annotation-processor-simple-module/src/main/java/org/acme/quarkus/CarMapper.java

@@ -0,0 +1,15 @@
+package org.acme.quarkus;
+
+import org.acme.quarkus.domain.Car;
+import org.acme.quarkus.domain.CarDTO;
+import org.mapstruct.InjectionStrategy;
+import org.mapstruct.Mapper;
+import org.mapstruct.Mapping;
+
+@Mapper(componentModel = "cdi", injectionStrategy = InjectionStrategy.CONSTRUCTOR)
+public interface CarMapper {
+
+    @Mapping(source = "numberOfSeats", target = "seatNumber")
+    CarDTO carToCarDTO(Car car);
+
+}

integration-tests/gradle/src/main/resources/annotation-processor-simple-module/src/main/java/org/acme/quarkus/domain/Car.java

@@ -0,0 +1,30 @@
+package org.acme.quarkus.domain;
+
+public class Car {
+    private String type;
+    private Integer numberOfSeats;
+
+    public Car() {
+    }
+
+    public Car(String type, Integer numberOfSeats) {
+        this.type = type;
+        this.numberOfSeats = numberOfSeats;
+    }
+
+    public String getType() {
+        return type;
+    }
+
+    public void setType(String type) {
+        this.type = type;
+    }
+
+    public Integer getNumberOfSeats() {
+        return numberOfSeats;
+    }
+
+    public void setNumberOfSeats(Integer numberOfSeats) {
+        this.numberOfSeats = numberOfSeats;
+    }
+}

integration-tests/gradle/src/main/resources/annotation-processor-simple-module/src/main/java/org/acme/quarkus/domain/CarDTO.java

@@ -0,0 +1,30 @@
+package org.acme.quarkus.domain;
+
+public class CarDTO {
+    private String type;
+    private Integer seatNumber;
+
+    public CarDTO() {
+    }
+
+    public CarDTO(String type, Integer seatNumber) {
+        this.type = type;
+        this.seatNumber = seatNumber;
+    }
+
+    public String getType() {
+        return type;
+    }
+
+    public void setType(String type) {
+        this.type = type;
+    }
+
+    public Integer getSeatNumber() {
+        return seatNumber;
+    }
+
+    public void setSeatNumber(Integer seatNumber) {
+        this.seatNumber = seatNumber;
+    }
+}