WIP

.github/workflows/main.yml

@@ -6,6 +6,7 @@ env:
  SONATYPE_USERNAME: ${{ secrets.SONATYPE_USERNAME }}
  SONATYPE_PASSWORD: ${{ secrets.SONATYPE_PASSWORD }}
  MAVEN_ARGS: -V -B --no-transfer-progress -Dhttp.keepAlive=false -Dmaven.wagon.http.pool=false -Dmaven.wagon.httpconnectionManager.ttlSeconds=120
+ MAVEN_ADDITIONAL_ARGS:
 
 jobs:
  test_jdk:
@@ -24,68 +25,61 @@ jobs:
  distribution: 'zulu'
  java-version: ${{ matrix.java }}
  - name: 'Test'
- run: ./mvnw ${MAVEN_ARGS} -Djacoco.skip=true install -DskipDistribution=true
- linux:
- name: 'Linux JDK 11'
- runs-on: ubuntu-latest
- steps:
- - name: 'Checkout'
- uses: actions/checkout@v3
- - name: 'Set up JDK 11'
- uses: actions/setup-java@v3
- with:
- distribution: 'zulu'
- java-version: 11
- - name: 'Test'
- run: ./mvnw ${MAVEN_ARGS} install
+ run: ./mvnw ${MAVEN_ARGS} -Djacoco.skip=${{ matrix.java != 17 }} install -DskipDistribution=${{ matrix.java != 17 }}
  - name: 'Generate coverage report'
+ if: ${{ matrix.java == 17 }}
  run: ./mvnw jacoco:report
  - name: 'Upload coverage to Codecov'
+ if: ${{ matrix.java == 17 }}
  uses: codecov/codecov-action@v2
  - name: 'Publish Snapshots'
- if: github.event_name == 'push' && github.ref == 'refs/heads/main' && github.repository == 'mapstruct/mapstruct'
+ if: ${{ matrix.java == 17 }} && github.event_name == 'push' && github.ref == 'refs/heads/main' && github.repository == 'mapstruct/mapstruct'
  run: ./mvnw -s etc/ci-settings.xml -DskipTests=true -DskipDistribution=true deploy
- linux-jdk-8:
- name: 'Linux JDK 8'
+ integration_test_jdk:
+ strategy:
+ fail-fast: false
+ matrix:
+ java: [ 8, 11 ]
+ name: 'Linux JDK ${{ matrix.java }}'
  runs-on: ubuntu-latest
  steps:
  - name: 'Checkout'
  uses: actions/checkout@v3
- - name: 'Set up JDK 11 for building everything'
+ - name: 'Set up JDK 17 for building everything'
  uses: actions/setup-java@v3
  with:
  distribution: 'zulu'
- java-version: 11
+ java-version: 17
  - name: 'Install Processor'
  run: ./mvnw ${MAVEN_ARGS} -DskipTests install -pl processor -am
- - name: 'Set up JDK 8 for running integration tests'
+ - name: 'Set up JDK ${{ matrix.java }} for running integration tests'
  uses: actions/setup-java@v3
  with:
  distribution: 'zulu'
- java-version: 8
+ java-version: ${{ matrix.java }}
  - name: 'Run integration tests'
  run: ./mvnw ${MAVEN_ARGS} verify -pl integrationtest
  windows:
  name: 'Windows'
  runs-on: windows-latest
  steps:
  - uses: actions/checkout@v3
- - name: 'Set up JDK 11'
+ - name: 'Set up JDK 17'
  uses: actions/setup-java@v3
  with:
  distribution: 'zulu'
- java-version: 11
+ java-version: 17
  - name: 'Test'
  run: ./mvnw %MAVEN_ARGS% install
  mac:
  name: 'Mac OS'
  runs-on: macos-latest
  steps:
  - uses: actions/checkout@v3
- - name: 'Set up JDK 11'
+ - name: 'Set up JDK 17'
  uses: actions/setup-java@v3
  with:
  distribution: 'zulu'
- java-version: 11
+ java-version: 17
  - name: 'Test'
  run: ./mvnw ${MAVEN_ARGS} install

integrationtest/src/test/java/org/mapstruct/itest/tests/MavenIntegrationTest.java

@@ -131,6 +131,13 @@ void recordsTest() {
  void recordsCrossModuleTest() {
  }
 
+ @ProcessorTest(baseDir = "recordsCrossModuleInterfaceTest", processorTypes = {
+ ProcessorTest.ProcessorType.JAVAC
+ })
+ @EnabledForJreRange(min = JRE.JAVA_17)
+ void recordsCrossModuleInterfaceTest() {
+ }
+
  @ProcessorTest(baseDir = "expressionTextBlocksTest", processorTypes = {
  ProcessorTest.ProcessorType.JAVAC
  })

integrationtest/src/test/resources/recordsCrossModuleInterfaceTest/module-1/pom.xml

@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+ Copyright MapStruct Authors.
+
+ Licensed under the Apache License version 2.0, available at http://www.apache.org/licenses/LICENSE-2.0
+
+-->
+<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>
+ <artifactId>recordsCrossModuleInterfaceTest</artifactId>
+ <groupId>org.mapstruct</groupId>
+ <version>1.0.0</version>
+ </parent>
+
+ <artifactId>records-cross-module-1</artifactId>
+
+</project>

integrationtest/src/test/resources/recordsCrossModuleInterfaceTest/module-1/src/main/java/org/mapstruct/itest/records/module1/NestedInterface.java

@@ -0,0 +1,10 @@
+/*
+ * Copyright MapStruct Authors.
+ *
+ * Licensed under the Apache License version 2.0, available at http://www.apache.org/licenses/LICENSE-2.0
+ */
+package org.mapstruct.itest.records.module1;
+
+public interface NestedInterface {
+ String field();
+}

integrationtest/src/test/resources/recordsCrossModuleInterfaceTest/module-1/src/main/java/org/mapstruct/itest/records/module1/RootInterface.java

@@ -0,0 +1,10 @@
+/*
+ * Copyright MapStruct Authors.
+ *
+ * Licensed under the Apache License version 2.0, available at http://www.apache.org/licenses/LICENSE-2.0
+ */
+package org.mapstruct.itest.records.module1;
+
+public interface RootInterface {
+ NestedInterface nested();
+}

integrationtest/src/test/resources/recordsCrossModuleInterfaceTest/module-1/src/main/java/org/mapstruct/itest/records/module1/SourceNestedRecord.java

@@ -0,0 +1,11 @@
+/*
+ * Copyright MapStruct Authors.
+ *
+ * Licensed under the Apache License version 2.0, available at http://www.apache.org/licenses/LICENSE-2.0
+ */
+package org.mapstruct.itest.records.module1;
+
+public record SourceNestedRecord(
+ String field
+) implements NestedInterface {
+}

integrationtest/src/test/resources/recordsCrossModuleInterfaceTest/module-1/src/main/java/org/mapstruct/itest/records/module1/SourceRootRecord.java

@@ -0,0 +1,11 @@
+/*
+ * Copyright MapStruct Authors.
+ *
+ * Licensed under the Apache License version 2.0, available at http://www.apache.org/licenses/LICENSE-2.0
+ */
+package org.mapstruct.itest.records.module1;
+
+public record SourceRootRecord(
+ SourceNestedRecord nested
+) implements RootInterface {
+}

integrationtest/src/test/resources/recordsCrossModuleInterfaceTest/module-2/pom.xml

@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+ Copyright MapStruct Authors.
+
+ Licensed under the Apache License version 2.0, available at http://www.apache.org/licenses/LICENSE-2.0
+
+-->
+<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>
+ <artifactId>recordsCrossModuleInterfaceTest</artifactId>
+ <groupId>org.mapstruct</groupId>
+ <version>1.0.0</version>
+ </parent>
+
+ <artifactId>records-cross-module-2</artifactId>
+
+
+ <dependencies>
+ <dependency>
+ <groupId>org.mapstruct</groupId>
+ <artifactId>records-cross-module-1</artifactId>
+ <version>1.0.0</version>
+ </dependency>
+ </dependencies>
+</project>

integrationtest/src/test/resources/recordsCrossModuleInterfaceTest/module-2/src/main/java/org/mapstruct/itest/records/module2/RecordInterfaceIssueMapper.java

@@ -0,0 +1,18 @@
+/*
+ * Copyright MapStruct Authors.
+ *
+ * Licensed under the Apache License version 2.0, available at http://www.apache.org/licenses/LICENSE-2.0
+ */
+package org.mapstruct.itest.records.module2;
+
+import org.mapstruct.itest.records.module1.SourceRootRecord;
+import org.mapstruct.Mapper;
+import org.mapstruct.factory.Mappers;
+
+@Mapper
+public interface RecordInterfaceIssueMapper {
+
+ RecordInterfaceIssueMapper INSTANCE = Mappers.getMapper(RecordInterfaceIssueMapper.class);
+
+ TargetRootRecord map(SourceRootRecord source);
+}

integrationtest/src/test/resources/recordsCrossModuleInterfaceTest/module-2/src/main/java/org/mapstruct/itest/records/module2/TargetNestedRecord.java

@@ -0,0 +1,11 @@
+/*
+ * Copyright MapStruct Authors.
+ *
+ * Licensed under the Apache License version 2.0, available at http://www.apache.org/licenses/LICENSE-2.0
+ */
+package org.mapstruct.itest.records.module2;
+
+public record TargetNestedRecord(
+ String field
+) {
+}

integrationtest/src/test/resources/recordsCrossModuleInterfaceTest/module-2/src/main/java/org/mapstruct/itest/records/module2/TargetRootRecord.java

@@ -0,0 +1,11 @@
+/*
+ * Copyright MapStruct Authors.
+ *
+ * Licensed under the Apache License version 2.0, available at http://www.apache.org/licenses/LICENSE-2.0
+ */
+package org.mapstruct.itest.records.module2;
+
+public record TargetRootRecord(
+ TargetNestedRecord nested
+) {
+}

integrationtest/src/test/resources/recordsCrossModuleInterfaceTest/module-2/src/test/java/org/mapstruct/itest/records/module2/RecordsTest.java

@@ -0,0 +1,26 @@
+/*
+ * Copyright MapStruct Authors.
+ *
+ * Licensed under the Apache License version 2.0, available at http://www.apache.org/licenses/LICENSE-2.0
+ */
+package org.mapstruct.itest.records.module2;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+import org.junit.Test;
+import org.mapstruct.itest.records.module1.SourceRootRecord;
+import org.mapstruct.itest.records.module1.SourceNestedRecord;
+
+public class RecordsTest {
+
+ @Test
+ public void shouldMap() {
+ SourceRootRecord source = new SourceRootRecord( new SourceNestedRecord( "test" ) );
+ TargetRootRecord target = RecordInterfaceIssueMapper.INSTANCE.map( source );
+
+ assertThat( target ).isNotNull();
+ assertThat( target.nested() ).isNotNull();
+ assertThat( target.nested().field() ).isEqualTo( "test" );
+ }
+
+}

integrationtest/src/test/resources/recordsCrossModuleInterfaceTest/pom.xml

@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+ Copyright MapStruct Authors.
+
+ Licensed under the Apache License version 2.0, available at http://www.apache.org/licenses/LICENSE-2.0
+
+-->
+<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.mapstruct</groupId>
+ <artifactId>mapstruct-it-parent</artifactId>
+ <version>1.0.0</version>
+ <relativePath>../pom.xml</relativePath>
+ </parent>
+
+ <artifactId>recordsCrossModuleInterfaceTest</artifactId>
+ <packaging>pom</packaging>
+
+ <modules>
+ <module>module-1</module>
+ <module>module-2</module>
+ </modules>
+</project>

processor/pom.xml

@@ -24,7 +24,7 @@
  <!-- Netbeans has a problem when we use late binding with @ in the surefire arg line.
  Therefore we set this empty property here-->
  <jacocoArgLine />
- <minimum.java.version>11</minimum.java.version>
+ <minimum.java.version>17</minimum.java.version>
  </properties>
 
  <dependencies>