From 748e6acf570ef5cd49e0498ce467d5121d773875 Mon Sep 17 00:00:00 2001
From: Martin Weise <martin.weise@tuwien.ac.at>
Date: Wed, 31 Mar 2021 15:34:21 +0200
Subject: [PATCH] more coherent naming of db + container service
---
docker-compose.yml | 37 +++++++++---------
.../.gitignore | 0
.../.mvn/wrapper/MavenWrapperDownloader.java | 0
.../.mvn/wrapper/maven-wrapper.jar | Bin
.../.mvn/wrapper/maven-wrapper.properties | 0
.../Dockerfile | 0
.../api/pom.xml | 0
.../java/at/tuwien/api/dto/IpAddressDto.java | 0
.../dto/container/ContainerActionTypeDto.java | 0
.../api/dto/container/ContainerBriefDto.java | 0
.../api/dto/container/ContainerChangeDto.java | 0
.../container/ContainerCreateRequestDto.java | 0
.../api/dto/container/ContainerDto.java | 0
.../api/dto/container/ContainerStateDto.java | 0
.../tuwien/api/dto/image/ImageBriefDto.java | 0
.../tuwien/api/dto/image/ImageChangeDto.java | 0
.../tuwien/api/dto/image/ImageCreateDto.java | 0
.../at/tuwien/api/dto/image/ImageDto.java | 0
.../tuwien/api/dto/image/ImageEnvItemDto.java | 0
.../api/src/main/java/at/tuwien/api/pom.xml | 0
.../mvnw | 0
.../mvnw.cmd | 0
.../pom.xml | 0
.../rest-service/pom.xml | 0
.../FdaContainerManagingApplication.java | 0
.../java/at/tuwien/config/SwaggerConfig.java | 0
.../tuwien/endpoints/ContainerEndpoint.java | 0
.../at/tuwien/endpoints/ImageEndpoint.java | 0
.../src/main/resources/CreateDB.sql | 0
.../src/main/resources/Dockerfile | 0
.../src/main/resources/MDB/Dockerfile | 0
.../src/main/resources/MDB/createMDB.sql | 0
.../src/main/resources/application-docker.yml | 0
.../src/main/resources/application.yml | 0
.../src/main/resources/config.properties | 0
.../java/at/tuwien/BaseIntegrationTest.java | 0
.../java/at/tuwien/endpoint/EndpointTest.java | 0
.../at/tuwien/mapper/BaseMappingTest.java | 0
.../tuwien/mapper/ContainerMappingTest.java | 0
.../tuwien/service/DockerIntegrationTest.java | 0
.../java/at/tuwien/service/ServiceTest.java | 0
.../src/test/resources/application.properties | 0
.../services/pom.xml | 0
.../java/at/tuwien/config/DockerConfig.java | 0
.../main/java/at/tuwien/entity/Auditable.java | 0
.../main/java/at/tuwien/entity/Container.java | 0
.../java/at/tuwien/entity/ContainerImage.java | 0
.../at/tuwien/entity/EnvironmentItem.java | 0
.../exception/ContainerNotFoundException.java | 0
.../ContainerStillRunningException.java | 0
.../exception/DockerClientException.java | 0
.../ImageAlreadyExistsException.java | 0
.../exception/ImageNotFoundException.java | 0
.../at/tuwien/mapper/ContainerMapper.java | 0
.../java/at/tuwien/mapper/ImageMapper.java | 0
.../repository/ContainerRepository.java | 0
.../at/tuwien/repository/ImageRepository.java | 0
.../at/tuwien/service/ContainerService.java | 0
.../java/at/tuwien/service/ImageService.java | 0
.../.gitignore | 0
.../.mvn/wrapper/MavenWrapperDownloader.java | 0
.../.mvn/wrapper/maven-wrapper.jar | Bin
.../.mvn/wrapper/maven-wrapper.properties | 0
.../Dockerfile | 0
.../api/pom.xml | 0
.../main/java/at/tuwien/dto/IpAddressDto.java | 0
.../dto/container/ContainerBriefDto.java | 0
.../at/tuwien/dto/container/ContainerDto.java | 0
.../dto/container/ContainerStateDto.java | 0
.../tuwien/dto/database/DatabaseBriefDto.java | 0
.../dto/database/DatabaseChangeDto.java | 0
.../dto/database/DatabaseCreateDto.java | 0
.../java/at/tuwien/dto/image/ImageDto.java | 0
.../at/tuwien/dto/image/ImageEnvItemDto.java | 0
.../gateway/pom.xml | 0
.../java/at/tuwien/config/RestClient.java | 0
.../at/tuwien/endpoint/ContainerGateway.java | 0
.../exception/ExternalComponentException.java | 0
.../exception/ImageNotSupportedException.java | 0
.../mvnw | 0
.../mvnw.cmd | 0
.../pom.xml | 0
.../rest-service/pom.xml | 0
.../FdaDatabaseManagingApplication.java | 0
.../java/at/tuwien/config/SwaggerConfig.java | 0
.../tuwien/endpoints/DatabaseController.java | 0
.../src/main/resources/application-docker.yml | 0
.../src/main/resources/application.yml | 0
.../src/main/resources/config.properties | 0
.../services/pom.xml | 0
.../java/at/tuwien/config/DatabaseConfig.java | 0
.../main/java/at/tuwien/entity/Auditable.java | 0
.../main/java/at/tuwien/entity/Container.java | 0
.../java/at/tuwien/entity/ContainerImage.java | 0
.../main/java/at/tuwien/entity/Database.java | 0
.../at/tuwien/entity/EnvironmentItem.java | 0
.../src/main/java/at/tuwien/entity/Table.java | 0
.../src/main/java/at/tuwien/entity/View.java | 0
.../exception/ContainerNotFoundException.java | 0
.../DatabaseConnectionException.java | 0
.../exception/DatabaseMalformedException.java | 0
.../exception/DatabaseNotFoundException.java | 0
.../java/at/tuwien/mapper/DatabaseMapper.java | 0
.../repository/ContainerRepository.java | 0
.../tuwien/repository/DatabaseRepository.java | 0
.../at/tuwien/service/DatabaseService.java | 0
.../java/at/tuwien/service/JdbcConnector.java | 0
.../at/tuwien/service/PostgresService.java | 0
.../at/tuwien/dto/table/TableBriefDto.java | 8 ++++
.../at/tuwien/dto/table/TableCreateDto.java | 10 ++++-
.../java/at/tuwien/dto/table/TableDto.java | 19 ++++-----
.../dto/table/columns/ColumnCreateDto.java | 13 +++---
.../tuwien/dto/table/columns/ColumnDto.java | 2 +
.../dto/table/columns/ColumnTypeDto.java | 2 +
.../at/tuwien/dto/table/columns/RowDto.java | 7 +++-
.../tuwien/dto/table/columns/SiUnitDto.java | 5 +++
116 files changed, 66 insertions(+), 37 deletions(-)
rename {fda-container-managing-service => fda-container-service}/.gitignore (100%)
rename {fda-container-managing-service => fda-container-service}/.mvn/wrapper/MavenWrapperDownloader.java (100%)
rename {fda-container-managing-service => fda-container-service}/.mvn/wrapper/maven-wrapper.jar (100%)
rename {fda-container-managing-service => fda-container-service}/.mvn/wrapper/maven-wrapper.properties (100%)
rename {fda-container-managing-service => fda-container-service}/Dockerfile (100%)
rename {fda-container-managing-service => fda-container-service}/api/pom.xml (100%)
rename {fda-container-managing-service => fda-container-service}/api/src/main/java/at/tuwien/api/dto/IpAddressDto.java (100%)
rename {fda-container-managing-service => fda-container-service}/api/src/main/java/at/tuwien/api/dto/container/ContainerActionTypeDto.java (100%)
rename {fda-container-managing-service => fda-container-service}/api/src/main/java/at/tuwien/api/dto/container/ContainerBriefDto.java (100%)
rename {fda-container-managing-service => fda-container-service}/api/src/main/java/at/tuwien/api/dto/container/ContainerChangeDto.java (100%)
rename {fda-container-managing-service => fda-container-service}/api/src/main/java/at/tuwien/api/dto/container/ContainerCreateRequestDto.java (100%)
rename {fda-container-managing-service => fda-container-service}/api/src/main/java/at/tuwien/api/dto/container/ContainerDto.java (100%)
rename {fda-container-managing-service => fda-container-service}/api/src/main/java/at/tuwien/api/dto/container/ContainerStateDto.java (100%)
rename {fda-container-managing-service => fda-container-service}/api/src/main/java/at/tuwien/api/dto/image/ImageBriefDto.java (100%)
rename {fda-container-managing-service => fda-container-service}/api/src/main/java/at/tuwien/api/dto/image/ImageChangeDto.java (100%)
rename {fda-container-managing-service => fda-container-service}/api/src/main/java/at/tuwien/api/dto/image/ImageCreateDto.java (100%)
rename {fda-container-managing-service => fda-container-service}/api/src/main/java/at/tuwien/api/dto/image/ImageDto.java (100%)
rename {fda-container-managing-service => fda-container-service}/api/src/main/java/at/tuwien/api/dto/image/ImageEnvItemDto.java (100%)
rename {fda-container-managing-service => fda-container-service}/api/src/main/java/at/tuwien/api/pom.xml (100%)
rename {fda-container-managing-service => fda-container-service}/mvnw (100%)
rename {fda-container-managing-service => fda-container-service}/mvnw.cmd (100%)
rename {fda-container-managing-service => fda-container-service}/pom.xml (100%)
rename {fda-container-managing-service => fda-container-service}/rest-service/pom.xml (100%)
rename {fda-container-managing-service => fda-container-service}/rest-service/src/main/java/at/tuwien/FdaContainerManagingApplication.java (100%)
rename {fda-container-managing-service => fda-container-service}/rest-service/src/main/java/at/tuwien/config/SwaggerConfig.java (100%)
rename {fda-container-managing-service => fda-container-service}/rest-service/src/main/java/at/tuwien/endpoints/ContainerEndpoint.java (100%)
rename {fda-container-managing-service => fda-container-service}/rest-service/src/main/java/at/tuwien/endpoints/ImageEndpoint.java (100%)
rename {fda-container-managing-service => fda-container-service}/rest-service/src/main/resources/CreateDB.sql (100%)
rename {fda-container-managing-service => fda-container-service}/rest-service/src/main/resources/Dockerfile (100%)
rename {fda-container-managing-service => fda-container-service}/rest-service/src/main/resources/MDB/Dockerfile (100%)
rename {fda-container-managing-service => fda-container-service}/rest-service/src/main/resources/MDB/createMDB.sql (100%)
rename {fda-container-managing-service => fda-container-service}/rest-service/src/main/resources/application-docker.yml (100%)
rename {fda-container-managing-service => fda-container-service}/rest-service/src/main/resources/application.yml (100%)
rename {fda-container-managing-service => fda-container-service}/rest-service/src/main/resources/config.properties (100%)
rename {fda-container-managing-service => fda-container-service}/rest-service/src/test/java/at/tuwien/BaseIntegrationTest.java (100%)
rename {fda-container-managing-service => fda-container-service}/rest-service/src/test/java/at/tuwien/endpoint/EndpointTest.java (100%)
rename {fda-container-managing-service => fda-container-service}/rest-service/src/test/java/at/tuwien/mapper/BaseMappingTest.java (100%)
rename {fda-container-managing-service => fda-container-service}/rest-service/src/test/java/at/tuwien/mapper/ContainerMappingTest.java (100%)
rename {fda-container-managing-service => fda-container-service}/rest-service/src/test/java/at/tuwien/service/DockerIntegrationTest.java (100%)
rename {fda-container-managing-service => fda-container-service}/rest-service/src/test/java/at/tuwien/service/ServiceTest.java (100%)
rename {fda-container-managing-service => fda-container-service}/rest-service/src/test/resources/application.properties (100%)
rename {fda-container-managing-service => fda-container-service}/services/pom.xml (100%)
rename {fda-container-managing-service => fda-container-service}/services/src/main/java/at/tuwien/config/DockerConfig.java (100%)
rename {fda-container-managing-service => fda-container-service}/services/src/main/java/at/tuwien/entity/Auditable.java (100%)
rename {fda-container-managing-service => fda-container-service}/services/src/main/java/at/tuwien/entity/Container.java (100%)
rename {fda-container-managing-service => fda-container-service}/services/src/main/java/at/tuwien/entity/ContainerImage.java (100%)
rename {fda-container-managing-service => fda-container-service}/services/src/main/java/at/tuwien/entity/EnvironmentItem.java (100%)
rename {fda-container-managing-service => fda-container-service}/services/src/main/java/at/tuwien/exception/ContainerNotFoundException.java (100%)
rename {fda-container-managing-service => fda-container-service}/services/src/main/java/at/tuwien/exception/ContainerStillRunningException.java (100%)
rename {fda-container-managing-service => fda-container-service}/services/src/main/java/at/tuwien/exception/DockerClientException.java (100%)
rename {fda-container-managing-service => fda-container-service}/services/src/main/java/at/tuwien/exception/ImageAlreadyExistsException.java (100%)
rename {fda-container-managing-service => fda-container-service}/services/src/main/java/at/tuwien/exception/ImageNotFoundException.java (100%)
rename {fda-container-managing-service => fda-container-service}/services/src/main/java/at/tuwien/mapper/ContainerMapper.java (100%)
rename {fda-container-managing-service => fda-container-service}/services/src/main/java/at/tuwien/mapper/ImageMapper.java (100%)
rename {fda-container-managing-service => fda-container-service}/services/src/main/java/at/tuwien/repository/ContainerRepository.java (100%)
rename {fda-container-managing-service => fda-container-service}/services/src/main/java/at/tuwien/repository/ImageRepository.java (100%)
rename {fda-container-managing-service => fda-container-service}/services/src/main/java/at/tuwien/service/ContainerService.java (100%)
rename {fda-container-managing-service => fda-container-service}/services/src/main/java/at/tuwien/service/ImageService.java (100%)
rename {fda-database-managing-service => fda-database-service}/.gitignore (100%)
rename {fda-database-managing-service => fda-database-service}/.mvn/wrapper/MavenWrapperDownloader.java (100%)
rename {fda-database-managing-service => fda-database-service}/.mvn/wrapper/maven-wrapper.jar (100%)
rename {fda-database-managing-service => fda-database-service}/.mvn/wrapper/maven-wrapper.properties (100%)
rename {fda-database-managing-service => fda-database-service}/Dockerfile (100%)
rename {fda-database-managing-service => fda-database-service}/api/pom.xml (100%)
rename {fda-database-managing-service => fda-database-service}/api/src/main/java/at/tuwien/dto/IpAddressDto.java (100%)
rename {fda-database-managing-service => fda-database-service}/api/src/main/java/at/tuwien/dto/container/ContainerBriefDto.java (100%)
rename {fda-database-managing-service => fda-database-service}/api/src/main/java/at/tuwien/dto/container/ContainerDto.java (100%)
rename {fda-database-managing-service => fda-database-service}/api/src/main/java/at/tuwien/dto/container/ContainerStateDto.java (100%)
rename {fda-database-managing-service => fda-database-service}/api/src/main/java/at/tuwien/dto/database/DatabaseBriefDto.java (100%)
rename {fda-database-managing-service => fda-database-service}/api/src/main/java/at/tuwien/dto/database/DatabaseChangeDto.java (100%)
rename {fda-database-managing-service => fda-database-service}/api/src/main/java/at/tuwien/dto/database/DatabaseCreateDto.java (100%)
rename {fda-database-managing-service => fda-database-service}/api/src/main/java/at/tuwien/dto/image/ImageDto.java (100%)
rename {fda-database-managing-service => fda-database-service}/api/src/main/java/at/tuwien/dto/image/ImageEnvItemDto.java (100%)
rename {fda-database-managing-service => fda-database-service}/gateway/pom.xml (100%)
rename {fda-database-managing-service => fda-database-service}/gateway/src/main/java/at/tuwien/config/RestClient.java (100%)
rename {fda-database-managing-service => fda-database-service}/gateway/src/main/java/at/tuwien/endpoint/ContainerGateway.java (100%)
rename {fda-database-managing-service => fda-database-service}/gateway/src/main/java/at/tuwien/exception/ExternalComponentException.java (100%)
rename {fda-database-managing-service => fda-database-service}/gateway/src/main/java/at/tuwien/exception/ImageNotSupportedException.java (100%)
rename {fda-database-managing-service => fda-database-service}/mvnw (100%)
rename {fda-database-managing-service => fda-database-service}/mvnw.cmd (100%)
rename {fda-database-managing-service => fda-database-service}/pom.xml (100%)
rename {fda-database-managing-service => fda-database-service}/rest-service/pom.xml (100%)
rename {fda-database-managing-service => fda-database-service}/rest-service/src/main/java/at/tuwien/FdaDatabaseManagingApplication.java (100%)
rename {fda-database-managing-service => fda-database-service}/rest-service/src/main/java/at/tuwien/config/SwaggerConfig.java (100%)
rename {fda-database-managing-service => fda-database-service}/rest-service/src/main/java/at/tuwien/endpoints/DatabaseController.java (100%)
rename {fda-database-managing-service => fda-database-service}/rest-service/src/main/resources/application-docker.yml (100%)
rename {fda-database-managing-service => fda-database-service}/rest-service/src/main/resources/application.yml (100%)
rename {fda-database-managing-service => fda-database-service}/rest-service/src/main/resources/config.properties (100%)
rename {fda-database-managing-service => fda-database-service}/services/pom.xml (100%)
rename {fda-database-managing-service => fda-database-service}/services/src/main/java/at/tuwien/config/DatabaseConfig.java (100%)
rename {fda-database-managing-service => fda-database-service}/services/src/main/java/at/tuwien/entity/Auditable.java (100%)
rename {fda-database-managing-service => fda-database-service}/services/src/main/java/at/tuwien/entity/Container.java (100%)
rename {fda-database-managing-service => fda-database-service}/services/src/main/java/at/tuwien/entity/ContainerImage.java (100%)
rename {fda-database-managing-service => fda-database-service}/services/src/main/java/at/tuwien/entity/Database.java (100%)
rename {fda-database-managing-service => fda-database-service}/services/src/main/java/at/tuwien/entity/EnvironmentItem.java (100%)
rename {fda-database-managing-service => fda-database-service}/services/src/main/java/at/tuwien/entity/Table.java (100%)
rename {fda-database-managing-service => fda-database-service}/services/src/main/java/at/tuwien/entity/View.java (100%)
rename {fda-database-managing-service => fda-database-service}/services/src/main/java/at/tuwien/exception/ContainerNotFoundException.java (100%)
rename {fda-database-managing-service => fda-database-service}/services/src/main/java/at/tuwien/exception/DatabaseConnectionException.java (100%)
rename {fda-database-managing-service => fda-database-service}/services/src/main/java/at/tuwien/exception/DatabaseMalformedException.java (100%)
rename {fda-database-managing-service => fda-database-service}/services/src/main/java/at/tuwien/exception/DatabaseNotFoundException.java (100%)
rename {fda-database-managing-service => fda-database-service}/services/src/main/java/at/tuwien/mapper/DatabaseMapper.java (100%)
rename {fda-database-managing-service => fda-database-service}/services/src/main/java/at/tuwien/repository/ContainerRepository.java (100%)
rename {fda-database-managing-service => fda-database-service}/services/src/main/java/at/tuwien/repository/DatabaseRepository.java (100%)
rename {fda-database-managing-service => fda-database-service}/services/src/main/java/at/tuwien/service/DatabaseService.java (100%)
rename {fda-database-managing-service => fda-database-service}/services/src/main/java/at/tuwien/service/JdbcConnector.java (100%)
rename {fda-database-managing-service => fda-database-service}/services/src/main/java/at/tuwien/service/PostgresService.java (100%)
diff --git a/docker-compose.yml b/docker-compose.yml
index e66d91ea40..c1615cf983 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -63,8 +63,8 @@ services:
- 9095:9095
links:
- fda-discovery-server
- - fda-database-managing-service
- - fda-container-managing-service
+ - fda-database-service
+ - fda-container-service
- fda-query-service
- fda-table-service
depends_on:
@@ -72,13 +72,12 @@ services:
logging:
driver: json-file
- fda-database-managing-service:
+ fda-database-service:
restart: always
- container_name: fda-database-managing-service
- hostname: fda-database-managing-service
- build:
- context: ./fda-database-managing-service
- image: fda-database-managing-service
+ container_name: fda-database-service
+ hostname: fda-database-service
+ build: ./fda-database-service
+ image: fda-database-service
networks:
- fda-userdb
- fda-public
@@ -88,21 +87,21 @@ services:
- 9092:9092
links:
- fda-discovery-server
- - fda-container-managing-service
+ - fda-container-service
- fda-metadata-db
depends_on:
- fda-discovery-server
- - fda-container-managing-service
+ - fda-container-service
- fda-metadata-db
logging:
driver: json-file
- fda-container-managing-service:
+ fda-container-service:
restart: always
- container_name: fda-container-managing-service
- hostname: fda-container-managing-service
- build: ./fda-container-managing-service
- image: fda-container-managing-service
+ container_name: fda-container-service
+ hostname: fda-container-service
+ build: ./fda-container-service
+ image: fda-container-service
networks:
- fda-public
environment:
@@ -136,10 +135,10 @@ services:
- /tmp:/tmp
links:
- fda-discovery-server
- - fda-container-managing-service
+ - fda-container-service
depends_on:
- fda-discovery-server
- - fda-container-managing-service
+ - fda-container-service
logging:
driver: json-file
@@ -202,8 +201,8 @@ services:
ports:
- 3000:3000
depends_on:
- - fda-container-managing-service
- - fda-database-managing-service
+ - fda-container-service
+ - fda-database-service
environment:
HOST: 0.0.0.0
API_URL: //fda-database-managing-service:9092/api
diff --git a/fda-container-managing-service/.gitignore b/fda-container-service/.gitignore
similarity index 100%
rename from fda-container-managing-service/.gitignore
rename to fda-container-service/.gitignore
diff --git a/fda-container-managing-service/.mvn/wrapper/MavenWrapperDownloader.java b/fda-container-service/.mvn/wrapper/MavenWrapperDownloader.java
similarity index 100%
rename from fda-container-managing-service/.mvn/wrapper/MavenWrapperDownloader.java
rename to fda-container-service/.mvn/wrapper/MavenWrapperDownloader.java
diff --git a/fda-container-managing-service/.mvn/wrapper/maven-wrapper.jar b/fda-container-service/.mvn/wrapper/maven-wrapper.jar
similarity index 100%
rename from fda-container-managing-service/.mvn/wrapper/maven-wrapper.jar
rename to fda-container-service/.mvn/wrapper/maven-wrapper.jar
diff --git a/fda-container-managing-service/.mvn/wrapper/maven-wrapper.properties b/fda-container-service/.mvn/wrapper/maven-wrapper.properties
similarity index 100%
rename from fda-container-managing-service/.mvn/wrapper/maven-wrapper.properties
rename to fda-container-service/.mvn/wrapper/maven-wrapper.properties
diff --git a/fda-container-managing-service/Dockerfile b/fda-container-service/Dockerfile
similarity index 100%
rename from fda-container-managing-service/Dockerfile
rename to fda-container-service/Dockerfile
diff --git a/fda-container-managing-service/api/pom.xml b/fda-container-service/api/pom.xml
similarity index 100%
rename from fda-container-managing-service/api/pom.xml
rename to fda-container-service/api/pom.xml
diff --git a/fda-container-managing-service/api/src/main/java/at/tuwien/api/dto/IpAddressDto.java b/fda-container-service/api/src/main/java/at/tuwien/api/dto/IpAddressDto.java
similarity index 100%
rename from fda-container-managing-service/api/src/main/java/at/tuwien/api/dto/IpAddressDto.java
rename to fda-container-service/api/src/main/java/at/tuwien/api/dto/IpAddressDto.java
diff --git a/fda-container-managing-service/api/src/main/java/at/tuwien/api/dto/container/ContainerActionTypeDto.java b/fda-container-service/api/src/main/java/at/tuwien/api/dto/container/ContainerActionTypeDto.java
similarity index 100%
rename from fda-container-managing-service/api/src/main/java/at/tuwien/api/dto/container/ContainerActionTypeDto.java
rename to fda-container-service/api/src/main/java/at/tuwien/api/dto/container/ContainerActionTypeDto.java
diff --git a/fda-container-managing-service/api/src/main/java/at/tuwien/api/dto/container/ContainerBriefDto.java b/fda-container-service/api/src/main/java/at/tuwien/api/dto/container/ContainerBriefDto.java
similarity index 100%
rename from fda-container-managing-service/api/src/main/java/at/tuwien/api/dto/container/ContainerBriefDto.java
rename to fda-container-service/api/src/main/java/at/tuwien/api/dto/container/ContainerBriefDto.java
diff --git a/fda-container-managing-service/api/src/main/java/at/tuwien/api/dto/container/ContainerChangeDto.java b/fda-container-service/api/src/main/java/at/tuwien/api/dto/container/ContainerChangeDto.java
similarity index 100%
rename from fda-container-managing-service/api/src/main/java/at/tuwien/api/dto/container/ContainerChangeDto.java
rename to fda-container-service/api/src/main/java/at/tuwien/api/dto/container/ContainerChangeDto.java
diff --git a/fda-container-managing-service/api/src/main/java/at/tuwien/api/dto/container/ContainerCreateRequestDto.java b/fda-container-service/api/src/main/java/at/tuwien/api/dto/container/ContainerCreateRequestDto.java
similarity index 100%
rename from fda-container-managing-service/api/src/main/java/at/tuwien/api/dto/container/ContainerCreateRequestDto.java
rename to fda-container-service/api/src/main/java/at/tuwien/api/dto/container/ContainerCreateRequestDto.java
diff --git a/fda-container-managing-service/api/src/main/java/at/tuwien/api/dto/container/ContainerDto.java b/fda-container-service/api/src/main/java/at/tuwien/api/dto/container/ContainerDto.java
similarity index 100%
rename from fda-container-managing-service/api/src/main/java/at/tuwien/api/dto/container/ContainerDto.java
rename to fda-container-service/api/src/main/java/at/tuwien/api/dto/container/ContainerDto.java
diff --git a/fda-container-managing-service/api/src/main/java/at/tuwien/api/dto/container/ContainerStateDto.java b/fda-container-service/api/src/main/java/at/tuwien/api/dto/container/ContainerStateDto.java
similarity index 100%
rename from fda-container-managing-service/api/src/main/java/at/tuwien/api/dto/container/ContainerStateDto.java
rename to fda-container-service/api/src/main/java/at/tuwien/api/dto/container/ContainerStateDto.java
diff --git a/fda-container-managing-service/api/src/main/java/at/tuwien/api/dto/image/ImageBriefDto.java b/fda-container-service/api/src/main/java/at/tuwien/api/dto/image/ImageBriefDto.java
similarity index 100%
rename from fda-container-managing-service/api/src/main/java/at/tuwien/api/dto/image/ImageBriefDto.java
rename to fda-container-service/api/src/main/java/at/tuwien/api/dto/image/ImageBriefDto.java
diff --git a/fda-container-managing-service/api/src/main/java/at/tuwien/api/dto/image/ImageChangeDto.java b/fda-container-service/api/src/main/java/at/tuwien/api/dto/image/ImageChangeDto.java
similarity index 100%
rename from fda-container-managing-service/api/src/main/java/at/tuwien/api/dto/image/ImageChangeDto.java
rename to fda-container-service/api/src/main/java/at/tuwien/api/dto/image/ImageChangeDto.java
diff --git a/fda-container-managing-service/api/src/main/java/at/tuwien/api/dto/image/ImageCreateDto.java b/fda-container-service/api/src/main/java/at/tuwien/api/dto/image/ImageCreateDto.java
similarity index 100%
rename from fda-container-managing-service/api/src/main/java/at/tuwien/api/dto/image/ImageCreateDto.java
rename to fda-container-service/api/src/main/java/at/tuwien/api/dto/image/ImageCreateDto.java
diff --git a/fda-container-managing-service/api/src/main/java/at/tuwien/api/dto/image/ImageDto.java b/fda-container-service/api/src/main/java/at/tuwien/api/dto/image/ImageDto.java
similarity index 100%
rename from fda-container-managing-service/api/src/main/java/at/tuwien/api/dto/image/ImageDto.java
rename to fda-container-service/api/src/main/java/at/tuwien/api/dto/image/ImageDto.java
diff --git a/fda-container-managing-service/api/src/main/java/at/tuwien/api/dto/image/ImageEnvItemDto.java b/fda-container-service/api/src/main/java/at/tuwien/api/dto/image/ImageEnvItemDto.java
similarity index 100%
rename from fda-container-managing-service/api/src/main/java/at/tuwien/api/dto/image/ImageEnvItemDto.java
rename to fda-container-service/api/src/main/java/at/tuwien/api/dto/image/ImageEnvItemDto.java
diff --git a/fda-container-managing-service/api/src/main/java/at/tuwien/api/pom.xml b/fda-container-service/api/src/main/java/at/tuwien/api/pom.xml
similarity index 100%
rename from fda-container-managing-service/api/src/main/java/at/tuwien/api/pom.xml
rename to fda-container-service/api/src/main/java/at/tuwien/api/pom.xml
diff --git a/fda-container-managing-service/mvnw b/fda-container-service/mvnw
similarity index 100%
rename from fda-container-managing-service/mvnw
rename to fda-container-service/mvnw
diff --git a/fda-container-managing-service/mvnw.cmd b/fda-container-service/mvnw.cmd
similarity index 100%
rename from fda-container-managing-service/mvnw.cmd
rename to fda-container-service/mvnw.cmd
diff --git a/fda-container-managing-service/pom.xml b/fda-container-service/pom.xml
similarity index 100%
rename from fda-container-managing-service/pom.xml
rename to fda-container-service/pom.xml
diff --git a/fda-container-managing-service/rest-service/pom.xml b/fda-container-service/rest-service/pom.xml
similarity index 100%
rename from fda-container-managing-service/rest-service/pom.xml
rename to fda-container-service/rest-service/pom.xml
diff --git a/fda-container-managing-service/rest-service/src/main/java/at/tuwien/FdaContainerManagingApplication.java b/fda-container-service/rest-service/src/main/java/at/tuwien/FdaContainerManagingApplication.java
similarity index 100%
rename from fda-container-managing-service/rest-service/src/main/java/at/tuwien/FdaContainerManagingApplication.java
rename to fda-container-service/rest-service/src/main/java/at/tuwien/FdaContainerManagingApplication.java
diff --git a/fda-container-managing-service/rest-service/src/main/java/at/tuwien/config/SwaggerConfig.java b/fda-container-service/rest-service/src/main/java/at/tuwien/config/SwaggerConfig.java
similarity index 100%
rename from fda-container-managing-service/rest-service/src/main/java/at/tuwien/config/SwaggerConfig.java
rename to fda-container-service/rest-service/src/main/java/at/tuwien/config/SwaggerConfig.java
diff --git a/fda-container-managing-service/rest-service/src/main/java/at/tuwien/endpoints/ContainerEndpoint.java b/fda-container-service/rest-service/src/main/java/at/tuwien/endpoints/ContainerEndpoint.java
similarity index 100%
rename from fda-container-managing-service/rest-service/src/main/java/at/tuwien/endpoints/ContainerEndpoint.java
rename to fda-container-service/rest-service/src/main/java/at/tuwien/endpoints/ContainerEndpoint.java
diff --git a/fda-container-managing-service/rest-service/src/main/java/at/tuwien/endpoints/ImageEndpoint.java b/fda-container-service/rest-service/src/main/java/at/tuwien/endpoints/ImageEndpoint.java
similarity index 100%
rename from fda-container-managing-service/rest-service/src/main/java/at/tuwien/endpoints/ImageEndpoint.java
rename to fda-container-service/rest-service/src/main/java/at/tuwien/endpoints/ImageEndpoint.java
diff --git a/fda-container-managing-service/rest-service/src/main/resources/CreateDB.sql b/fda-container-service/rest-service/src/main/resources/CreateDB.sql
similarity index 100%
rename from fda-container-managing-service/rest-service/src/main/resources/CreateDB.sql
rename to fda-container-service/rest-service/src/main/resources/CreateDB.sql
diff --git a/fda-container-managing-service/rest-service/src/main/resources/Dockerfile b/fda-container-service/rest-service/src/main/resources/Dockerfile
similarity index 100%
rename from fda-container-managing-service/rest-service/src/main/resources/Dockerfile
rename to fda-container-service/rest-service/src/main/resources/Dockerfile
diff --git a/fda-container-managing-service/rest-service/src/main/resources/MDB/Dockerfile b/fda-container-service/rest-service/src/main/resources/MDB/Dockerfile
similarity index 100%
rename from fda-container-managing-service/rest-service/src/main/resources/MDB/Dockerfile
rename to fda-container-service/rest-service/src/main/resources/MDB/Dockerfile
diff --git a/fda-container-managing-service/rest-service/src/main/resources/MDB/createMDB.sql b/fda-container-service/rest-service/src/main/resources/MDB/createMDB.sql
similarity index 100%
rename from fda-container-managing-service/rest-service/src/main/resources/MDB/createMDB.sql
rename to fda-container-service/rest-service/src/main/resources/MDB/createMDB.sql
diff --git a/fda-container-managing-service/rest-service/src/main/resources/application-docker.yml b/fda-container-service/rest-service/src/main/resources/application-docker.yml
similarity index 100%
rename from fda-container-managing-service/rest-service/src/main/resources/application-docker.yml
rename to fda-container-service/rest-service/src/main/resources/application-docker.yml
diff --git a/fda-container-managing-service/rest-service/src/main/resources/application.yml b/fda-container-service/rest-service/src/main/resources/application.yml
similarity index 100%
rename from fda-container-managing-service/rest-service/src/main/resources/application.yml
rename to fda-container-service/rest-service/src/main/resources/application.yml
diff --git a/fda-container-managing-service/rest-service/src/main/resources/config.properties b/fda-container-service/rest-service/src/main/resources/config.properties
similarity index 100%
rename from fda-container-managing-service/rest-service/src/main/resources/config.properties
rename to fda-container-service/rest-service/src/main/resources/config.properties
diff --git a/fda-container-managing-service/rest-service/src/test/java/at/tuwien/BaseIntegrationTest.java b/fda-container-service/rest-service/src/test/java/at/tuwien/BaseIntegrationTest.java
similarity index 100%
rename from fda-container-managing-service/rest-service/src/test/java/at/tuwien/BaseIntegrationTest.java
rename to fda-container-service/rest-service/src/test/java/at/tuwien/BaseIntegrationTest.java
diff --git a/fda-container-managing-service/rest-service/src/test/java/at/tuwien/endpoint/EndpointTest.java b/fda-container-service/rest-service/src/test/java/at/tuwien/endpoint/EndpointTest.java
similarity index 100%
rename from fda-container-managing-service/rest-service/src/test/java/at/tuwien/endpoint/EndpointTest.java
rename to fda-container-service/rest-service/src/test/java/at/tuwien/endpoint/EndpointTest.java
diff --git a/fda-container-managing-service/rest-service/src/test/java/at/tuwien/mapper/BaseMappingTest.java b/fda-container-service/rest-service/src/test/java/at/tuwien/mapper/BaseMappingTest.java
similarity index 100%
rename from fda-container-managing-service/rest-service/src/test/java/at/tuwien/mapper/BaseMappingTest.java
rename to fda-container-service/rest-service/src/test/java/at/tuwien/mapper/BaseMappingTest.java
diff --git a/fda-container-managing-service/rest-service/src/test/java/at/tuwien/mapper/ContainerMappingTest.java b/fda-container-service/rest-service/src/test/java/at/tuwien/mapper/ContainerMappingTest.java
similarity index 100%
rename from fda-container-managing-service/rest-service/src/test/java/at/tuwien/mapper/ContainerMappingTest.java
rename to fda-container-service/rest-service/src/test/java/at/tuwien/mapper/ContainerMappingTest.java
diff --git a/fda-container-managing-service/rest-service/src/test/java/at/tuwien/service/DockerIntegrationTest.java b/fda-container-service/rest-service/src/test/java/at/tuwien/service/DockerIntegrationTest.java
similarity index 100%
rename from fda-container-managing-service/rest-service/src/test/java/at/tuwien/service/DockerIntegrationTest.java
rename to fda-container-service/rest-service/src/test/java/at/tuwien/service/DockerIntegrationTest.java
diff --git a/fda-container-managing-service/rest-service/src/test/java/at/tuwien/service/ServiceTest.java b/fda-container-service/rest-service/src/test/java/at/tuwien/service/ServiceTest.java
similarity index 100%
rename from fda-container-managing-service/rest-service/src/test/java/at/tuwien/service/ServiceTest.java
rename to fda-container-service/rest-service/src/test/java/at/tuwien/service/ServiceTest.java
diff --git a/fda-container-managing-service/rest-service/src/test/resources/application.properties b/fda-container-service/rest-service/src/test/resources/application.properties
similarity index 100%
rename from fda-container-managing-service/rest-service/src/test/resources/application.properties
rename to fda-container-service/rest-service/src/test/resources/application.properties
diff --git a/fda-container-managing-service/services/pom.xml b/fda-container-service/services/pom.xml
similarity index 100%
rename from fda-container-managing-service/services/pom.xml
rename to fda-container-service/services/pom.xml
diff --git a/fda-container-managing-service/services/src/main/java/at/tuwien/config/DockerConfig.java b/fda-container-service/services/src/main/java/at/tuwien/config/DockerConfig.java
similarity index 100%
rename from fda-container-managing-service/services/src/main/java/at/tuwien/config/DockerConfig.java
rename to fda-container-service/services/src/main/java/at/tuwien/config/DockerConfig.java
diff --git a/fda-container-managing-service/services/src/main/java/at/tuwien/entity/Auditable.java b/fda-container-service/services/src/main/java/at/tuwien/entity/Auditable.java
similarity index 100%
rename from fda-container-managing-service/services/src/main/java/at/tuwien/entity/Auditable.java
rename to fda-container-service/services/src/main/java/at/tuwien/entity/Auditable.java
diff --git a/fda-container-managing-service/services/src/main/java/at/tuwien/entity/Container.java b/fda-container-service/services/src/main/java/at/tuwien/entity/Container.java
similarity index 100%
rename from fda-container-managing-service/services/src/main/java/at/tuwien/entity/Container.java
rename to fda-container-service/services/src/main/java/at/tuwien/entity/Container.java
diff --git a/fda-container-managing-service/services/src/main/java/at/tuwien/entity/ContainerImage.java b/fda-container-service/services/src/main/java/at/tuwien/entity/ContainerImage.java
similarity index 100%
rename from fda-container-managing-service/services/src/main/java/at/tuwien/entity/ContainerImage.java
rename to fda-container-service/services/src/main/java/at/tuwien/entity/ContainerImage.java
diff --git a/fda-container-managing-service/services/src/main/java/at/tuwien/entity/EnvironmentItem.java b/fda-container-service/services/src/main/java/at/tuwien/entity/EnvironmentItem.java
similarity index 100%
rename from fda-container-managing-service/services/src/main/java/at/tuwien/entity/EnvironmentItem.java
rename to fda-container-service/services/src/main/java/at/tuwien/entity/EnvironmentItem.java
diff --git a/fda-container-managing-service/services/src/main/java/at/tuwien/exception/ContainerNotFoundException.java b/fda-container-service/services/src/main/java/at/tuwien/exception/ContainerNotFoundException.java
similarity index 100%
rename from fda-container-managing-service/services/src/main/java/at/tuwien/exception/ContainerNotFoundException.java
rename to fda-container-service/services/src/main/java/at/tuwien/exception/ContainerNotFoundException.java
diff --git a/fda-container-managing-service/services/src/main/java/at/tuwien/exception/ContainerStillRunningException.java b/fda-container-service/services/src/main/java/at/tuwien/exception/ContainerStillRunningException.java
similarity index 100%
rename from fda-container-managing-service/services/src/main/java/at/tuwien/exception/ContainerStillRunningException.java
rename to fda-container-service/services/src/main/java/at/tuwien/exception/ContainerStillRunningException.java
diff --git a/fda-container-managing-service/services/src/main/java/at/tuwien/exception/DockerClientException.java b/fda-container-service/services/src/main/java/at/tuwien/exception/DockerClientException.java
similarity index 100%
rename from fda-container-managing-service/services/src/main/java/at/tuwien/exception/DockerClientException.java
rename to fda-container-service/services/src/main/java/at/tuwien/exception/DockerClientException.java
diff --git a/fda-container-managing-service/services/src/main/java/at/tuwien/exception/ImageAlreadyExistsException.java b/fda-container-service/services/src/main/java/at/tuwien/exception/ImageAlreadyExistsException.java
similarity index 100%
rename from fda-container-managing-service/services/src/main/java/at/tuwien/exception/ImageAlreadyExistsException.java
rename to fda-container-service/services/src/main/java/at/tuwien/exception/ImageAlreadyExistsException.java
diff --git a/fda-container-managing-service/services/src/main/java/at/tuwien/exception/ImageNotFoundException.java b/fda-container-service/services/src/main/java/at/tuwien/exception/ImageNotFoundException.java
similarity index 100%
rename from fda-container-managing-service/services/src/main/java/at/tuwien/exception/ImageNotFoundException.java
rename to fda-container-service/services/src/main/java/at/tuwien/exception/ImageNotFoundException.java
diff --git a/fda-container-managing-service/services/src/main/java/at/tuwien/mapper/ContainerMapper.java b/fda-container-service/services/src/main/java/at/tuwien/mapper/ContainerMapper.java
similarity index 100%
rename from fda-container-managing-service/services/src/main/java/at/tuwien/mapper/ContainerMapper.java
rename to fda-container-service/services/src/main/java/at/tuwien/mapper/ContainerMapper.java
diff --git a/fda-container-managing-service/services/src/main/java/at/tuwien/mapper/ImageMapper.java b/fda-container-service/services/src/main/java/at/tuwien/mapper/ImageMapper.java
similarity index 100%
rename from fda-container-managing-service/services/src/main/java/at/tuwien/mapper/ImageMapper.java
rename to fda-container-service/services/src/main/java/at/tuwien/mapper/ImageMapper.java
diff --git a/fda-container-managing-service/services/src/main/java/at/tuwien/repository/ContainerRepository.java b/fda-container-service/services/src/main/java/at/tuwien/repository/ContainerRepository.java
similarity index 100%
rename from fda-container-managing-service/services/src/main/java/at/tuwien/repository/ContainerRepository.java
rename to fda-container-service/services/src/main/java/at/tuwien/repository/ContainerRepository.java
diff --git a/fda-container-managing-service/services/src/main/java/at/tuwien/repository/ImageRepository.java b/fda-container-service/services/src/main/java/at/tuwien/repository/ImageRepository.java
similarity index 100%
rename from fda-container-managing-service/services/src/main/java/at/tuwien/repository/ImageRepository.java
rename to fda-container-service/services/src/main/java/at/tuwien/repository/ImageRepository.java
diff --git a/fda-container-managing-service/services/src/main/java/at/tuwien/service/ContainerService.java b/fda-container-service/services/src/main/java/at/tuwien/service/ContainerService.java
similarity index 100%
rename from fda-container-managing-service/services/src/main/java/at/tuwien/service/ContainerService.java
rename to fda-container-service/services/src/main/java/at/tuwien/service/ContainerService.java
diff --git a/fda-container-managing-service/services/src/main/java/at/tuwien/service/ImageService.java b/fda-container-service/services/src/main/java/at/tuwien/service/ImageService.java
similarity index 100%
rename from fda-container-managing-service/services/src/main/java/at/tuwien/service/ImageService.java
rename to fda-container-service/services/src/main/java/at/tuwien/service/ImageService.java
diff --git a/fda-database-managing-service/.gitignore b/fda-database-service/.gitignore
similarity index 100%
rename from fda-database-managing-service/.gitignore
rename to fda-database-service/.gitignore
diff --git a/fda-database-managing-service/.mvn/wrapper/MavenWrapperDownloader.java b/fda-database-service/.mvn/wrapper/MavenWrapperDownloader.java
similarity index 100%
rename from fda-database-managing-service/.mvn/wrapper/MavenWrapperDownloader.java
rename to fda-database-service/.mvn/wrapper/MavenWrapperDownloader.java
diff --git a/fda-database-managing-service/.mvn/wrapper/maven-wrapper.jar b/fda-database-service/.mvn/wrapper/maven-wrapper.jar
similarity index 100%
rename from fda-database-managing-service/.mvn/wrapper/maven-wrapper.jar
rename to fda-database-service/.mvn/wrapper/maven-wrapper.jar
diff --git a/fda-database-managing-service/.mvn/wrapper/maven-wrapper.properties b/fda-database-service/.mvn/wrapper/maven-wrapper.properties
similarity index 100%
rename from fda-database-managing-service/.mvn/wrapper/maven-wrapper.properties
rename to fda-database-service/.mvn/wrapper/maven-wrapper.properties
diff --git a/fda-database-managing-service/Dockerfile b/fda-database-service/Dockerfile
similarity index 100%
rename from fda-database-managing-service/Dockerfile
rename to fda-database-service/Dockerfile
diff --git a/fda-database-managing-service/api/pom.xml b/fda-database-service/api/pom.xml
similarity index 100%
rename from fda-database-managing-service/api/pom.xml
rename to fda-database-service/api/pom.xml
diff --git a/fda-database-managing-service/api/src/main/java/at/tuwien/dto/IpAddressDto.java b/fda-database-service/api/src/main/java/at/tuwien/dto/IpAddressDto.java
similarity index 100%
rename from fda-database-managing-service/api/src/main/java/at/tuwien/dto/IpAddressDto.java
rename to fda-database-service/api/src/main/java/at/tuwien/dto/IpAddressDto.java
diff --git a/fda-database-managing-service/api/src/main/java/at/tuwien/dto/container/ContainerBriefDto.java b/fda-database-service/api/src/main/java/at/tuwien/dto/container/ContainerBriefDto.java
similarity index 100%
rename from fda-database-managing-service/api/src/main/java/at/tuwien/dto/container/ContainerBriefDto.java
rename to fda-database-service/api/src/main/java/at/tuwien/dto/container/ContainerBriefDto.java
diff --git a/fda-database-managing-service/api/src/main/java/at/tuwien/dto/container/ContainerDto.java b/fda-database-service/api/src/main/java/at/tuwien/dto/container/ContainerDto.java
similarity index 100%
rename from fda-database-managing-service/api/src/main/java/at/tuwien/dto/container/ContainerDto.java
rename to fda-database-service/api/src/main/java/at/tuwien/dto/container/ContainerDto.java
diff --git a/fda-database-managing-service/api/src/main/java/at/tuwien/dto/container/ContainerStateDto.java b/fda-database-service/api/src/main/java/at/tuwien/dto/container/ContainerStateDto.java
similarity index 100%
rename from fda-database-managing-service/api/src/main/java/at/tuwien/dto/container/ContainerStateDto.java
rename to fda-database-service/api/src/main/java/at/tuwien/dto/container/ContainerStateDto.java
diff --git a/fda-database-managing-service/api/src/main/java/at/tuwien/dto/database/DatabaseBriefDto.java b/fda-database-service/api/src/main/java/at/tuwien/dto/database/DatabaseBriefDto.java
similarity index 100%
rename from fda-database-managing-service/api/src/main/java/at/tuwien/dto/database/DatabaseBriefDto.java
rename to fda-database-service/api/src/main/java/at/tuwien/dto/database/DatabaseBriefDto.java
diff --git a/fda-database-managing-service/api/src/main/java/at/tuwien/dto/database/DatabaseChangeDto.java b/fda-database-service/api/src/main/java/at/tuwien/dto/database/DatabaseChangeDto.java
similarity index 100%
rename from fda-database-managing-service/api/src/main/java/at/tuwien/dto/database/DatabaseChangeDto.java
rename to fda-database-service/api/src/main/java/at/tuwien/dto/database/DatabaseChangeDto.java
diff --git a/fda-database-managing-service/api/src/main/java/at/tuwien/dto/database/DatabaseCreateDto.java b/fda-database-service/api/src/main/java/at/tuwien/dto/database/DatabaseCreateDto.java
similarity index 100%
rename from fda-database-managing-service/api/src/main/java/at/tuwien/dto/database/DatabaseCreateDto.java
rename to fda-database-service/api/src/main/java/at/tuwien/dto/database/DatabaseCreateDto.java
diff --git a/fda-database-managing-service/api/src/main/java/at/tuwien/dto/image/ImageDto.java b/fda-database-service/api/src/main/java/at/tuwien/dto/image/ImageDto.java
similarity index 100%
rename from fda-database-managing-service/api/src/main/java/at/tuwien/dto/image/ImageDto.java
rename to fda-database-service/api/src/main/java/at/tuwien/dto/image/ImageDto.java
diff --git a/fda-database-managing-service/api/src/main/java/at/tuwien/dto/image/ImageEnvItemDto.java b/fda-database-service/api/src/main/java/at/tuwien/dto/image/ImageEnvItemDto.java
similarity index 100%
rename from fda-database-managing-service/api/src/main/java/at/tuwien/dto/image/ImageEnvItemDto.java
rename to fda-database-service/api/src/main/java/at/tuwien/dto/image/ImageEnvItemDto.java
diff --git a/fda-database-managing-service/gateway/pom.xml b/fda-database-service/gateway/pom.xml
similarity index 100%
rename from fda-database-managing-service/gateway/pom.xml
rename to fda-database-service/gateway/pom.xml
diff --git a/fda-database-managing-service/gateway/src/main/java/at/tuwien/config/RestClient.java b/fda-database-service/gateway/src/main/java/at/tuwien/config/RestClient.java
similarity index 100%
rename from fda-database-managing-service/gateway/src/main/java/at/tuwien/config/RestClient.java
rename to fda-database-service/gateway/src/main/java/at/tuwien/config/RestClient.java
diff --git a/fda-database-managing-service/gateway/src/main/java/at/tuwien/endpoint/ContainerGateway.java b/fda-database-service/gateway/src/main/java/at/tuwien/endpoint/ContainerGateway.java
similarity index 100%
rename from fda-database-managing-service/gateway/src/main/java/at/tuwien/endpoint/ContainerGateway.java
rename to fda-database-service/gateway/src/main/java/at/tuwien/endpoint/ContainerGateway.java
diff --git a/fda-database-managing-service/gateway/src/main/java/at/tuwien/exception/ExternalComponentException.java b/fda-database-service/gateway/src/main/java/at/tuwien/exception/ExternalComponentException.java
similarity index 100%
rename from fda-database-managing-service/gateway/src/main/java/at/tuwien/exception/ExternalComponentException.java
rename to fda-database-service/gateway/src/main/java/at/tuwien/exception/ExternalComponentException.java
diff --git a/fda-database-managing-service/gateway/src/main/java/at/tuwien/exception/ImageNotSupportedException.java b/fda-database-service/gateway/src/main/java/at/tuwien/exception/ImageNotSupportedException.java
similarity index 100%
rename from fda-database-managing-service/gateway/src/main/java/at/tuwien/exception/ImageNotSupportedException.java
rename to fda-database-service/gateway/src/main/java/at/tuwien/exception/ImageNotSupportedException.java
diff --git a/fda-database-managing-service/mvnw b/fda-database-service/mvnw
similarity index 100%
rename from fda-database-managing-service/mvnw
rename to fda-database-service/mvnw
diff --git a/fda-database-managing-service/mvnw.cmd b/fda-database-service/mvnw.cmd
similarity index 100%
rename from fda-database-managing-service/mvnw.cmd
rename to fda-database-service/mvnw.cmd
diff --git a/fda-database-managing-service/pom.xml b/fda-database-service/pom.xml
similarity index 100%
rename from fda-database-managing-service/pom.xml
rename to fda-database-service/pom.xml
diff --git a/fda-database-managing-service/rest-service/pom.xml b/fda-database-service/rest-service/pom.xml
similarity index 100%
rename from fda-database-managing-service/rest-service/pom.xml
rename to fda-database-service/rest-service/pom.xml
diff --git a/fda-database-managing-service/rest-service/src/main/java/at/tuwien/FdaDatabaseManagingApplication.java b/fda-database-service/rest-service/src/main/java/at/tuwien/FdaDatabaseManagingApplication.java
similarity index 100%
rename from fda-database-managing-service/rest-service/src/main/java/at/tuwien/FdaDatabaseManagingApplication.java
rename to fda-database-service/rest-service/src/main/java/at/tuwien/FdaDatabaseManagingApplication.java
diff --git a/fda-database-managing-service/rest-service/src/main/java/at/tuwien/config/SwaggerConfig.java b/fda-database-service/rest-service/src/main/java/at/tuwien/config/SwaggerConfig.java
similarity index 100%
rename from fda-database-managing-service/rest-service/src/main/java/at/tuwien/config/SwaggerConfig.java
rename to fda-database-service/rest-service/src/main/java/at/tuwien/config/SwaggerConfig.java
diff --git a/fda-database-managing-service/rest-service/src/main/java/at/tuwien/endpoints/DatabaseController.java b/fda-database-service/rest-service/src/main/java/at/tuwien/endpoints/DatabaseController.java
similarity index 100%
rename from fda-database-managing-service/rest-service/src/main/java/at/tuwien/endpoints/DatabaseController.java
rename to fda-database-service/rest-service/src/main/java/at/tuwien/endpoints/DatabaseController.java
diff --git a/fda-database-managing-service/rest-service/src/main/resources/application-docker.yml b/fda-database-service/rest-service/src/main/resources/application-docker.yml
similarity index 100%
rename from fda-database-managing-service/rest-service/src/main/resources/application-docker.yml
rename to fda-database-service/rest-service/src/main/resources/application-docker.yml
diff --git a/fda-database-managing-service/rest-service/src/main/resources/application.yml b/fda-database-service/rest-service/src/main/resources/application.yml
similarity index 100%
rename from fda-database-managing-service/rest-service/src/main/resources/application.yml
rename to fda-database-service/rest-service/src/main/resources/application.yml
diff --git a/fda-database-managing-service/rest-service/src/main/resources/config.properties b/fda-database-service/rest-service/src/main/resources/config.properties
similarity index 100%
rename from fda-database-managing-service/rest-service/src/main/resources/config.properties
rename to fda-database-service/rest-service/src/main/resources/config.properties
diff --git a/fda-database-managing-service/services/pom.xml b/fda-database-service/services/pom.xml
similarity index 100%
rename from fda-database-managing-service/services/pom.xml
rename to fda-database-service/services/pom.xml
diff --git a/fda-database-managing-service/services/src/main/java/at/tuwien/config/DatabaseConfig.java b/fda-database-service/services/src/main/java/at/tuwien/config/DatabaseConfig.java
similarity index 100%
rename from fda-database-managing-service/services/src/main/java/at/tuwien/config/DatabaseConfig.java
rename to fda-database-service/services/src/main/java/at/tuwien/config/DatabaseConfig.java
diff --git a/fda-database-managing-service/services/src/main/java/at/tuwien/entity/Auditable.java b/fda-database-service/services/src/main/java/at/tuwien/entity/Auditable.java
similarity index 100%
rename from fda-database-managing-service/services/src/main/java/at/tuwien/entity/Auditable.java
rename to fda-database-service/services/src/main/java/at/tuwien/entity/Auditable.java
diff --git a/fda-database-managing-service/services/src/main/java/at/tuwien/entity/Container.java b/fda-database-service/services/src/main/java/at/tuwien/entity/Container.java
similarity index 100%
rename from fda-database-managing-service/services/src/main/java/at/tuwien/entity/Container.java
rename to fda-database-service/services/src/main/java/at/tuwien/entity/Container.java
diff --git a/fda-database-managing-service/services/src/main/java/at/tuwien/entity/ContainerImage.java b/fda-database-service/services/src/main/java/at/tuwien/entity/ContainerImage.java
similarity index 100%
rename from fda-database-managing-service/services/src/main/java/at/tuwien/entity/ContainerImage.java
rename to fda-database-service/services/src/main/java/at/tuwien/entity/ContainerImage.java
diff --git a/fda-database-managing-service/services/src/main/java/at/tuwien/entity/Database.java b/fda-database-service/services/src/main/java/at/tuwien/entity/Database.java
similarity index 100%
rename from fda-database-managing-service/services/src/main/java/at/tuwien/entity/Database.java
rename to fda-database-service/services/src/main/java/at/tuwien/entity/Database.java
diff --git a/fda-database-managing-service/services/src/main/java/at/tuwien/entity/EnvironmentItem.java b/fda-database-service/services/src/main/java/at/tuwien/entity/EnvironmentItem.java
similarity index 100%
rename from fda-database-managing-service/services/src/main/java/at/tuwien/entity/EnvironmentItem.java
rename to fda-database-service/services/src/main/java/at/tuwien/entity/EnvironmentItem.java
diff --git a/fda-database-managing-service/services/src/main/java/at/tuwien/entity/Table.java b/fda-database-service/services/src/main/java/at/tuwien/entity/Table.java
similarity index 100%
rename from fda-database-managing-service/services/src/main/java/at/tuwien/entity/Table.java
rename to fda-database-service/services/src/main/java/at/tuwien/entity/Table.java
diff --git a/fda-database-managing-service/services/src/main/java/at/tuwien/entity/View.java b/fda-database-service/services/src/main/java/at/tuwien/entity/View.java
similarity index 100%
rename from fda-database-managing-service/services/src/main/java/at/tuwien/entity/View.java
rename to fda-database-service/services/src/main/java/at/tuwien/entity/View.java
diff --git a/fda-database-managing-service/services/src/main/java/at/tuwien/exception/ContainerNotFoundException.java b/fda-database-service/services/src/main/java/at/tuwien/exception/ContainerNotFoundException.java
similarity index 100%
rename from fda-database-managing-service/services/src/main/java/at/tuwien/exception/ContainerNotFoundException.java
rename to fda-database-service/services/src/main/java/at/tuwien/exception/ContainerNotFoundException.java
diff --git a/fda-database-managing-service/services/src/main/java/at/tuwien/exception/DatabaseConnectionException.java b/fda-database-service/services/src/main/java/at/tuwien/exception/DatabaseConnectionException.java
similarity index 100%
rename from fda-database-managing-service/services/src/main/java/at/tuwien/exception/DatabaseConnectionException.java
rename to fda-database-service/services/src/main/java/at/tuwien/exception/DatabaseConnectionException.java
diff --git a/fda-database-managing-service/services/src/main/java/at/tuwien/exception/DatabaseMalformedException.java b/fda-database-service/services/src/main/java/at/tuwien/exception/DatabaseMalformedException.java
similarity index 100%
rename from fda-database-managing-service/services/src/main/java/at/tuwien/exception/DatabaseMalformedException.java
rename to fda-database-service/services/src/main/java/at/tuwien/exception/DatabaseMalformedException.java
diff --git a/fda-database-managing-service/services/src/main/java/at/tuwien/exception/DatabaseNotFoundException.java b/fda-database-service/services/src/main/java/at/tuwien/exception/DatabaseNotFoundException.java
similarity index 100%
rename from fda-database-managing-service/services/src/main/java/at/tuwien/exception/DatabaseNotFoundException.java
rename to fda-database-service/services/src/main/java/at/tuwien/exception/DatabaseNotFoundException.java
diff --git a/fda-database-managing-service/services/src/main/java/at/tuwien/mapper/DatabaseMapper.java b/fda-database-service/services/src/main/java/at/tuwien/mapper/DatabaseMapper.java
similarity index 100%
rename from fda-database-managing-service/services/src/main/java/at/tuwien/mapper/DatabaseMapper.java
rename to fda-database-service/services/src/main/java/at/tuwien/mapper/DatabaseMapper.java
diff --git a/fda-database-managing-service/services/src/main/java/at/tuwien/repository/ContainerRepository.java b/fda-database-service/services/src/main/java/at/tuwien/repository/ContainerRepository.java
similarity index 100%
rename from fda-database-managing-service/services/src/main/java/at/tuwien/repository/ContainerRepository.java
rename to fda-database-service/services/src/main/java/at/tuwien/repository/ContainerRepository.java
diff --git a/fda-database-managing-service/services/src/main/java/at/tuwien/repository/DatabaseRepository.java b/fda-database-service/services/src/main/java/at/tuwien/repository/DatabaseRepository.java
similarity index 100%
rename from fda-database-managing-service/services/src/main/java/at/tuwien/repository/DatabaseRepository.java
rename to fda-database-service/services/src/main/java/at/tuwien/repository/DatabaseRepository.java
diff --git a/fda-database-managing-service/services/src/main/java/at/tuwien/service/DatabaseService.java b/fda-database-service/services/src/main/java/at/tuwien/service/DatabaseService.java
similarity index 100%
rename from fda-database-managing-service/services/src/main/java/at/tuwien/service/DatabaseService.java
rename to fda-database-service/services/src/main/java/at/tuwien/service/DatabaseService.java
diff --git a/fda-database-managing-service/services/src/main/java/at/tuwien/service/JdbcConnector.java b/fda-database-service/services/src/main/java/at/tuwien/service/JdbcConnector.java
similarity index 100%
rename from fda-database-managing-service/services/src/main/java/at/tuwien/service/JdbcConnector.java
rename to fda-database-service/services/src/main/java/at/tuwien/service/JdbcConnector.java
diff --git a/fda-database-managing-service/services/src/main/java/at/tuwien/service/PostgresService.java b/fda-database-service/services/src/main/java/at/tuwien/service/PostgresService.java
similarity index 100%
rename from fda-database-managing-service/services/src/main/java/at/tuwien/service/PostgresService.java
rename to fda-database-service/services/src/main/java/at/tuwien/service/PostgresService.java
diff --git a/fda-table-service/api/src/main/java/at/tuwien/dto/table/TableBriefDto.java b/fda-table-service/api/src/main/java/at/tuwien/dto/table/TableBriefDto.java
index a8fde192c7..e6c4ada092 100644
--- a/fda-table-service/api/src/main/java/at/tuwien/dto/table/TableBriefDto.java
+++ b/fda-table-service/api/src/main/java/at/tuwien/dto/table/TableBriefDto.java
@@ -1,12 +1,20 @@
package at.tuwien.dto.table;
+import io.swagger.annotations.ApiModelProperty;
import lombok.Getter;
import lombok.Setter;
+import lombok.ToString;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
@Getter
@Setter
+@ToString
public class TableBriefDto {
+ @NotNull
+ @ApiModelProperty(name = "table id", example = "1")
private Long id;
}
diff --git a/fda-table-service/api/src/main/java/at/tuwien/dto/table/TableCreateDto.java b/fda-table-service/api/src/main/java/at/tuwien/dto/table/TableCreateDto.java
index e75c7d3509..6de5d6a6be 100644
--- a/fda-table-service/api/src/main/java/at/tuwien/dto/table/TableCreateDto.java
+++ b/fda-table-service/api/src/main/java/at/tuwien/dto/table/TableCreateDto.java
@@ -2,22 +2,28 @@ package at.tuwien.dto.table;
import at.tuwien.dto.table.columns.ColumnCreateDto;
import at.tuwien.dto.table.columns.ColumnDto;
+import io.swagger.annotations.ApiModelProperty;
import io.swagger.v3.oas.annotations.Parameter;
import lombok.Getter;
import lombok.Setter;
+import lombok.ToString;
import javax.validation.constraints.NotBlank;
import javax.validation.constraints.Size;
@Getter
@Setter
+@ToString
public class TableCreateDto {
@NotBlank
- @Size(min = 3)
- @Parameter(name = "table name", required = true)
+ @ApiModelProperty(name = "name", example = "Fundamentals")
private String name;
+ @NotBlank
+ @ApiModelProperty(name = "name", example = "fundamentals")
+ private String internalName;
+
@NotBlank
@Parameter(name = "table description", required = true)
private String description;
diff --git a/fda-table-service/api/src/main/java/at/tuwien/dto/table/TableDto.java b/fda-table-service/api/src/main/java/at/tuwien/dto/table/TableDto.java
index 5264084761..c5ece18acb 100644
--- a/fda-table-service/api/src/main/java/at/tuwien/dto/table/TableDto.java
+++ b/fda-table-service/api/src/main/java/at/tuwien/dto/table/TableDto.java
@@ -2,32 +2,33 @@ package at.tuwien.dto.table;
import at.tuwien.dto.table.columns.ColumnDto;
import at.tuwien.dto.table.columns.RowDto;
-import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.annotations.ApiModelProperty;
import lombok.Getter;
import lombok.Setter;
+import lombok.ToString;
import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.Size;
+import javax.validation.constraints.NotNull;
@Getter
@Setter
+@ToString
public class TableDto extends TableBriefDto {
@NotBlank
- @Size(min = 3)
- @Parameter(name = "table name", required = true)
+ @ApiModelProperty(name = "table name", example = "Fundamentals")
private String name;
@NotBlank
- @Parameter(name = "table description", required = true)
+ @ApiModelProperty(name = "table description", example = "SEC 10K annual fillings (2016-2012) ")
private String description;
- @NotBlank
- @Parameter(name = "table columns", required = true)
+ @NotNull
+ @ApiModelProperty(name = "table columns")
private ColumnDto[] columns;
- @NotBlank
- @Parameter(name = "table rows", required = true, description = "must have the same length of columns")
+ @NotNull
+ @ApiModelProperty(name = "table rows")
private RowDto[] rows;
}
diff --git a/fda-table-service/api/src/main/java/at/tuwien/dto/table/columns/ColumnCreateDto.java b/fda-table-service/api/src/main/java/at/tuwien/dto/table/columns/ColumnCreateDto.java
index a45b98bcaa..cbee11ff36 100644
--- a/fda-table-service/api/src/main/java/at/tuwien/dto/table/columns/ColumnCreateDto.java
+++ b/fda-table-service/api/src/main/java/at/tuwien/dto/table/columns/ColumnCreateDto.java
@@ -1,32 +1,35 @@
package at.tuwien.dto.table.columns;
+import io.swagger.annotations.ApiModelProperty;
import io.swagger.v3.oas.annotations.Parameter;
import lombok.Getter;
import lombok.Setter;
+import lombok.ToString;
import javax.validation.constraints.NotBlank;
import javax.validation.constraints.NotNull;
@Getter
@Setter
+@ToString
public class ColumnCreateDto {
@NotBlank
- @Parameter(name = "column name")
+ @ApiModelProperty(name = "name", example = "Ticker Symbol")
private String name;
@NotNull
- @Parameter(name = "column type")
+ @ApiModelProperty(name = "name", example = "STRING")
private ColumnTypeDto type;
@NotNull
- @Parameter(name = "column null")
+ @ApiModelProperty(name = "null values permitted", example = "true")
private Boolean nullAllowed = true;
- @Parameter(name = "column check")
+ @ApiModelProperty(name = "check expression", example = "column > 0")
private String checkExpression;
- @Parameter(name = "column foreign key")
+ @ApiModelProperty(name = "foreign key")
private String foreignKey;
}
diff --git a/fda-table-service/api/src/main/java/at/tuwien/dto/table/columns/ColumnDto.java b/fda-table-service/api/src/main/java/at/tuwien/dto/table/columns/ColumnDto.java
index c189b637c3..200032acdb 100644
--- a/fda-table-service/api/src/main/java/at/tuwien/dto/table/columns/ColumnDto.java
+++ b/fda-table-service/api/src/main/java/at/tuwien/dto/table/columns/ColumnDto.java
@@ -3,11 +3,13 @@ package at.tuwien.dto.table.columns;
import io.swagger.v3.oas.annotations.Parameter;
import lombok.Getter;
import lombok.Setter;
+import lombok.ToString;
import javax.validation.constraints.NotBlank;
@Getter
@Setter
+@ToString
public class ColumnDto {
@NotBlank
diff --git a/fda-table-service/api/src/main/java/at/tuwien/dto/table/columns/ColumnTypeDto.java b/fda-table-service/api/src/main/java/at/tuwien/dto/table/columns/ColumnTypeDto.java
index 54a6ab21d9..a7486f6865 100644
--- a/fda-table-service/api/src/main/java/at/tuwien/dto/table/columns/ColumnTypeDto.java
+++ b/fda-table-service/api/src/main/java/at/tuwien/dto/table/columns/ColumnTypeDto.java
@@ -1,8 +1,10 @@
package at.tuwien.dto.table.columns;
import lombok.Getter;
+import lombok.ToString;
@Getter
+@ToString
public enum ColumnTypeDto {
ENUM, NUMBER, STRING, TEXT, BOOLEAN, DATE, BLOB
}
diff --git a/fda-table-service/api/src/main/java/at/tuwien/dto/table/columns/RowDto.java b/fda-table-service/api/src/main/java/at/tuwien/dto/table/columns/RowDto.java
index ce8d58a2dd..bf513a1b4f 100644
--- a/fda-table-service/api/src/main/java/at/tuwien/dto/table/columns/RowDto.java
+++ b/fda-table-service/api/src/main/java/at/tuwien/dto/table/columns/RowDto.java
@@ -2,17 +2,20 @@ package at.tuwien.dto.table.columns;
import lombok.Getter;
import lombok.Setter;
+import lombok.ToString;
import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
@Getter
@Setter
+@ToString
public class RowDto {
- @NotBlank
+ @NotNull
private ColumnDto[] columns;
- @NotBlank
+ @NotNull
private String[] data;
}
diff --git a/fda-table-service/api/src/main/java/at/tuwien/dto/table/columns/SiUnitDto.java b/fda-table-service/api/src/main/java/at/tuwien/dto/table/columns/SiUnitDto.java
index 8a776c6fff..16632ef3fb 100644
--- a/fda-table-service/api/src/main/java/at/tuwien/dto/table/columns/SiUnitDto.java
+++ b/fda-table-service/api/src/main/java/at/tuwien/dto/table/columns/SiUnitDto.java
@@ -1,5 +1,10 @@
package at.tuwien.dto.table.columns;
+import lombok.Getter;
+import lombok.ToString;
+
+@Getter
+@ToString
public enum SiUnitDto {
SECOND, METER, KILOGRAM, AMPERE, KELVIN, MOLE, CANDELA
}
--
GitLab