Skip to content

Commit 5b5290e

Browse files
lor6lor6
authored
Merge pull request #18776 from maenolis/mapstruct-new-module
Mapstruct new module
2 parents afbbf0b + 16a751c commit 5b5290e

File tree

14 files changed

+95
-13
lines changed

14 files changed

+95
-13
lines changed

‎mapstruct-2/pom.xml

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -26,18 +26,6 @@
2626
<version>${lombok.version}</version>
2727
<scope>provided</scope>
2828
</dependency>
29-
<dependency>
30-
<groupId>org.springframework</groupId>
31-
<artifactId>spring-context</artifactId>
32-
<version>${springframework.version}</version>
33-
<scope>test</scope>
34-
</dependency>
35-
<dependency>
36-
<groupId>org.springframework</groupId>
37-
<artifactId>spring-test</artifactId>
38-
<version>${springframework.version}</version>
39-
<scope>test</scope>
40-
</dependency>
4129
</dependencies>
4230

4331
<build>
@@ -74,7 +62,6 @@
7462
<properties>
7563
<org.mapstruct.version>1.6.3</org.mapstruct.version>
7664
<lombok.mapstruct.binding.version>0.2.0</lombok.mapstruct.binding.version>
77-
<springframework.version>6.2.1</springframework.version>
7865
</properties>
7966

8067
</project>

‎mapstruct-3/pom.xml

Lines changed: 80 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,80 @@
1+
<?xml version="1.0"?>
2+
<project xmlns="http://maven.apache.org/POM/4.0.0"
3+
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
4+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
5+
<modelVersion>4.0.0</modelVersion>
6+
<artifactId>mapstruct-3</artifactId>
7+
<version>1.0</version>
8+
<packaging>jar</packaging>
9+
<name>mapstruct-3</name>
10+
11+
<parent>
12+
<groupId>com.baeldung</groupId>
13+
<artifactId>parent-modules</artifactId>
14+
<version>1.0.0-SNAPSHOT</version>
15+
</parent>
16+
17+
<dependencies>
18+
<dependency>
19+
<groupId>org.mapstruct</groupId>
20+
<artifactId>mapstruct</artifactId>
21+
<version>${org.mapstruct.version}</version>
22+
</dependency>
23+
<dependency>
24+
<groupId>org.projectlombok</groupId>
25+
<artifactId>lombok</artifactId>
26+
<version>${lombok.version}</version>
27+
<scope>provided</scope>
28+
</dependency>
29+
<dependency>
30+
<groupId>org.springframework</groupId>
31+
<artifactId>spring-context</artifactId>
32+
<version>${springframework.version}</version>
33+
<scope>test</scope>
34+
</dependency>
35+
<dependency>
36+
<groupId>org.springframework</groupId>
37+
<artifactId>spring-test</artifactId>
38+
<version>${springframework.version}</version>
39+
<scope>test</scope>
40+
</dependency>
41+
</dependencies>
42+
43+
<build>
44+
<finalName>mapstruct-3</finalName>
45+
<plugins>
46+
<plugin>
47+
<groupId>org.apache.maven.plugins</groupId>
48+
<artifactId>maven-compiler-plugin</artifactId>
49+
<configuration>
50+
<annotationProcessorPaths>
51+
<path>
52+
<groupId>org.mapstruct</groupId>
53+
<artifactId>mapstruct-processor</artifactId>
54+
<version>${org.mapstruct.version}</version>
55+
</path>
56+
<path>
57+
<groupId>org.projectlombok</groupId>
58+
<artifactId>lombok</artifactId>
59+
<version>${lombok.version}</version>
60+
</path>
61+
<path>
62+
<groupId>org.projectlombok</groupId>
63+
<artifactId>lombok-mapstruct-binding</artifactId>
64+
<version>${lombok.mapstruct.binding.version}</version>
65+
</path>
66+
</annotationProcessorPaths>
67+
<source>17</source>
68+
<target>17</target>
69+
</configuration>
70+
</plugin>
71+
</plugins>
72+
</build>
73+
74+
<properties>
75+
<org.mapstruct.version>1.6.3</org.mapstruct.version>
76+
<lombok.mapstruct.binding.version>0.2.0</lombok.mapstruct.binding.version>
77+
<springframework.version>6.2.1</springframework.version>
78+
</properties>
79+
80+
</project>

‎mapstruct-2/src/main/java/com/baeldung/dto/MediaDto.java renamed to ‎mapstruct-3/src/main/java/com/baeldung/dto/MediaDto.java

File renamed without changes.

‎mapstruct-2/src/main/java/com/baeldung/entity/Media.java renamed to ‎mapstruct-3/src/main/java/com/baeldung/entity/Media.java

File renamed without changes.

‎mapstruct-2/src/main/java/com/baeldung/mapper/MediaMapper.java renamed to ‎mapstruct-3/src/main/java/com/baeldung/mapper/MediaMapper.java

File renamed without changes.

‎mapstruct-2/src/main/java/com/baeldung/service/MediaService.java renamed to ‎mapstruct-3/src/main/java/com/baeldung/service/MediaService.java

File renamed without changes.

‎mapstruct-3/src/main/resources/logback.xml

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<configuration>
3+
<appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
4+
<encoder>
5+
<pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n
6+
</pattern>
7+
</encoder>
8+
</appender>
9+
10+
<root level="INFO">
11+
<appender-ref ref="STDOUT" />
12+
</root>
13+
</configuration>

‎mapstruct-2/src/test/java/com/baeldung/service/MediaServiceGeneratedMapperUnitTest.java renamed to ‎mapstruct-3/src/test/java/com/baeldung/service/MediaServiceGeneratedMapperUnitTest.java

File renamed without changes.

‎mapstruct-2/src/test/java/com/baeldung/service/MediaServiceMockedMapperUnitTest.java renamed to ‎mapstruct-3/src/test/java/com/baeldung/service/MediaServiceMockedMapperUnitTest.java

File renamed without changes.

‎mapstruct-2/src/test/java/com/baeldung/spring/Config.java renamed to ‎mapstruct-3/src/test/java/com/baeldung/spring/Config.java

File renamed without changes.

0 commit comments

Comments
 (0)