Skip to content

Commit 2440ec8

Browse files
committed
fixiing failed IT
1 parent 711ba08 commit 2440ec8

File tree

11 files changed

+34
-30
lines changed

11 files changed

+34
-30
lines changed

pom.xml

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -22,49 +22,45 @@
2222
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
2323
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
2424
<java.version>1.8</java.version>
25+
<org.mapstruct.version>1.2.0.CR2</org.mapstruct.version>
2526
</properties>
2627

2728
<dependencies>
2829
<dependency>
2930
<groupId>org.springframework.boot</groupId>
30-
<artifactId>spring-boot-starter-data-jpa</artifactId>
31+
<artifactId>spring-boot-starter-web</artifactId>
3132
</dependency>
3233
<dependency>
3334
<groupId>org.springframework.boot</groupId>
34-
<artifactId>spring-boot-starter-web</artifactId>
35+
<artifactId>spring-boot-starter-data-jpa</artifactId>
3536
</dependency>
3637
<dependency>
3738
<groupId>org.springframework.boot</groupId>
3839
<artifactId>spring-boot-devtools</artifactId>
3940
<scope>runtime</scope>
4041
</dependency>
41-
<dependency>
42-
<groupId>org.projectlombok</groupId>
43-
<artifactId>lombok</artifactId>
44-
<version>1.16.20</version>
45-
</dependency>
4642
<dependency>
4743
<groupId>com.h2database</groupId>
4844
<artifactId>h2</artifactId>
4945
<scope>runtime</scope>
5046
</dependency>
5147
<dependency>
52-
<groupId>org.springframework.boot</groupId>
53-
<artifactId>spring-boot-starter-test</artifactId>
54-
<scope>test</scope>
48+
<groupId>org.projectlombok</groupId>
49+
<artifactId>lombok</artifactId>
50+
<scope>provided</scope>
5551
</dependency>
5652
<dependency>
5753
<groupId>org.mapstruct</groupId>
5854
<artifactId>mapstruct-jdk8</artifactId>
59-
<version>1.2.0.Final</version>
55+
<version>${org.mapstruct.version}</version>
6056
</dependency>
6157
<dependency>
62-
<groupId>org.xmlunit</groupId>
63-
<artifactId>xmlunit-core</artifactId>
58+
<groupId>org.springframework.boot</groupId>
59+
<artifactId>spring-boot-starter-test</artifactId>
60+
<scope>test</scope>
6461
</dependency>
6562
</dependencies>
6663

67-
6864
<build>
6965
<plugins>
7066
<plugin>
@@ -80,7 +76,7 @@
8076
<format>html</format>
8177
<format>xml</format>
8278
</formats>
83-
<check />
79+
<check/>
8480
</configuration>
8581
</plugin>
8682
<plugin>
@@ -99,18 +95,19 @@
9995
<path>
10096
<groupId>org.mapstruct</groupId>
10197
<artifactId>mapstruct-processor</artifactId>
102-
<version>1.2.0.Final</version>
98+
<version>${org.mapstruct.version}</version>
10399
</path>
104100
</annotationProcessorPaths>
105101
<compilerArgs>
106102
<compilerArg>
107-
-Amapstruct.defaultComponentModel=spring
103+
-Amapstruct.defaultComponentModel=spring
108104
</compilerArg>
109105
</compilerArgs>
110106
</configuration>
111107
</plugin>
112108
</plugins>
113109
</build>
110+
114111
<repositories>
115112
<repository>
116113
<id>spring-snapshots</id>
@@ -129,6 +126,7 @@
129126
</snapshots>
130127
</repository>
131128
</repositories>
129+
132130
<pluginRepositories>
133131
<pluginRepository>
134132
<id>spring-snapshots</id>
@@ -147,4 +145,6 @@
147145
</snapshots>
148146
</pluginRepository>
149147
</pluginRepositories>
150-
</project>
148+
149+
150+
</project>

src/main/java/com/dev/springrestdemo/api/v1/mapper/CategoryMapper.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
package com.dev.springrestdemo.api.v1.mapper;
22

3-
import com.dev.springrestdemo.api.v1.modle.CategoryDTO;
3+
import com.dev.springrestdemo.api.v1.model.CategoryDTO;
44
import com.dev.springrestdemo.domain.Category;
55
import org.mapstruct.Mapper;
66
import org.mapstruct.factory.Mappers;
77

88
/**
99
* @author Kevin Neag
1010
*/
11-
@Mapper
11+
@Mapper(componentModel = "spring")
1212
public interface CategoryMapper {
1313

1414

src/main/java/com/dev/springrestdemo/api/v1/modle/CategoryDTO.java renamed to src/main/java/com/dev/springrestdemo/api/v1/model/CategoryDTO.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.dev.springrestdemo.api.v1.modle;
1+
package com.dev.springrestdemo.api.v1.model;
22

33
import lombok.Data;
44

src/main/java/com/dev/springrestdemo/api/v1/modle/CategoryListDTO.java renamed to src/main/java/com/dev/springrestdemo/api/v1/model/CategoryListDTO.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.dev.springrestdemo.api.v1.modle;
1+
package com.dev.springrestdemo.api.v1.model;
22

33
import lombok.AllArgsConstructor;
44
import lombok.Data;

src/main/java/com/dev/springrestdemo/controllers/v1/CategoryController.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
package com.dev.springrestdemo.controllers.v1;
22

33

4-
import com.dev.springrestdemo.api.v1.modle.CategoryDTO;
5-
import com.dev.springrestdemo.api.v1.modle.CategoryListDTO;
4+
import com.dev.springrestdemo.api.v1.model.CategoryDTO;
5+
import com.dev.springrestdemo.api.v1.model.CategoryListDTO;
66
import com.dev.springrestdemo.service.CategoryService;
77
import org.springframework.http.HttpStatus;
88
import org.springframework.http.ResponseEntity;

src/main/java/com/dev/springrestdemo/service/CategoryService.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package com.dev.springrestdemo.service;
22

3-
import com.dev.springrestdemo.api.v1.modle.CategoryDTO;
3+
import com.dev.springrestdemo.api.v1.model.CategoryDTO;
44

55
import java.util.List;
66

src/main/java/com/dev/springrestdemo/service/CategoryServiceImpl.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package com.dev.springrestdemo.service;
22

33
import com.dev.springrestdemo.api.v1.mapper.CategoryMapper;
4-
import com.dev.springrestdemo.api.v1.modle.CategoryDTO;
4+
import com.dev.springrestdemo.api.v1.model.CategoryDTO;
55
import com.dev.springrestdemo.reposiotry.CategoryRepository;
66
import org.springframework.stereotype.Service;
77

src/test/java/com/dev/springrestdemo/SpringRestDemoApplicationTests.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
import org.junit.Test;
44
import org.junit.runner.RunWith;
55
import org.springframework.boot.test.context.SpringBootTest;
6+
import org.springframework.test.context.ContextConfiguration;
67
import org.springframework.test.context.junit4.SpringRunner;
78

89
@RunWith(SpringRunner.class)

src/test/java/com/dev/springrestdemo/api/v1/mapper/CatergoryMapperTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package com.dev.springrestdemo.api.v1.mapper;
22

3-
import com.dev.springrestdemo.api.v1.modle.CategoryDTO;
3+
import com.dev.springrestdemo.api.v1.model.CategoryDTO;
44
import com.dev.springrestdemo.domain.Category;
55
import org.junit.Test;
66

src/test/java/com/dev/springrestdemo/controller/CategoryControllerTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package com.dev.springrestdemo.controller;
22

3-
import com.dev.springrestdemo.api.v1.modle.CategoryDTO;
3+
import com.dev.springrestdemo.api.v1.model.CategoryDTO;
44
import com.dev.springrestdemo.controllers.v1.CategoryController;
55
import com.dev.springrestdemo.service.CategoryService;
66
import org.junit.Before;

0 commit comments

Comments
 (0)