Update examples to use Java 8, mapstruct module and Mapping Repeatable annotation

filiphr · filiphr · commit 42fda11e9a91 · 2018-11-11T12:35:30.000+01:00
diff --git a/mapstruct-field-mapping/pom.xml b/mapstruct-field-mapping/pom.xml
@@ -33,7 +33,7 @@
     <dependencies>
         <dependency>
             <groupId>org.mapstruct</groupId>
-            <artifactId>mapstruct-jdk8</artifactId>
+            <artifactId>mapstruct</artifactId>
             <version>${org.mapstruct.version}</version>
         </dependency>
 
@@ -70,8 +70,8 @@
                 <artifactId>maven-compiler-plugin</artifactId>
                 <version>3.6.2</version>
                 <configuration>
-                    <source>1.7</source>
-                    <target>1.7</target>
+                    <source>1.8</source>
+                    <target>1.8</target>
                     <annotationProcessorPaths>
                         <path>
                             <groupId>org.mapstruct</groupId>
diff --git a/mapstruct-field-mapping/src/main/java/org/mapstruct/example/mapper/CustomerMapper.java b/mapstruct-field-mapping/src/main/java/org/mapstruct/example/mapper/CustomerMapper.java
@@ -21,7 +21,6 @@
 import org.mapstruct.InheritInverseConfiguration;
 import org.mapstruct.Mapper;
 import org.mapstruct.Mapping;
-import org.mapstruct.Mappings;
 import org.mapstruct.example.dto.Customer;
 import org.mapstruct.example.dto.CustomerDto;
 import org.mapstruct.factory.Mappers;
@@ -34,10 +33,8 @@ public interface CustomerMapper {
 
     CustomerMapper MAPPER = Mappers.getMapper( CustomerMapper.class );
 
-    @Mappings({
-        @Mapping(source = "orders", target = "orderItems"),
-        @Mapping(source = "customerName", target = "name")
-    })
+    @Mapping(source = "orders", target = "orderItems")
+    @Mapping(source = "customerName", target = "name")
     Customer toCustomer(CustomerDto customerDto);
 
     @InheritInverseConfiguration
diff --git a/mapstruct-iterable-to-non-iterable/pom.xml b/mapstruct-iterable-to-non-iterable/pom.xml
@@ -26,8 +26,8 @@
     <version>1.0-SNAPSHOT</version>
 
     <properties>
-        <maven.compiler.source>1.7</maven.compiler.source>
-        <maven.compiler.target>1.7</maven.compiler.target>
+        <maven.compiler.source>1.8</maven.compiler.source>
+        <maven.compiler.target>1.8</maven.compiler.target>
     </properties>
 
     <dependencies>
diff --git a/mapstruct-iterable-to-non-iterable/src/main/java/com/mycompany/mapper/SourceTargetMapper.java b/mapstruct-iterable-to-non-iterable/src/main/java/com/mycompany/mapper/SourceTargetMapper.java
@@ -23,7 +23,6 @@
 import com.mycompany.mapper.util.LastElement;
 import org.mapstruct.Mapper;
 import org.mapstruct.Mapping;
-import org.mapstruct.Mappings;
 import org.mapstruct.factory.Mappers;
 
 
@@ -32,9 +31,7 @@ public interface SourceTargetMapper {
 
     SourceTargetMapper MAPPER = Mappers.getMapper( SourceTargetMapper.class );
 
-    @Mappings( {
-        @Mapping( source = "myIntegers", target = "myInteger", qualifiedBy = FirstElement.class ),
-        @Mapping( source = "myStrings", target = "myString", qualifiedBy = LastElement.class )
-    } )
+    @Mapping( source = "myIntegers", target = "myInteger", qualifiedBy = FirstElement.class )
+    @Mapping( source = "myStrings", target = "myString", qualifiedBy = LastElement.class )
     Target toTarget( Source s );
 }
diff --git a/mapstruct-jpa-child-parent/pom.xml b/mapstruct-jpa-child-parent/pom.xml
@@ -27,8 +27,8 @@
 
     <properties>
         <org.mapstruct.version>1.3.0.Beta2</org.mapstruct.version>
-        <maven.compiler.source>1.7</maven.compiler.source>
-        <maven.compiler.target>1.7</maven.compiler.target>
+        <maven.compiler.source>1.8</maven.compiler.source>
+        <maven.compiler.target>1.8</maven.compiler.target>
     </properties>
 
     <dependencies>
@@ -74,8 +74,6 @@
                 <artifactId>maven-compiler-plugin</artifactId>
                 <version>3.6.2</version>
                 <configuration>
-                    <source>1.7</source>
-                    <target>1.7</target>
                     <annotationProcessorPaths>
                         <path>
                             <groupId>org.mapstruct</groupId>
diff --git a/mapstruct-kotlin-gradle/build.gradle.kts b/mapstruct-kotlin-gradle/build.gradle.kts
@@ -14,7 +14,7 @@ repositories {
 
 dependencies {
     compile(kotlin("stdlib-jdk8"))
-    compile("org.mapstruct:mapstruct-jdk8:1.3.0.Beta2")
+    compile("org.mapstruct:mapstruct:1.3.0.Beta2")
     kapt("org.mapstruct:mapstruct-processor:1.3.0.Beta2")
 
     testCompile("org.junit.jupiter:junit-jupiter-api:5.3.1")
diff --git a/mapstruct-kotlin/README.md b/mapstruct-kotlin/README.md
@@ -74,12 +74,12 @@ Kotlin: https://kotlinlang.org/
 
 ## Maven Setup
 
-Add `mapstruct-jdk8` to your dependencies
+Add `mapstruct` to your dependencies
 
 ```xml
 <dependency>
   <groupId>org.mapstruct</groupId>
-  <artifactId>mapstruct-jdk8</artifactId>
+  <artifactId>mapstruct</artifactId>
   <version>${mapstruct.version}</version>
 </dependency>
 ```
diff --git a/mapstruct-kotlin/pom.xml b/mapstruct-kotlin/pom.xml
@@ -22,7 +22,7 @@
     <dependencies>
         <dependency>
             <groupId>org.mapstruct</groupId>
-            <artifactId>mapstruct-jdk8</artifactId>
+            <artifactId>mapstruct</artifactId>
             <version>${mapstruct.version}</version>
         </dependency>
 
diff --git a/mapstruct-lombok/build.gradle b/mapstruct-lombok/build.gradle
@@ -20,7 +20,7 @@ ext {
 sourceCompatibility = JavaVersion.VERSION_1_8
 
 dependencies {
-    compile "org.mapstruct:mapstruct-jdk8:${mapstructVersion}", "org.projectlombok:lombok:${lombokVersion}"
+    compile "org.mapstruct:mapstruct:${mapstructVersion}", "org.projectlombok:lombok:${lombokVersion}"
     testCompile 'junit:junit:4.12'
     apt "org.mapstruct:mapstruct-processor:${mapstructVersion}", "org.projectlombok:lombok:${lombokVersion}"
 }
diff --git a/mapstruct-lombok/pom.xml b/mapstruct-lombok/pom.xml
@@ -29,8 +29,8 @@
     <packaging>jar</packaging>
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <maven.compiler.source>1.7</maven.compiler.source>
-        <maven.compiler.target>1.7</maven.compiler.target>
+        <maven.compiler.source>1.8</maven.compiler.source>
+        <maven.compiler.target>1.8</maven.compiler.target>
         <org.mapstruct.version>1.3.0.Beta2</org.mapstruct.version>
         <org.projectlombok.version>1.18.0</org.projectlombok.version>
     </properties>
diff --git a/mapstruct-lookup-entity-with-id/pom.xml b/mapstruct-lookup-entity-with-id/pom.xml
@@ -38,7 +38,7 @@
 
         <dependency>
             <groupId>org.mapstruct</groupId>
-            <artifactId>mapstruct-jdk8</artifactId>
+            <artifactId>mapstruct</artifactId>
             <version>${org.mapstruct.version}</version>
         </dependency>
 
diff --git a/mapstruct-mapping-from-map/pom.xml b/mapstruct-mapping-from-map/pom.xml
@@ -32,7 +32,7 @@
     <dependencies>
         <dependency>
             <groupId>org.mapstruct</groupId>
-            <artifactId>mapstruct-jdk8</artifactId>
+            <artifactId>mapstruct</artifactId>
             <version>${org.mapstruct.version}</version>
         </dependency>
 
diff --git a/mapstruct-mapping-from-map/src/main/java/org/mapstruct/example/mapper/SourceTargetMapper.java b/mapstruct-mapping-from-map/src/main/java/org/mapstruct/example/mapper/SourceTargetMapper.java
@@ -21,7 +21,6 @@
 
 import org.mapstruct.Mapper;
 import org.mapstruct.Mapping;
-import org.mapstruct.Mappings;
 import org.mapstruct.example.dto.Source;
 import org.mapstruct.example.dto.Target;
 import org.mapstruct.example.mapper.util.MappingUtil;
@@ -38,9 +37,7 @@ public interface SourceTargetMapper {
 
     SourceTargetMapper MAPPER = Mappers.getMapper( SourceTargetMapper.class );
 
-    @Mappings( {
-        @Mapping(source = "map", target = "ip", qualifiedBy = Ip.class ),
-        @Mapping(source = "map", target = "server", qualifiedBy = Server.class ),
-    } )
+    @Mapping(source = "map", target = "ip", qualifiedBy = Ip.class )
+    @Mapping(source = "map", target = "server", qualifiedBy = Server.class )
     Target toTarget(Source s);
 }
diff --git a/mapstruct-mapping-with-cycles/pom.xml b/mapstruct-mapping-with-cycles/pom.xml
@@ -33,7 +33,7 @@
     <dependencies>
         <dependency>
             <groupId>org.mapstruct</groupId>
-            <artifactId>mapstruct-jdk8</artifactId>
+            <artifactId>mapstruct</artifactId>
             <version>${org.mapstruct.version}</version>
         </dependency>
 
diff --git a/mapstruct-nested-bean-mappings/pom.xml b/mapstruct-nested-bean-mappings/pom.xml
@@ -33,7 +33,7 @@
     <dependencies>
         <dependency>
             <groupId>org.mapstruct</groupId>
-            <artifactId>mapstruct-jdk8</artifactId>
+            <artifactId>mapstruct</artifactId>
             <version>${org.mapstruct.version}</version>
         </dependency>
 
diff --git a/mapstruct-nested-bean-mappings/src/main/java/org/mapstruct/example/mapper/FishTankMapper.java b/mapstruct-nested-bean-mappings/src/main/java/org/mapstruct/example/mapper/FishTankMapper.java
@@ -21,7 +21,6 @@
 import org.mapstruct.InheritInverseConfiguration;
 import org.mapstruct.Mapper;
 import org.mapstruct.Mapping;
-import org.mapstruct.Mappings;
 import org.mapstruct.example.dto.FishTankDto;
 import org.mapstruct.example.model.FishTank;
 import org.mapstruct.factory.Mappers;
@@ -35,22 +34,18 @@ public interface FishTankMapper {
 
     FishTankMapper INSTANCE = Mappers.getMapper( FishTankMapper.class );
 
-    @Mappings({
-        @Mapping(target = "fish.kind", source = "fish.type"),
-        @Mapping(target = "fish.name", ignore = true),
-        @Mapping(target = "ornament", source = "interior.ornament"),
-        @Mapping(target = "material.materialType", source = "material"),
-        @Mapping(target = "quality.report.organisation.name", source = "quality.report.organisationName")
-    })
+     @Mapping(target = "fish.kind", source = "fish.type")
+     @Mapping(target = "fish.name", ignore = true)
+     @Mapping(target = "ornament", source = "interior.ornament")
+     @Mapping(target = "material.materialType", source = "material")
+     @Mapping(target = "quality.report.organisation.name", source = "quality.report.organisationName")
     FishTankDto map(FishTank source);
 
-    @Mappings({
-        @Mapping(target = "fish.kind", source = "source.fish.type"),
-        @Mapping(target = "fish.name", ignore = true),
-        @Mapping(target = "ornament", source = "source.interior.ornament"),
-        @Mapping(target = "material.materialType", source = "source.material"),
-        @Mapping(target = "quality.report.organisation.name", source = "source.quality.report.organisationName")
-   })
+    @Mapping(target = "fish.kind", source = "source.fish.type")
+    @Mapping(target = "fish.name", ignore = true)
+    @Mapping(target = "ornament", source = "source.interior.ornament")
+    @Mapping(target = "material.materialType", source = "source.material")
+    @Mapping(target = "quality.report.organisation.name", source = "source.quality.report.organisationName")
     FishTankDto mapAsWell(FishTank source);
 
     @InheritInverseConfiguration( name = "map" )
diff --git a/mapstruct-nested-bean-mappings/src/main/java/org/mapstruct/example/mapper/FishTankMapperConstant.java b/mapstruct-nested-bean-mappings/src/main/java/org/mapstruct/example/mapper/FishTankMapperConstant.java
@@ -20,7 +20,6 @@
 
 import org.mapstruct.Mapper;
 import org.mapstruct.Mapping;
-import org.mapstruct.Mappings;
 import org.mapstruct.example.dto.FishTankDto;
 import org.mapstruct.example.model.FishTank;
 import org.mapstruct.factory.Mappers;
@@ -34,14 +33,12 @@ public interface FishTankMapperConstant {
 
     FishTankMapperConstant INSTANCE = Mappers.getMapper( FishTankMapperConstant.class );
 
-    @Mappings({
-        @Mapping(target = "fish.kind", source = "fish.type"),
-        @Mapping(target = "fish.name", constant = "Nemo"),
-        @Mapping(target = "ornament", ignore = true ),
-        @Mapping(target = "material.materialType", source = "material"),
-        @Mapping(target = "material.manufacturer",  constant = "MMM" ),
-        @Mapping(target = "quality", ignore = true)
-    })
+    @Mapping(target = "fish.kind", source = "fish.type")
+    @Mapping(target = "fish.name", constant = "Nemo")
+    @Mapping(target = "ornament", ignore = true )
+    @Mapping(target = "material.materialType", source = "material")
+    @Mapping(target = "material.manufacturer",  constant = "MMM" )
+    @Mapping(target = "quality", ignore = true)
     FishTankDto map(FishTank source);
 
 }
diff --git a/mapstruct-nested-bean-mappings/src/main/java/org/mapstruct/example/mapper/FishTankMapperExpression.java b/mapstruct-nested-bean-mappings/src/main/java/org/mapstruct/example/mapper/FishTankMapperExpression.java
@@ -20,7 +20,6 @@
 
 import org.mapstruct.Mapper;
 import org.mapstruct.Mapping;
-import org.mapstruct.Mappings;
 import org.mapstruct.example.dto.FishTankDto;
 import org.mapstruct.example.model.FishTank;
 import org.mapstruct.factory.Mappers;
@@ -34,14 +33,12 @@ public interface FishTankMapperExpression {
 
     FishTankMapperExpression INSTANCE = Mappers.getMapper( FishTankMapperExpression.class );
 
-    @Mappings({
-        @Mapping(target = "fish.kind", source = "fish.type"),
-        @Mapping(target = "fish.name", expression = "java(\"Jaws\")"),
-        @Mapping(target = "plant", ignore = true ),
-        @Mapping(target = "ornament", ignore = true ),
-        @Mapping(target = "material", ignore = true),
-        @Mapping(target = "quality.report.organisation.name", expression = "java(\"Dunno\")" )
-    })
+    @Mapping(target = "fish.kind", source = "fish.type")
+    @Mapping(target = "fish.name", expression = "java(\"Jaws\")")
+    @Mapping(target = "plant", ignore = true )
+    @Mapping(target = "ornament", ignore = true )
+    @Mapping(target = "material", ignore = true)
+    @Mapping(target = "quality.report.organisation.name", expression = "java(\"Dunno\")" )
     FishTankDto map(FishTank source);
 
 }
diff --git a/mapstruct-nested-bean-mappings/src/main/java/org/mapstruct/example/mapper/FishTankMapperWithDocument.java b/mapstruct-nested-bean-mappings/src/main/java/org/mapstruct/example/mapper/FishTankMapperWithDocument.java
@@ -20,7 +20,6 @@
 
 import org.mapstruct.Mapper;
 import org.mapstruct.Mapping;
-import org.mapstruct.Mappings;
 import org.mapstruct.example.dto.FishTankWithNestedDocumentDto;
 import org.mapstruct.example.model.FishTank;
 import org.mapstruct.factory.Mappers;
@@ -34,15 +33,13 @@ public interface FishTankMapperWithDocument {
 
     FishTankMapperWithDocument INSTANCE = Mappers.getMapper( FishTankMapperWithDocument.class );
 
-    @Mappings({
-        @Mapping(target = "fish.kind", source = "fish.type"),
-        @Mapping(target = "fish.name", expression = "java(\"Jaws\")"),
-        @Mapping(target = "plant", ignore = true ),
-        @Mapping(target = "ornament", ignore = true ),
-        @Mapping(target = "material", ignore = true),
-        @Mapping(target = "quality.document", source = "quality.report"),
-        @Mapping(target = "quality.document.organisation.name", constant = "NoIdeaInc" )
-    })
+    @Mapping(target = "fish.kind", source = "fish.type")
+    @Mapping(target = "fish.name", expression = "java(\"Jaws\")")
+    @Mapping(target = "plant", ignore = true )
+    @Mapping(target = "ornament", ignore = true )
+    @Mapping(target = "material", ignore = true)
+    @Mapping(target = "quality.document", source = "quality.report")
+    @Mapping(target = "quality.document.organisation.name", constant = "NoIdeaInc" )
     FishTankWithNestedDocumentDto map(FishTank source);
 
 }
diff --git a/mapstruct-on-ant/build.xml b/mapstruct-on-ant/build.xml
@@ -30,7 +30,7 @@
 
     <path id="main.classpath">
         <fileset dir="${lib.dir}">
-            <include name="org/mapstruct/mapstruct-jdk8/${mapstruct.version}/mapstruct-jdk8-${mapstruct.version}.jar" />
+            <include name="org/mapstruct/mapstruct/${mapstruct.version}/mapstruct-${mapstruct.version}.jar" />
         </fileset>
     </path>
 
@@ -47,7 +47,7 @@
             <include name="org/easytesting/fest-assert/1.4/fest-assert-1.4.jar" />
             <include name="org/easytesting/fest-util/1.1.6/fest-util-1.1.6.jar" />
             <include name="org/hamcrest/hamcrest-core/1.3/hamcrest-core-1.3.jar" />
-            <include name="org/mapstruct/mapstruct-jdk8/${mapstruct.version}/mapstruct-jdk8-${mapstruct.version}.jar" />
+            <include name="org/mapstruct/mapstruct/${mapstruct.version}/mapstruct-${mapstruct.version}.jar" />
         </fileset>
         <pathelement location="${classes.dir}" />
         <pathelement location="${test.classes.dir}" />
diff --git a/mapstruct-on-gradle/build.gradle b/mapstruct-on-gradle/build.gradle
@@ -19,7 +19,7 @@ ext {
 sourceCompatibility = JavaVersion.VERSION_1_8
 
 dependencies {
-    compile "org.mapstruct:mapstruct-jdk8:${mapstructVersion}"
+    compile "org.mapstruct:mapstruct:${mapstructVersion}"
     testCompile 'org.testng:testng:6.10', 'org.easytesting:fest-assert:1.4'
     apt "org.mapstruct:mapstruct-processor:${mapstructVersion}"
 }
diff --git a/mapstruct-protobuf3/pom.xml b/mapstruct-protobuf3/pom.xml
@@ -46,7 +46,7 @@
         <dependencies>
             <dependency>
                 <groupId>org.mapstruct</groupId>
-                <artifactId>mapstruct-jdk8</artifactId>
+                <artifactId>mapstruct</artifactId>
                 <version>${org.mapstruct.version}</version>
             </dependency>
 
diff --git a/mapstruct-protobuf3/usage/pom.xml b/mapstruct-protobuf3/usage/pom.xml
@@ -35,7 +35,7 @@
     <dependencies>
         <dependency>
             <groupId>org.mapstruct</groupId>
-            <artifactId>mapstruct-jdk8</artifactId>
+            <artifactId>mapstruct</artifactId>
         </dependency>
         <dependency>
             <groupId>com.google.protobuf</groupId>
diff --git a/mapstruct-rounding/src/main/java/org/mapstruct/example/mapper/SourceTargetMapper.java b/mapstruct-rounding/src/main/java/org/mapstruct/example/mapper/SourceTargetMapper.java
@@ -21,7 +21,6 @@
 
 import org.mapstruct.Mapper;
 import org.mapstruct.Mapping;
-import org.mapstruct.Mappings;
 import org.mapstruct.example.dto.Source;
 import org.mapstruct.example.dto.Target;
 import org.mapstruct.example.mapper.util.RoundingUtil;
@@ -35,10 +34,8 @@ public interface SourceTargetMapper {
 
     SourceTargetMapper MAPPER = Mappers.getMapper( SourceTargetMapper.class );
 
-    @Mappings( {
-        @Mapping( target = "bd2", qualifiedBy = Fraction2.class ),
-        @Mapping( target = "bd3", qualifiedBy = Fraction3.class ),
-        @Mapping( target = "bdUnConstrained" )
-    } )
+    @Mapping( target = "bd2", qualifiedBy = Fraction2.class )
+    @Mapping( target = "bd3", qualifiedBy = Fraction3.class )
+    @Mapping( target = "bdUnConstrained" )
     Target toTarget( Source s );
 }
diff --git a/mapstruct-spi-accessor-naming/pom.xml b/mapstruct-spi-accessor-naming/pom.xml
diff --git a/mapstruct-spi-accessor-naming/usage/pom.xml b/mapstruct-spi-accessor-naming/usage/pom.xml
diff --git a/mapstruct-updatemethods-1/src/main/java/org/mapstruct/example/mapper/SourceTargetMapper.java b/mapstruct-updatemethods-1/src/main/java/org/mapstruct/example/mapper/SourceTargetMapper.java
diff --git a/mapstruct-updatemethods-1/src/test/java/org/mapstruct/example/mapper/SourceTargetTestMapper.java b/mapstruct-updatemethods-1/src/test/java/org/mapstruct/example/mapper/SourceTargetTestMapper.java

Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,7 @@ ext {`
`20`	`20`	`sourceCompatibility = JavaVersion.VERSION_1_8`
`21`	`21`
`22`	`22`	`dependencies {`
`23`		`- compile "org.mapstruct:mapstruct-jdk8:${mapstructVersion}", "org.projectlombok:lombok:${lombokVersion}"`
	`23`	`+ compile "org.mapstruct:mapstruct:${mapstructVersion}", "org.projectlombok:lombok:${lombokVersion}"`
`24`	`24`	`testCompile 'junit:junit:4.12'`
`25`	`25`	`apt "org.mapstruct:mapstruct-processor:${mapstructVersion}", "org.projectlombok:lombok:${lombokVersion}"`
`26`	`26`	`}`