hendrik/indu-reboot
1
0
Fork 0
mirror of https://github.com/HWienhold/indu-reboot.git synced 2026-02-07 00:07:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

fixed mapstruct <-> lombock; use own exception library

Browse Source
This commit is contained in:
HWienhold 2023-08-01 21:46:58 +02:00
parent 7c23c20b90
commit 894f6bf409
9 changed files with 52 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
site-service/pom.xml
View File

@ -43,5 +43,10 @@
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-actuator</artifactId>
</dependency>
<dependency>
<groupId>com.indu</groupId>
<artifactId>exception-service</artifactId>
<version>0.0.1-SNAPSHOT</version>
</dependency>
</dependencies>
</project>

4
site-service/src/main/java/com/indu/siteservice/exceptions/SiteCodeIdConflictException.java
View File

@ -1,6 +1,8 @@
package com.indu.siteservice.exceptions;
public class SiteCodeIdConflictException extends RuntimeException{
import com.indu.exceptionservice.exception.GeneralCustomException;
public class SiteCodeIdConflictException extends GeneralCustomException{
/**
*

4
site-service/src/main/java/com/indu/siteservice/exceptions/SiteDuplicateException.java
View File

@ -1,6 +1,8 @@
package com.indu.siteservice.exceptions;
public class SiteDuplicateException extends RuntimeException{
import com.indu.exceptionservice.exception.ConflictException;
public class SiteDuplicateException extends ConflictException {
/**
*

28
site-service/src/main/java/com/indu/siteservice/exceptions/SiteExceptionHandler.java
View File

@ -1,27 +1,17 @@
package com.indu.siteservice.exceptions;
import java.util.Date;
import org.springframework.http.HttpHeaders;
import org.springframework.http.HttpStatus;
import org.springframework.http.ResponseEntity;
import org.springframework.web.bind.annotation.ControllerAdvice;
import org.springframework.web.bind.annotation.ExceptionHandler;
import org.springframework.web.context.request.WebRequest;
import org.springframework.web.servlet.mvc.method.annotation.ResponseEntityExceptionHandler;
import com.indu.siteservice.model.ErrorMessage;
@ControllerAdvice
//@ControllerAdvice
public class SiteExceptionHandler extends ResponseEntityExceptionHandler {
@ExceptionHandler(value= {SiteDuplicateException.class, SiteCodeIdConflictException.class, SiteNotFoundException.class} )
public ResponseEntity<Object> handleSiteDuplicateException(Exception ex, WebRequest request) {
String errorMessage = ex.getLocalizedMessage();
if ( errorMessage == null) {
errorMessage = ex.toString();
}
return new ResponseEntity<>(new ErrorMessage(new Date(), errorMessage), new HttpHeaders(), HttpStatus.CONFLICT);
}
// @ExceptionHandler(value= {SiteDuplicateException.class, SiteCodeIdConflictException.class, SiteNotFoundException.class} )
// public ResponseEntity<Object> handleSiteDuplicateException(Exception ex, WebRequest request) {
// String errorMessage = ex.getLocalizedMessage();
// if ( errorMessage == null) {
// errorMessage = ex.toString();
// }
// return new ResponseEntity<>(new ErrorMessage(new Date(), errorMessage), new HttpHeaders(), HttpStatus.CONFLICT);
// }
}

4
site-service/src/main/java/com/indu/siteservice/exceptions/SiteNotFoundException.java
View File

@ -1,6 +1,8 @@
package com.indu.siteservice.exceptions;
public class SiteNotFoundException extends RuntimeException{
import com.indu.exceptionservice.exception.GeneralCustomException;
public class SiteNotFoundException extends GeneralCustomException{
/**
*

2
site-service/src/main/java/com/indu/siteservice/repository/SeqRepository.java
View File

@ -3,9 +3,11 @@ package com.indu.siteservice.repository;
import java.util.List;
import org.springframework.data.mongodb.repository.MongoRepository;
import org.springframework.stereotype.Repository;
import com.indu.siteservice.model.Sequence;
@Repository
public interface SeqRepository extends MongoRepository<Sequence, String>{
default public int getNextSequence() {

2
site-service/src/main/java/com/indu/siteservice/repository/SiteRepository.java
View File

@ -3,9 +3,11 @@ package com.indu.siteservice.repository;
import java.util.List;
import org.springframework.data.mongodb.repository.MongoRepository;
import org.springframework.stereotype.Repository;
import com.indu.siteservice.model.Site;
@Repository
public interface SiteRepository extends MongoRepository<Site, String>{
List<Site> findByCode(String code);
}

27
task-service/pom.xml
View File

@ -23,11 +23,7 @@
<artifactId>spring-boot-starter-web</artifactId>
</dependency>
<dependency>
<groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-test</artifactId>
@ -51,23 +47,10 @@
<artifactId>mapstruct</artifactId>
<version>${org.mapstruct.version}</version>
</dependency>
<dependency>
<groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId>
</dependency>
</dependencies>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
<annotationProcessorPaths>
<path>
<groupId>org.mapstruct</groupId>
<artifactId>mapstruct-processor</artifactId>
<version>${org.mapstruct.version}</version>
</path>
</annotationProcessorPaths>
</configuration>
</plugin>
</plugins>
</build>
</project>

31
task-template-service/pom.xml
View File

@ -1,14 +1,16 @@
<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 https://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>com.indu</groupId>
<artifactId>indu-flow-parent</artifactId>
<version>0.0.1-SNAPSHOT</version>
</parent>
<artifactId>task-template-service</artifactId>
<name>task-service-template</name>
<description>Task Template Service</description>
<dependencies>
<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 https://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>com.indu</groupId>
<artifactId>indu-flow-parent</artifactId>
<version>0.0.1-SNAPSHOT</version>
</parent>
<artifactId>task-template-service</artifactId>
<name>task-service-template</name>
<description>Task Template Service</description>
<dependencies>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-data-mongodb</artifactId>
@ -46,5 +48,12 @@
<artifactId>mapstruct</artifactId>
<version>${org.mapstruct.version}</version>
</dependency>
<dependency>
<groupId>com.indu</groupId>
<artifactId>exception-service</artifactId>
<version>0.0.1-SNAPSHOT</version>
</dependency>
</dependencies>
</project>