Merge pull request #7 from javatodev/pre-development

Pre development

Author: javatodev

.DS_Store

@@ -60,6 +60,10 @@ Article series
 
 [8. Microservices – Utility Payment Service Implementation](https://javatodev.com/microservices-utility-payment-service-implementation/)
 
+[9. Microservices – Communication With Spring Cloud OpenFeign](https://javatodev.com/microservices-communication-with-spring-cloud-openfeign/)
+
+[9. Microservices – Exception Handling](https://javatodev.com/microservices-exception-handling/)
+
 #### Author
 
 <h1 align="center">Hi 👋, I'm Chinthaka Dinadasa</h1>

README.md

@@ -26,9 +26,8 @@ public ResponseEntity readUser(@PathVariable("identification") String identifica
     }
 
     @GetMapping
-    public ResponseEntity readUser(@RequestHeader("X-Auth-Id") String authId, Pageable pageable) {
-        log.info("Requesting as user {}", authId);
-        return ResponseEntity.ok(messageSource.getMessage("hello.message", null, LocaleContextHolder.getLocale()));
+    public ResponseEntity readUsers(Pageable pageable) {
+        return ResponseEntity.ok(userService.readUsers(pageable));
     }
 
 }

core-banking-service/src/main/java/com/javatodev/finance/controller/UserController.java

@@ -1,6 +1,6 @@
 package com.javatodev.finance.exception;
 
-public class EntityNotFoundException extends SimpleBankingGlobalException{
+public class EntityNotFoundException extends SimpleBankingGlobalException {
     public EntityNotFoundException() {
         super("Requested entity not present in the DB.", GlobalErrorCode.ERROR_ENTITY_NOT_FOUND);
     }

core-banking-service/src/main/java/com/javatodev/finance/exception/EntityNotFoundException.java

@@ -1,27 +1,11 @@
 package com.javatodev.finance.exception;
 
+import lombok.*;
+
+@Getter
+@Setter
+@Builder
 public class ErrorResponse {
     private String code;
     private String message;
-
-    public String getCode() {
-        return code;
-    }
-
-    public void setCode(String code) {
-        this.code = code;
-    }
-
-    public String getMessage() {
-        return message;
-    }
-
-    public void setMessage(String message) {
-        this.message = message;
-    }
-
-    public ErrorResponse(String code, String message) {
-        this.code = code;
-        this.message = message;
-    }
 }

core-banking-service/src/main/java/com/javatodev/finance/exception/ErrorResponse.java

@@ -1,8 +1,6 @@
 package com.javatodev.finance.exception;
 
 public class GlobalErrorCode {
-
-    public static final String ERROR_ENTITY_NOT_FOUND = "BANK-CORE-1000";
-    public static final String INSUFFICIENT_FUNDS = "BANK-CORE-1001";
-
+    public static final String ERROR_ENTITY_NOT_FOUND = "BANKING-CORE-SERVICE-1000";
+    public static final String INSUFFICIENT_FUNDS = "BANKING-CORE-SERVICE-1001";
 }

core-banking-service/src/main/java/com/javatodev/finance/exception/GlobalErrorCode.java

@@ -11,10 +11,13 @@
 public class GlobalExceptionHandler extends ResponseEntityExceptionHandler {
 
     @ExceptionHandler(SimpleBankingGlobalException.class)
-    protected ResponseEntity handleGlobalException(SimpleBankingGlobalException e, Locale locale) {
+    protected ResponseEntity handleGlobalException(SimpleBankingGlobalException simpleBankingGlobalException, Locale locale) {
         return ResponseEntity
                 .badRequest()
-                .body(new ErrorResponse(e.getCode(), e.getMessage()));
+                .body(ErrorResponse.builder()
+                        .code(simpleBankingGlobalException.getCode())
+                        .message(simpleBankingGlobalException.getMessage())
+                        .build());
     }
 
     @ExceptionHandler({Exception.class})
@@ -23,4 +26,5 @@ protected ResponseEntity handleException(Exception e, Locale locale) {
                 .badRequest()
                 .body("Exception occur inside API " + e);
     }
+
 }

core-banking-service/src/main/java/com/javatodev/finance/exception/GlobalExceptionHandler.java

@@ -0,0 +1,7 @@
+package com.javatodev.finance.exception;
+
+public class InsufficientFundsException extends SimpleBankingGlobalException {
+    public InsufficientFundsException(String message, String code) {
+        super(message, code);
+    }
+}

core-banking-service/src/main/java/com/javatodev/finance/exception/InsufficientFundsException.java

@@ -1,32 +1,20 @@
 package com.javatodev.finance.exception;
 
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+
+@Getter
+@Setter
+@AllArgsConstructor
+@NoArgsConstructor
 public class SimpleBankingGlobalException extends RuntimeException {
 
     private String code;
     private String message;
 
-    public SimpleBankingGlobalException() {
+    public SimpleBankingGlobalException(String message) {
+        super(message);
     }
-
-    public SimpleBankingGlobalException(String code, String message) {
-        this.code = code;
-        this.message = message;
-    }
-
-    public String getCode() {
-        return code;
-    }
-
-    public void setCode(String code) {
-        this.code = code;
-    }
-
-    public String getMessage() {
-        return message;
-    }
-
-    public void setMessage(String message) {
-        this.message = message;
-    }
-
 }

core-banking-service/src/main/java/com/javatodev/finance/exception/SimpleBankingGlobalException.java

@@ -1,5 +1,6 @@
 package com.javatodev.finance.service;
 
+import com.javatodev.finance.exception.EntityNotFoundException;
 import com.javatodev.finance.model.dto.BankAccount;
 import com.javatodev.finance.model.dto.UtilityAccount;
 import com.javatodev.finance.model.entity.BankAccountEntity;
@@ -22,17 +23,17 @@ public class AccountService {
     private final UtilityAccountRepository utilityAccountRepository;
 
     public BankAccount readBankAccount(String accountNumber) {
-        BankAccountEntity entity = bankAccountRepository.findByNumber(accountNumber).get();
+        BankAccountEntity entity = bankAccountRepository.findByNumber(accountNumber).orElseThrow(EntityNotFoundException::new);
         return bankAccountMapper.convertToDto(entity);
     }
 
     public UtilityAccount readUtilityAccount(String provider) {
-        UtilityAccountEntity utilityAccountEntity = utilityAccountRepository.findByProviderName(provider).get();
+        UtilityAccountEntity utilityAccountEntity = utilityAccountRepository.findByProviderName(provider).orElseThrow(EntityNotFoundException::new);
         return utilityAccountMapper.convertToDto(utilityAccountEntity);
     }
 
     public UtilityAccount readUtilityAccount(Long id){
-        return utilityAccountMapper.convertToDto(utilityAccountRepository.findById(id).get());
+        return utilityAccountMapper.convertToDto(utilityAccountRepository.findById(id).orElseThrow(EntityNotFoundException::new));
     }
 
 }