Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions API-Gateway/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
<version>2.7.14</version>
<version>3.3.13</version>
<relativePath/> <!-- lookup parent from repository -->
</parent>
<groupId>org.training</groupId>
Expand All @@ -15,7 +15,7 @@
<description>API Gateway</description>
<properties>
<java.version>17</java.version>
<spring-cloud.version>2021.0.8</spring-cloud.version>
<spring-cloud.version>2023.0.6</spring-cloud.version>
<sonar.organization>samfert-codeium</sonar.organization>
</properties>
<dependencies>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,8 @@

import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication;
import org.springframework.cloud.netflix.eureka.EnableEurekaClient;

@SpringBootApplication
@EnableEurekaClient
public class ApiGatewayApplication {

public static void main(String[] args) {
Expand Down
9 changes: 7 additions & 2 deletions Account-Service/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
<version>2.7.15</version>
<version>3.3.13</version>
<relativePath/> <!-- lookup parent from repository -->
</parent>
<groupId>org.training</groupId>
Expand All @@ -15,7 +15,7 @@
<description>Account Service</description>
<properties>
<java.version>17</java.version>
<spring-cloud.version>2021.0.8</spring-cloud.version>
<spring-cloud.version>2023.0.6</spring-cloud.version>
<sonar.organization>samfert-codeium</sonar.organization>
</properties>
<dependencies>
Expand Down Expand Up @@ -43,6 +43,11 @@
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-starter-openfeign</artifactId>
</dependency>
<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
<version>2.15.1</version>
</dependency>

<dependency>
<groupId>org.springframework.boot</groupId>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
import org.springframework.beans.factory.annotation.Value;
import org.springframework.http.HttpHeaders;
import org.springframework.http.HttpStatus;
import org.springframework.http.HttpStatusCode;
import org.springframework.http.ResponseEntity;
import org.springframework.web.bind.MethodArgumentNotValidException;
import org.springframework.web.bind.annotation.ExceptionHandler;
Expand All @@ -27,13 +28,13 @@ public class GlobalExceptionHandler extends ResponseEntityExceptionHandler {
*
* @param ex The MethodArgumentNotValidException that occurred.
* @param headers The HttpHeaders of the response.
* @param status The HttpStatus of the response.
* @param status The HttpStatusCode of the response.
* @param request The WebRequest of the response.
* @return A ResponseEntity with an ErrorResponse and HttpStatus.BAD_REQUEST.
*/
@Override
public ResponseEntity<Object> handleMethodArgumentNotValid(
MethodArgumentNotValidException ex, HttpHeaders headers, HttpStatus status, WebRequest request) {
MethodArgumentNotValidException ex, HttpHeaders headers, HttpStatusCode status, WebRequest request) {

return new ResponseEntity<>(new ErrorResponse(badRequest, ex.getLocalizedMessage()), HttpStatus.BAD_REQUEST);
}
Expand All @@ -53,4 +54,4 @@ public ResponseEntity<Object> handleGlobalException(GlobalException globalExcept
.message(globalException.getErrorMessage())
.build());
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
import org.training.account.service.model.AccountStatus;
import org.training.account.service.model.AccountType;

import javax.persistence.*;
import jakarta.persistence.*;
import java.math.BigDecimal;
import java.time.LocalDate;

Expand Down
9 changes: 7 additions & 2 deletions Fund-Transfer/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
<version>2.7.14</version>
<version>3.3.13</version>
<relativePath/> <!-- lookup parent from repository -->
</parent>
<groupId>org.training</groupId>
Expand All @@ -15,7 +15,7 @@
<description>Fund Transfer</description>
<properties>
<java.version>17</java.version>
<spring-cloud.version>2021.0.8</spring-cloud.version>
<spring-cloud.version>2023.0.6</spring-cloud.version>
<sonar.organization>samfert-codeium</sonar.organization>
</properties>
<dependencies>
Expand Down Expand Up @@ -64,6 +64,11 @@
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-starter-openfeign</artifactId>
</dependency>
<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
<version>2.15.1</version>
</dependency>
</dependencies>
<dependencyManagement>
<dependencies>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
import org.springframework.beans.factory.annotation.Value;
import org.springframework.http.HttpHeaders;
import org.springframework.http.HttpStatus;
import org.springframework.http.HttpStatusCode;
import org.springframework.http.ResponseEntity;
import org.springframework.web.bind.MethodArgumentNotValidException;
import org.springframework.web.bind.annotation.ExceptionHandler;
Expand All @@ -21,12 +22,13 @@ public class GlobalExceptionHandler extends ResponseEntityExceptionHandler {
*
* @param ex The MethodArgumentNotValidException to handle.
* @param headers The HttpHeaders to include in the response.
* @param status The HttpStatus to set in the response.
* @param status The HttpStatusCode to set in the response.
* @param request The WebRequest associated with the request.
* @return A ResponseEntity containing an ErrorResponse and HttpStatus.BAD_REQUEST.
*/
@Override
protected ResponseEntity<Object> handleMethodArgumentNotValid(
MethodArgumentNotValidException ex, HttpHeaders headers, HttpStatus status, WebRequest request) {
MethodArgumentNotValidException ex, HttpHeaders headers, HttpStatusCode status, WebRequest request) {

return new ResponseEntity<>(new ErrorResponse(badRequest, ex.getLocalizedMessage()), HttpStatus.BAD_REQUEST);
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
import org.training.fundtransfer.model.TransactionStatus;
import org.training.fundtransfer.model.TransferType;

import javax.persistence.*;
import jakarta.persistence.*;
import java.math.BigDecimal;
import java.time.LocalDateTime;

Expand Down Expand Up @@ -39,4 +39,4 @@ public class FundTransfer {

@CreationTimestamp
private LocalDateTime transferredOn;
}
}
4 changes: 2 additions & 2 deletions Sequence-Generator/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
<version>2.7.15</version>
<version>3.3.13</version>
<relativePath/> <!-- lookup parent from repository -->
</parent>
<groupId>org.training</groupId>
Expand All @@ -15,7 +15,7 @@
<description>Sequence Generator</description>
<properties>
<java.version>17</java.version>
<spring-cloud.version>2021.0.8</spring-cloud.version>
<spring-cloud.version>2023.0.6</spring-cloud.version>
<sonar.organization>samfert-codeium</sonar.organization>
</properties>
<dependencies>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@
import lombok.Data;
import lombok.NoArgsConstructor;

import javax.persistence.Entity;
import javax.persistence.GeneratedValue;
import javax.persistence.GenerationType;
import javax.persistence.Id;
import jakarta.persistence.Entity;
import jakarta.persistence.GeneratedValue;
import jakarta.persistence.GenerationType;
import jakarta.persistence.Id;

@Entity
@Data
Expand Down
4 changes: 2 additions & 2 deletions Service-Registry/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
<version>2.7.14</version>
<version>3.3.13</version>
<relativePath/> <!-- lookup parent from repository -->
</parent>
<groupId>org.training</groupId>
Expand All @@ -15,7 +15,7 @@
<description>Service Registry</description>
<properties>
<java.version>17</java.version>
<spring-cloud.version>2021.0.8</spring-cloud.version>
<spring-cloud.version>2023.0.6</spring-cloud.version>
<sonar.organization>samfert-codeium</sonar.organization>
</properties>
<dependencies>
Expand Down
9 changes: 7 additions & 2 deletions Transaction-Service/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
<version>2.7.15</version>
<version>3.3.13</version>
<relativePath/> <!-- lookup parent from repository -->
</parent>
<groupId>org.training</groupId>
Expand All @@ -15,7 +15,7 @@
<description>Transaction Service</description>
<properties>
<java.version>17</java.version>
<spring-cloud.version>2021.0.8</spring-cloud.version>
<spring-cloud.version>2023.0.6</spring-cloud.version>
<sonar.organization>samfert-codeium</sonar.organization>
</properties>
<dependencies>
Expand Down Expand Up @@ -43,6 +43,11 @@
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-starter-openfeign</artifactId>
</dependency>
<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
<version>2.15.1</version>
</dependency>

<dependency>
<groupId>org.springframework.boot</groupId>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,10 @@

import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication;
import org.springframework.cloud.netflix.eureka.EnableEurekaClient;
import org.springframework.cloud.openfeign.EnableFeignClients;

@SpringBootApplication
@EnableFeignClients
@EnableEurekaClient
public class TransactionServiceApplication {

public static void main(String[] args) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
import org.training.transactions.model.TransactionStatus;
import org.training.transactions.model.TransactionType;

import javax.persistence.*;
import jakarta.persistence.*;
import java.math.BigDecimal;
import java.time.LocalDateTime;

Expand Down
4 changes: 2 additions & 2 deletions User-Service/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
<version>2.7.14</version>
<version>3.3.13</version>
<relativePath/> <!-- lookup parent from repository -->
</parent>
<groupId>org.training</groupId>
Expand All @@ -15,7 +15,7 @@
<description>User Service</description>
<properties>
<java.version>17</java.version>
<spring-cloud.version>2021.0.8</spring-cloud.version>
<spring-cloud.version>2023.0.6</spring-cloud.version>
<sonar.organization>samfert-codeium</sonar.organization>
</properties>
<dependencies>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,10 @@

import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication;
import org.springframework.cloud.netflix.eureka.EnableEurekaClient;
import org.springframework.cloud.openfeign.EnableFeignClients;

@SpringBootApplication
@EnableFeignClients
@EnableEurekaClient
public class UserServiceApplication {

public static void main(String[] args) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
import org.springframework.beans.factory.annotation.Value;
import org.springframework.http.HttpHeaders;
import org.springframework.http.HttpStatus;
import org.springframework.http.HttpStatusCode;
import org.springframework.http.ResponseEntity;
import org.springframework.web.bind.MethodArgumentNotValidException;
import org.springframework.web.bind.annotation.ExceptionHandler;
Expand All @@ -27,12 +28,12 @@ public class GlobalExceptionHandler extends ResponseEntityExceptionHandler {
*
* @param ex The MethodArgumentNotValidException that was thrown.
* @param headers The HttpHeaders object for the response.
* @param status The HttpStatus for the response.
* @param status The HttpStatusCode for the response.
* @param request The WebRequest object for the response.
* @return A ResponseEntity containing an ErrorResponse object with the error code and localized message, and the HTTP status code.
*/
@Override
protected ResponseEntity<Object> handleMethodArgumentNotValid(MethodArgumentNotValidException ex, HttpHeaders headers, HttpStatus status, WebRequest request) {
protected ResponseEntity<Object> handleMethodArgumentNotValid(MethodArgumentNotValidException ex, HttpHeaders headers, HttpStatusCode status, WebRequest request) {

return new ResponseEntity<>(new ErrorResponse(errorCodeBadRequest, ex.getLocalizedMessage()), HttpStatus.BAD_REQUEST);
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
import org.hibernate.annotations.CreationTimestamp;
import org.training.user.service.model.Status;

import javax.persistence.*;
import jakarta.persistence.*;
import java.time.LocalDate;

@Entity
Expand Down Expand Up @@ -38,4 +38,4 @@ public class User {
@OneToOne(cascade = CascadeType.ALL)
@JoinColumn(name = "user_profile_id", referencedColumnName = "userProfileId")
private UserProfile userProfile;
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@
import lombok.Data;
import lombok.NoArgsConstructor;

import javax.persistence.Entity;
import javax.persistence.GeneratedValue;
import javax.persistence.GenerationType;
import javax.persistence.Id;
import jakarta.persistence.Entity;
import jakarta.persistence.GeneratedValue;
import jakarta.persistence.GenerationType;
import jakarta.persistence.Id;

@Entity
@Data
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
import org.training.user.service.service.UserService;
import org.training.user.service.utils.FieldChecker;

import javax.transaction.Transactional;
import jakarta.transaction.Transactional;
import java.util.*;
import java.util.function.Function;
import java.util.stream.Collectors;
Expand Down