diff --git a/README.md b/README.md
index 74188ab3917b5889d7af5c16513cf6d75be32704..2fa1a3712a5f65a24c47a5d9549d84f372c16284 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 abc024a81f49b94720efb406396f2b9af4baf83d..df4d1f68e29d6a2214677add24db881dce13bf8a 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 9e4fa3a69e3afa61cd991fbdd4fdc00d7dfb2f8a..e61d6988b60012579f8d7df9a829f4334b6519f6 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 0000000000000000000000000000000000000000..16f488a6c7437cd79c006032973081d1d2ad6d18
--- /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 ea38e220289fc1cb3ef43c2cfb41a93679956fea..0000000000000000000000000000000000000000
--- 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 73a8a262019f7570111cc797ecd4bc275ec93d3a..93c23112b0d64cde1681d9ba69a96fd4d8f0b335 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 5ec39d89ebd66328f6b93090fa57603fe05c22f0..5de764ead16103a8b1b69bba24a1a1a7531a83a0 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()