diff --git a/docker-compose.yml b/docker-compose.yml index 1ff4abe..6579263 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -8,6 +8,8 @@ services: - order_db environment: - SPRING_DATASOURCE_URL=jdbc:postgresql://order_db:5432/orderDB + - SPRING_DATASOURCE_USERNAME=postgres + - SPRING_DATASOURCE_PASSWORD=1234 volumes: - ./target:/app - ./logs:/logs @@ -30,25 +32,6 @@ services: - "15672:15672" - "5672:5672" environment: - RABBITMQ_DEFAULT_USER: user - RABBITMQ_DEFAULT_PASS: password + RABBITMQ_DEFAULT_USER: guest + RABBITMQ_DEFAULT_PASS: guest - loki: - image: grafana/loki:3.5.0 - container_name: loki - ports: - - "3100:3100" - command: -config.file=/etc/loki/local-config.yaml - - grafana: - image: grafana/grafana:10.4.1 - container_name: grafana - ports: - - "3000:3000" - depends_on: - - loki - environment: - - GF_SECURITY_ADMIN_USER=admin - - GF_SECURITY_ADMIN_PASSWORD=admin - volumes: - - grafana_data:/var/lib/grafana diff --git a/pom.xml b/pom.xml index a4bf087..c944f87 100644 --- a/pom.xml +++ b/pom.xml @@ -40,20 +40,15 @@ org.springframework.boot spring-boot-starter-data-jdbc - - org.springframework.cloud - spring-cloud-starter-stream-rabbit - 4.0.0 - - - org.springdoc - springdoc-openapi-starter-webmvc-ui - 2.8.5 - org.springframework.boot - spring-boot-starter-security + spring-boot-starter-webflux + + + + + org.springdoc springdoc-openapi-starter-webmvc-ui diff --git a/src/main/java/com/podzilla/order/exception/GlobalExceptionHandler.java b/src/main/java/com/podzilla/order/exception/GlobalExceptionHandler.java index 0f19f36..2b8e2d7 100644 --- a/src/main/java/com/podzilla/order/exception/GlobalExceptionHandler.java +++ b/src/main/java/com/podzilla/order/exception/GlobalExceptionHandler.java @@ -2,8 +2,6 @@ import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; -import org.springframework.security.access.AccessDeniedException; -import org.springframework.security.core.AuthenticationException; import org.springframework.web.bind.annotation.ExceptionHandler; import org.springframework.web.bind.annotation.RestControllerAdvice; import org.springframework.web.servlet.mvc.method.annotation.ResponseEntityExceptionHandler; @@ -12,22 +10,6 @@ public class GlobalExceptionHandler extends ResponseEntityExceptionHandler { - @ExceptionHandler(AccessDeniedException.class) - public ResponseEntity handleAccessDeniedException( - final AccessDeniedException exception) { - return ResponseEntity.status(HttpStatus.FORBIDDEN) - .body(new ErrorResponse(exception.getMessage(), - HttpStatus.FORBIDDEN)); - } - - @ExceptionHandler(AuthenticationException.class) - public ResponseEntity handleAuthenticationException( - final AuthenticationException exception) { - return ResponseEntity.status(HttpStatus.UNAUTHORIZED) - .body(new ErrorResponse(exception.getMessage(), - HttpStatus.UNAUTHORIZED)); - } - @ExceptionHandler(NotFoundException.class) public ResponseEntity handleNotFoundException( final NotFoundException exception) { diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties index 6b013d9..cde2649 100644 --- a/src/main/resources/application.properties +++ b/src/main/resources/application.properties @@ -1,2 +1,6 @@ spring.application.name=order -api.gateway.url=http://localhost:8080 \ No newline at end of file +api.gateway.url=http://localhost:8080 +spring.rabbitmq.host=rabbitmq +spring.rabbitmq.port=5672 +spring.rabbitmq.username=guest +spring.rabbitmq.password=guest diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index 0bc1010..09780f5 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -4,5 +4,5 @@ spring: rabbitmq: host: rabbitmq # container name port: 5672 - username: user - password: password + username: guest + password: guest