limited fixes

kocmana · Apr 8, 2021 · 0dc7650 · 0dc7650
1 parent 3d23a14
commit 0dc7650
Show file tree

Hide file tree

Showing 23 changed files with 56 additions and 60 deletions.
diff --git a/...um/masterproject/commons/delay/annotation/NormallyDistributedEndpointDelaySimulation.java b/...um/masterproject/commons/delay/annotation/NormallyDistributedEndpointDelaySimulation.java
@@ -4,14 +4,13 @@
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
-import org.aspectj.lang.annotation.Aspect;
 
-@Aspect
 @Retention(RetentionPolicy.RUNTIME)
 @Target(ElementType.METHOD)
 public @interface NormallyDistributedEndpointDelaySimulation {
 
   int mean() default 0;
+
   int standardDeviation() default 0;
 
 }
diff --git a/...echnikum/masterproject/commons/delay/annotation/ProbabilisticEndpointDelaySimulation.java b/...echnikum/masterproject/commons/delay/annotation/ProbabilisticEndpointDelaySimulation.java
@@ -4,14 +4,13 @@
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
-import org.aspectj.lang.annotation.Aspect;
 
-@Aspect
 @Retention(RetentionPolicy.RUNTIME)
 @Target(ElementType.METHOD)
 public @interface ProbabilisticEndpointDelaySimulation {
 
   float probability() default 0;
+
   int delayInMs() default 0;
 
 }
diff --git a/...at/technikum/masterproject/commons/failure/annotation/ProbabilisticFailureSimulation.java b/...at/technikum/masterproject/commons/failure/annotation/ProbabilisticFailureSimulation.java
@@ -6,7 +6,7 @@
 import java.lang.annotation.Target;
 
 @Retention(RetentionPolicy.RUNTIME)
-@Target({ElementType.METHOD, ElementType.TYPE})
+@Target({ElementType.METHOD})
 public @interface ProbabilisticFailureSimulation {
 
   float probability() default 0;

diff --git a/...at/technikum/masterproject/customerservice/customernetwork/CustomerNetworkController.java b/...at/technikum/masterproject/customerservice/customernetwork/CustomerNetworkController.java
@@ -1,5 +1,6 @@
 package at.technikum.masterproject.customerservice.customernetwork;
 
+import at.technikum.masterproject.commons.delay.annotation.NormallyDistributedEndpointDelaySimulation;
 import at.technikum.masterproject.customerservice.customernetwork.model.domain.CustomerInteraction;
 import at.technikum.masterproject.customerservice.customernetwork.model.domain.CustomerNetwork;
 import at.technikum.masterproject.customerservice.customernetwork.model.dto.CustomerInteractionDto;
@@ -32,6 +33,7 @@ public CustomerNetworkController(
     this.customerRelationshipMapper = customerRelationshipMapper;
   }
 
+  @NormallyDistributedEndpointDelaySimulation(mean = 100, standardDeviation = 25)
   @GetMapping("/{customerId}")
   public ResponseEntity<List<CustomerNetworkDto>> getCustomerNetworkForCustomer(@PathVariable int customerId) {
     List<CustomerNetwork> customerNetworks = customerNetworkService.getCustomerNetworksForCustomer(customerId);

diff --git a/...ce/src/main/java/at/technikum/masterproject/integrationservice/model/customer/Gender.java b/...ce/src/main/java/at/technikum/masterproject/integrationservice/model/customer/Gender.java
@@ -1,5 +1,22 @@
 package at.technikum.masterproject.integrationservice.model.customer;
 
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonValue;
+
 public enum Gender {
-  MALE, FEMALE
+  MALE, FEMALE;
+
+  @JsonValue
+  public String encode(){
+    return name().toLowerCase();
+  }
+
+  @JsonCreator
+  public static Gender decode(String input){
+    try {
+      return Gender.valueOf(input.toUpperCase());
+    } catch (Exception exception) {
+      throw new IllegalArgumentException("Illegal argument provided for gender, please use male or female.");
+    }
+  }
 }
diff --git a/.../integrationservice/resolver/dataloader/configuration/ProductDataLoaderConfiguration.java b/.../integrationservice/resolver/dataloader/configuration/ProductDataLoaderConfiguration.java
@@ -49,7 +49,6 @@ private DataLoader<Integer, List<ProductReview>> createProductReviewByCustomerDa
     return DataLoader.newMappedDataLoader(batchLoadFunction);
   }
 
-
   private DataLoader<Integer, Product> createProductInformationDataLoader() {
     MappedBatchLoader<Integer, Product> batchLoadFunction = dataLoaderExecutor.generateBatchLoadFunction(
         productInformationClient::getProductById, Product::getId);

diff --git a/integration_service/src/main/resources/application-local.yml b/integration_service/src/main/resources/application-local.yml
@@ -14,7 +14,7 @@ voyager:
   enabled: true
 
 services:
-  resolver-mode: DATALOADER #DATALOADER, ASYNC or SERIAL
+  resolver-mode: ASYNC #DATALOADER, ASYNC or SERIAL
   productservice:
     authentication-type: BASIC_AUTH
     url: localhost

diff --git a/integration_service/src/main/resources/application.yml b/integration_service/src/main/resources/application.yml
@@ -11,7 +11,7 @@ graphql:
   tools:
     schema-location-pattern: "schemas/**/*.graphqls"
   servlet:
-    maxQueryDuration: 12345
+    maxQueryDuration: 9999999
     maxQueryDepth: 20
     #maxQueryComplexity: 10
 

diff --git a/integration_service/src/main/resources/schemas/schemas.graphqls b/integration_service/src/main/resources/schemas/schemas.graphqls
@@ -0,0 +1,4 @@
+schema {
+    query: Query
+    mutation: Mutation
+}
diff --git a/...va/at/technikum/masterproject/productservice/controlleradvice/CommonControllerAdvice.java b/...va/at/technikum/masterproject/productservice/controlleradvice/CommonControllerAdvice.java
@@ -4,11 +4,10 @@
 import static org.springframework.http.HttpStatus.INTERNAL_SERVER_ERROR;
 import static org.springframework.http.HttpStatus.NOT_FOUND;
 
-import at.technikum.masterproject.productservice.model.error.ErrorResponse;
+import at.technikum.masterproject.commons.responses.ErrorResponse;
+import at.technikum.masterproject.commons.responses.ValidationErrorResponse;
 import at.technikum.masterproject.productservice.productinformation.model.ProductInformationNotFoundException;
 import at.technikum.masterproject.productservice.productreview.model.ProductReviewNotFoundException;
-import java.util.Optional;
-import javax.servlet.http.HttpServletRequest;
 import javax.validation.ValidationException;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.http.ResponseEntity;
@@ -21,63 +20,52 @@
 @Slf4j
 public class CommonControllerAdvice {
 
-  private static final String UUID_ATTRIBUTE = "request-id";
   private static final String GENERIC_ERROR_MESSAGE = "An error has occured.";
 
   @ExceptionHandler(MethodArgumentNotValidException.class)
-  ResponseEntity<ErrorResponse> handleMethodArgumentNotValidException(final MethodArgumentNotValidException ex,
-      final HttpServletRequest request) {
+  ResponseEntity<ErrorResponse> handleMethodArgumentNotValidException(final MethodArgumentNotValidException ex) {
     log.warn(ex.getMessage());
 
     return ResponseEntity
         .status(BAD_REQUEST)
-        .body(new ErrorResponse(retrieveRequestUuid(request), ex.getMessage()));
+        .body(ValidationErrorResponse.forException(ex));
   }
 
   @ExceptionHandler(ValidationException.class)
-  ResponseEntity<ErrorResponse> handleValidationException(final ValidationException ex,
-      final HttpServletRequest request) {
+  ResponseEntity<ErrorResponse> handleValidationException(final ValidationException ex) {
     log.warn(ex.getMessage());
 
     return ResponseEntity
         .status(BAD_REQUEST)
-        .body(new ErrorResponse(retrieveRequestUuid(request), ex.getMessage()));
+        .body(ErrorResponse.withMessage(ex.getMessage()));
   }
 
   @ExceptionHandler(HttpMessageNotReadableException.class)
-  ResponseEntity<ErrorResponse> handleMessageNotReadableException(final HttpMessageNotReadableException ex,
-      final HttpServletRequest request) {
+  ResponseEntity<ErrorResponse> handleMessageNotReadableException(final HttpMessageNotReadableException ex) {
     log.warn(ex.getMessage());
 
     return ResponseEntity
         .status(BAD_REQUEST)
-        .body(new ErrorResponse(retrieveRequestUuid(request), ex.getMessage()));
+        .body(ErrorResponse.withMessage(ex.getMessage()));
   }
 
   @ExceptionHandler({ProductInformationNotFoundException.class, ProductReviewNotFoundException.class})
-  ResponseEntity<ErrorResponse> handleProductInformationNotFoundException(final ProductInformationNotFoundException ex,
-      final HttpServletRequest request) {
+  ResponseEntity<ErrorResponse> handleProductInformationNotFoundException(
+      final ProductInformationNotFoundException ex) {
     log.warn(ex.getMessage());
 
     return ResponseEntity
         .status(NOT_FOUND)
-        .body(new ErrorResponse(retrieveRequestUuid(request), ex.getMessage()));
+        .body(ErrorResponse.withMessage(ex.getMessage()));
   }
 
   @ExceptionHandler(Exception.class)
-  ResponseEntity<ErrorResponse> handleGenericException(final Exception ex,
-      final HttpServletRequest request) {
+  ResponseEntity<ErrorResponse> handleGenericException(final Exception ex) {
     log.warn("Uncaught exception has occurred: {}", ex.getMessage());
 
     return ResponseEntity
         .status(INTERNAL_SERVER_ERROR)
-        .body(new ErrorResponse(retrieveRequestUuid(request), GENERIC_ERROR_MESSAGE));
+        .body(ErrorResponse.withMessage(GENERIC_ERROR_MESSAGE));
   }
 
-  private String retrieveRequestUuid(final HttpServletRequest request) {
-    return Optional.ofNullable(request.getAttribute(UUID_ATTRIBUTE))
-        .filter(String.class::isInstance)
-        .map(String.class::cast)
-        .orElse("No UUID defined.");
-  }
 }
diff --git a/...ce/src/main/java/at/technikum/masterproject/productservice/model/error/ErrorResponse.java b/...ce/src/main/java/at/technikum/masterproject/productservice/model/error/ErrorResponse.java
diff --git a/...chnikum/masterproject/productservice/productinformation/ProductInformationController.java b/...chnikum/masterproject/productservice/productinformation/ProductInformationController.java
@@ -3,7 +3,7 @@
 import static org.springframework.http.ResponseEntity.ok;
 
 import at.technikum.masterproject.productservice.model.ElementCreationResponse;
-import at.technikum.masterproject.productservice.productinformation.model.Product;
+import at.technikum.masterproject.productservice.productinformation.model.domain.Product;
 import at.technikum.masterproject.productservice.productinformation.model.dto.ProductCreationRequest;
 import at.technikum.masterproject.productservice.productinformation.model.dto.ProductResponse;
 import at.technikum.masterproject.productservice.productinformation.model.dto.ProductUpdateRequest;

diff --git a/...chnikum/masterproject/productservice/productinformation/ProductInformationRepository.java b/...chnikum/masterproject/productservice/productinformation/ProductInformationRepository.java
@@ -1,6 +1,6 @@
 package at.technikum.masterproject.productservice.productinformation;
 
-import at.technikum.masterproject.productservice.productinformation.model.Product;
+import at.technikum.masterproject.productservice.productinformation.model.domain.Product;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.stereotype.Repository;
 

diff --git a/.../technikum/masterproject/productservice/productinformation/ProductInformationService.java b/.../technikum/masterproject/productservice/productinformation/ProductInformationService.java
@@ -1,7 +1,7 @@
 package at.technikum.masterproject.productservice.productinformation;
 
-import at.technikum.masterproject.productservice.productinformation.model.Product;
 import at.technikum.masterproject.productservice.productinformation.model.ProductInformationNotFoundException;
+import at.technikum.masterproject.productservice.productinformation.model.domain.Product;
 import java.util.List;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.Pageable;

diff --git a/...ice/productinformation/model/Product.java → ...ductinformation/model/domain/Product.java b/...ice/productinformation/model/Product.java → ...ductinformation/model/domain/Product.java
@@ -1,4 +1,4 @@
-package at.technikum.masterproject.productservice.productinformation.model;
+package at.technikum.masterproject.productservice.productinformation.model.domain;
 
 import javax.persistence.Embedded;
 import javax.persistence.Entity;

diff --git a/...ctinformation/model/ProductDimension.java → ...mation/model/domain/ProductDimension.java b/...ctinformation/model/ProductDimension.java → ...mation/model/domain/ProductDimension.java
@@ -1,4 +1,4 @@
-package at.technikum.masterproject.productservice.productinformation.model;
+package at.technikum.masterproject.productservice.productinformation.model.domain;
 
 import javax.persistence.Embeddable;
 import lombok.Getter;

diff --git a/.../masterproject/productservice/productinformation/model/mapper/ProductDimensionMapper.java b/.../masterproject/productservice/productinformation/model/mapper/ProductDimensionMapper.java
@@ -1,6 +1,6 @@
 package at.technikum.masterproject.productservice.productinformation.model.mapper;
 
-import at.technikum.masterproject.productservice.productinformation.model.ProductDimension;
+import at.technikum.masterproject.productservice.productinformation.model.domain.ProductDimension;
 import at.technikum.masterproject.productservice.productinformation.model.dto.ProductDimensionDto;
 import org.mapstruct.InheritInverseConfiguration;
 import org.mapstruct.Mapper;

diff --git a/...technikum/masterproject/productservice/productinformation/model/mapper/ProductMapper.java b/...technikum/masterproject/productservice/productinformation/model/mapper/ProductMapper.java
@@ -1,6 +1,6 @@
 package at.technikum.masterproject.productservice.productinformation.model.mapper;
 
-import at.technikum.masterproject.productservice.productinformation.model.Product;
+import at.technikum.masterproject.productservice.productinformation.model.domain.Product;
 import at.technikum.masterproject.productservice.productinformation.model.dto.ProductCreationRequest;
 import at.technikum.masterproject.productservice.productinformation.model.dto.ProductResponse;
 import at.technikum.masterproject.productservice.productinformation.model.dto.ProductUpdateRequest;

diff --git a/...java/at/technikum/masterproject/productservice/productreview/ProductReviewController.java b/...java/at/technikum/masterproject/productservice/productreview/ProductReviewController.java
@@ -4,9 +4,9 @@
 
 import at.technikum.masterproject.productservice.model.ElementCreationResponse;
 import at.technikum.masterproject.productservice.productinformation.ProductInformationService;
-import at.technikum.masterproject.productservice.productinformation.model.Product;
 import at.technikum.masterproject.productservice.productinformation.model.ProductInformationNotFoundException;
-import at.technikum.masterproject.productservice.productreview.model.ProductReview;
+import at.technikum.masterproject.productservice.productinformation.model.domain.Product;
+import at.technikum.masterproject.productservice.productreview.model.domain.ProductReview;
 import at.technikum.masterproject.productservice.productreview.model.dto.ProductReviewCreationRequest;
 import at.technikum.masterproject.productservice.productreview.model.dto.ProductReviewResponse;
 import at.technikum.masterproject.productservice.productreview.model.dto.ProductReviewUpdateRequest;

diff --git a/...java/at/technikum/masterproject/productservice/productreview/ProductReviewRepository.java b/...java/at/technikum/masterproject/productservice/productreview/ProductReviewRepository.java
@@ -1,6 +1,6 @@
 package at.technikum.masterproject.productservice.productreview;
 
-import at.technikum.masterproject.productservice.productreview.model.ProductReview;
+import at.technikum.masterproject.productservice.productreview.model.domain.ProductReview;
 import java.util.List;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.stereotype.Repository;

diff --git a/...in/java/at/technikum/masterproject/productservice/productreview/ProductReviewService.java b/...in/java/at/technikum/masterproject/productservice/productreview/ProductReviewService.java
@@ -1,7 +1,7 @@
 package at.technikum.masterproject.productservice.productreview;
 
-import at.technikum.masterproject.productservice.productreview.model.ProductReview;
 import at.technikum.masterproject.productservice.productreview.model.ProductReviewNotFoundException;
+import at.technikum.masterproject.productservice.productreview.model.domain.ProductReview;
 import java.util.List;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.Pageable;

diff --git a/...ce/productreview/model/ProductReview.java → ...uctreview/model/domain/ProductReview.java b/...ce/productreview/model/ProductReview.java → ...uctreview/model/domain/ProductReview.java
@@ -1,6 +1,6 @@
-package at.technikum.masterproject.productservice.productreview.model;
+package at.technikum.masterproject.productservice.productreview.model.domain;
 
-import at.technikum.masterproject.productservice.productinformation.model.Product;
+import at.technikum.masterproject.productservice.productinformation.model.domain.Product;
 import javax.persistence.Entity;
 import javax.persistence.GeneratedValue;
 import javax.persistence.GenerationType;

diff --git a/...echnikum/masterproject/productservice/productreview/model/mapper/ProductReviewMapper.java b/...echnikum/masterproject/productservice/productreview/model/mapper/ProductReviewMapper.java
@@ -1,6 +1,6 @@
 package at.technikum.masterproject.productservice.productreview.model.mapper;
 
-import at.technikum.masterproject.productservice.productreview.model.ProductReview;
+import at.technikum.masterproject.productservice.productreview.model.domain.ProductReview;
 import at.technikum.masterproject.productservice.productreview.model.dto.ProductReviewCreationRequest;
 import at.technikum.masterproject.productservice.productreview.model.dto.ProductReviewResponse;
 import at.technikum.masterproject.productservice.productreview.model.dto.ProductReviewUpdateRequest;