docker-compose changed due to gateway-service

README.md

@@ -8,8 +8,8 @@ Create the database container image:
     docker build --tag rdr-postgres:1.0 .
 
 ```bash
-# First generate jars for discovery,database,container and query services
-$ mvn clean package
+# First generate jars for discovery,gateway,database,container and query services
+$ mvn clean install
 
 # start application
 $ docker-compose up --build #(use -d for detach mode)

docker-compose.yml

@@ -24,8 +24,16 @@ services:
             - 9095:9095
         links:
              - fda-discovery-server
+             - fda-database-managing-service
+             - fda-container-managing-service
+             - fda-query-service
+             - fda-table-service
         depends_on:
              - fda-discovery-server
+             - fda-database-managing-service
+             - fda-container-managing-service
+             - fda-query-service
+             - fda-table-service
         logging:
             driver: json-file
     fda-database-managing-service:
@@ -46,6 +54,7 @@ services:
              - fda-container-managing-service
         depends_on:
              - fda-discovery-server
+             - fda-container-managing-service
         logging:
             driver: json-file
         
@@ -57,7 +66,6 @@ services:
         network_mode: bridge
         environment:
              - eureka.client.serviceUrl.defaultZone=http://fda-discovery-server:9090/eureka
-       
         expose:
             - 9091
         ports:
@@ -87,6 +95,7 @@ services:
              - fda-container-managing-service
         depends_on:
              - fda-discovery-server
+             - fda-container-managing-service
         logging:
             driver: json-file
     fda-table-service:

fda-gateway-service/src/main/java/at/tuwien/gatewayservice/config/GatewayConfig.java

@@ -22,6 +22,11 @@ public class GatewayConfig {
                         .method("POST","GET")
                         .and()
                         .uri("lb://FDA-Table-Service"))
+                .route("query-service", r -> r.path("/query/executeQuery")
+                        .and()
+                        .method("POST")
+                        .and()
+                        .uri("lb://FDA-Query-Service"))
                 .build();
     }
 

fda-gateway-service/src/main/resources/application.properties

+spring.application.name=fda-gateway-service
+server.port=9095
+eureka.client.serviceUrl.defaultZone=http://localhost:9090/eureka/
\ No newline at end of file

fda-gateway-service/src/main/resources/application.yml

-
-eureka:
-  client:
-    serviceUrl:
-      defaultZone: http://localhost:9090/eureka/
-    register-with-eureka: true
-    fetch-registry: true
-server:
-  port: 9095
-spring:
-  application:
-    name: fda-gateway-service

fda-query-service/rest-service/src/main/java/at/tuwien/controller/QueryController.java

@@ -18,7 +18,7 @@ import javax.ws.rs.core.MediaType;
 import javax.ws.rs.core.Response;
 
 @RestController
-@RequestMapping("/api")
+@RequestMapping("/query")
 public class QueryController {
 
     private QueryService service;
@@ -37,7 +37,7 @@ public class QueryController {
 
 
     @PostMapping("/executeStatement")
-    @ApiOperation(value = "executes a query an gives the result as response")
+    @ApiOperation(value = "executes a query an gives a status as response")
     @ApiResponses(value = {@ApiResponse(code = 201, message = "result of Statement", response = Response.class)})
     public Response executeStatement(@RequestBody ExecuteStatementDTO dto) {
         service.executeStatement(dto);

fda-table-service/gateways/src/main/java/at/tuwien/client/FdaQueryServiceClient.java

@@ -36,7 +36,7 @@ public class FdaQueryServiceClient {
         ClientResponse response = webClientBuilder
                 .build()
                 .post()
-                .uri("http://fda-query-service/api/executeStatement")
+                .uri("http://fda-query-service/query/executeStatement")
                 .contentType(MediaType.APPLICATION_JSON)
                 .body(Mono.just(statementDTO), ExecuteStatementDTO.class)
                 .exchange()
@@ -51,7 +51,7 @@ public class FdaQueryServiceClient {
         QueryResult queryResult = webClientBuilder
                 .build()
                 .post()
-                .uri("http://fda-query-service/api/executeQuery")
+                .uri("http://fda-query-service/query/executeQuery")
                 .contentType(MediaType.APPLICATION_JSON)
                 .body(Mono.just(execInternalQueryDTO), ExecuteInternalQueryDTO.class)
                 .retrieve()
@@ -66,7 +66,7 @@ public class FdaQueryServiceClient {
         ClientResponse response = webClientBuilder
                 .build()
                 .post()
-                .uri("http://fda-query-service/api/copyCSVIntoTable")
+                .uri("http://fda-query-service/query/copyCSVIntoTable")
                 .contentType(MediaType.APPLICATION_JSON)
                 .body(Mono.just(tableWithDataset), CreateCSVTableWithDataset.class)
                 .exchange()