Skip to content

Commit 91605d4

Browse files
alvin577austriaalvin577austria
authored
Merge pull request #876 from panos-kakos/JAVA-32737
[JAVA-32737] Moved mapstruct related code from spring-boot-kotlin-2 t…
2 parents 954be11 + 55f480c commit 91605d4

File tree

19 files changed

+57
-47
lines changed

19 files changed

+57
-47
lines changed

‎kotlin-libraries-data/README.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,3 +3,4 @@
33
This module contains articles about data manipulation libraries topics in Kotlin.
44
- [An Introduction to kotlinx-serialization Project](https://www.baeldung.com/kotlin/kotlinx-serialization-project)
55
- [Class Inheritance with Kotlinx Serialization](https://www.baeldung.com/kotlin/kotlinx-serialization-inheritance)
6+
- [Mapstruct With Kotlin’s Data Classes](https://www.baeldung.com/kotlin/mapstruct-data-classes)

‎kotlin-libraries-data/pom.xml

Lines changed: 54 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,15 +19,67 @@
1919
<dependency>
2020
<groupId>org.jetbrains.kotlinx</groupId>
2121
<artifactId>kotlinx-serialization-json-jvm</artifactId>
22-
<version>1.6.0</version>
22+
<version>${kotlinx-serialization-json-jvm.version}</version>
2323
<scope>test</scope>
2424
</dependency>
2525
<dependency>
2626
<groupId>org.jetbrains.kotlinx</groupId>
2727
<artifactId>kotlinx-datetime-jvm</artifactId>
28-
<version>0.4.0</version>
28+
<version>${kotlinx-datetime-jvm.version}</version>
2929
<scope>test</scope>
3030
</dependency>
31+
<dependency>
32+
<groupId>org.mapstruct</groupId>
33+
<artifactId>mapstruct</artifactId>
34+
<version>${mapstruct.version}</version>
35+
</dependency>
3136
</dependencies>
37+
<build>
38+
<sourceDirectory>src/main/kotlin</sourceDirectory>
39+
<testSourceDirectory>src/test/kotlin</testSourceDirectory>
40+
<plugins>
41+
<plugin>
42+
<artifactId>kotlin-maven-plugin</artifactId>
43+
<groupId>org.jetbrains.kotlin</groupId>
44+
<version>${kotlin.version}</version>
45+
<dependencies>
46+
<dependency>
47+
<groupId>org.mapstruct</groupId>
48+
<artifactId>mapstruct-processor</artifactId>
49+
<version>${mapstruct.version}</version>
50+
</dependency>
51+
</dependencies>
52+
<executions>
53+
<execution>
54+
<id>kapt</id>
55+
<goals>
56+
<goal>kapt</goal>
57+
</goals>
58+
<configuration>
59+
<sourceDirs>
60+
<sourceDir>src/main/kotlin</sourceDir>
61+
</sourceDirs>
62+
<annotationProcessorPaths>
63+
<annotationProcessorPath>
64+
<groupId>org.mapstruct</groupId>
65+
<artifactId>mapstruct-processor</artifactId>
66+
<version>${mapstruct.version}</version>
67+
</annotationProcessorPath>
68+
</annotationProcessorPaths>
69+
</configuration>
70+
</execution>
71+
</executions>
72+
</plugin>
73+
</plugins>
74+
</build>
75+
76+
77+
<properties>
78+
<kotlinx-serialization-json-jvm.version>1.6.0</kotlinx-serialization-json-jvm.version>
79+
<kotlinx-datetime-jvm.version>0.4.0</kotlinx-datetime-jvm.version>
80+
<mapstruct.version>1.5.3.Final</mapstruct.version>
81+
</properties>
82+
83+
3284

3385
</project>

‎spring-boot-kotlin-2/src/main/kotlin/com/baeldung/mapstruct/dto/AddressDto.kt renamed to ‎kotlin-libraries-data/src/main/kotlin/com/baeldung/mapstruct/dto/AddressDto.kt

File renamed without changes.

‎spring-boot-kotlin-2/src/main/kotlin/com/baeldung/mapstruct/dto/UserDto.kt renamed to ‎kotlin-libraries-data/src/main/kotlin/com/baeldung/mapstruct/dto/UserDto.kt

File renamed without changes.

‎spring-boot-kotlin-2/src/main/kotlin/com/baeldung/mapstruct/entity/Address.kt renamed to ‎kotlin-libraries-data/src/main/kotlin/com/baeldung/mapstruct/entity/Address.kt

File renamed without changes.

‎spring-boot-kotlin-2/src/main/kotlin/com/baeldung/mapstruct/entity/User.kt renamed to ‎kotlin-libraries-data/src/main/kotlin/com/baeldung/mapstruct/entity/User.kt

File renamed without changes.

‎spring-boot-kotlin-2/src/main/kotlin/com/baeldung/mapstruct/mapper/UserMapper.kt renamed to ‎kotlin-libraries-data/src/main/kotlin/com/baeldung/mapstruct/mapper/UserMapper.kt

File renamed without changes.

‎spring-boot-kotlin-2/src/main/kotlin/com/baeldung/mapstruct/mapper/custom/AbstractMapper.kt renamed to ‎kotlin-libraries-data/src/main/kotlin/com/baeldung/mapstruct/mapper/custom/AbstractMapper.kt

File renamed without changes.

‎spring-boot-kotlin-2/src/main/kotlin/com/baeldung/mapstruct/mapper/custom/BeforeAndAfterMappingUserMapper.kt renamed to ‎kotlin-libraries-data/src/main/kotlin/com/baeldung/mapstruct/mapper/custom/BeforeAndAfterMappingUserMapper.kt

File renamed without changes.

‎spring-boot-kotlin-2/src/main/kotlin/com/baeldung/mapstruct/mapper/custom/DecoratedMapper.kt renamed to ‎kotlin-libraries-data/src/main/kotlin/com/baeldung/mapstruct/mapper/custom/DecoratedMapper.kt

File renamed without changes.

0 commit comments

Comments
 (0)