From 846fbf60d988df2dc474aa3ac0a2b13eacaad3cf Mon Sep 17 00:00:00 2001
From: "e1029590@student.tuwien.ac.at" <e1029590@student.tuwien.ac.at>
Date: Mon, 30 Nov 2020 22:40:37 +0100
Subject: [PATCH] docker-compose changed due to gateway-service
---
README.md | 4 ++--
docker-compose.yml | 11 ++++++++++-
.../tuwien/gatewayservice/config/GatewayConfig.java | 5 +++++
.../src/main/resources/application.properties | 3 +++
.../src/main/resources/application.yml | 12 ------------
.../java/at/tuwien/controller/QueryController.java | 4 ++--
.../java/at/tuwien/client/FdaQueryServiceClient.java | 6 +++---
7 files changed, 25 insertions(+), 20 deletions(-)
create mode 100644 fda-gateway-service/src/main/resources/application.properties
delete mode 100644 fda-gateway-service/src/main/resources/application.yml
diff --git a/README.md b/README.md
index 74188ab391..2fa1a3712a 100644
--- a/README.md
+++ b/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)
diff --git a/docker-compose.yml b/docker-compose.yml
index abc024a81f..df4d1f68e2 100644
--- a/docker-compose.yml
+++ b/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:
diff --git a/fda-gateway-service/src/main/java/at/tuwien/gatewayservice/config/GatewayConfig.java b/fda-gateway-service/src/main/java/at/tuwien/gatewayservice/config/GatewayConfig.java
index 9e4fa3a69e..e61d6988b6 100644
--- a/fda-gateway-service/src/main/java/at/tuwien/gatewayservice/config/GatewayConfig.java
+++ b/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();
}
diff --git a/fda-gateway-service/src/main/resources/application.properties b/fda-gateway-service/src/main/resources/application.properties
new file mode 100644
index 0000000000..16f488a6c7
--- /dev/null
+++ b/fda-gateway-service/src/main/resources/application.properties
@@ -0,0 +1,3 @@
+spring.application.name=fda-gateway-service
+server.port=9095
+eureka.client.serviceUrl.defaultZone=http://localhost:9090/eureka/
\ No newline at end of file
diff --git a/fda-gateway-service/src/main/resources/application.yml b/fda-gateway-service/src/main/resources/application.yml
deleted file mode 100644
index ea38e22028..0000000000
--- a/fda-gateway-service/src/main/resources/application.yml
+++ /dev/null
@@ -1,12 +0,0 @@
-
-eureka:
- client:
- serviceUrl:
- defaultZone: http://localhost:9090/eureka/
- register-with-eureka: true
- fetch-registry: true
-server:
- port: 9095
-spring:
- application:
- name: fda-gateway-service
diff --git a/fda-query-service/rest-service/src/main/java/at/tuwien/controller/QueryController.java b/fda-query-service/rest-service/src/main/java/at/tuwien/controller/QueryController.java
index 73a8a26201..93c23112b0 100644
--- a/fda-query-service/rest-service/src/main/java/at/tuwien/controller/QueryController.java
+++ b/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);
diff --git a/fda-table-service/gateways/src/main/java/at/tuwien/client/FdaQueryServiceClient.java b/fda-table-service/gateways/src/main/java/at/tuwien/client/FdaQueryServiceClient.java
index 5ec39d89eb..5de764ead1 100644
--- a/fda-table-service/gateways/src/main/java/at/tuwien/client/FdaQueryServiceClient.java
+++ b/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()
--
GitLab