diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index ed902733ac5e1cc6fc10817204a36362787a3180..81ad50ba5457e395562ad9352ca6e5e59345147c 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -41,20 +41,20 @@ deploy-dev: variables: TAG: latest script: - - docker build -t $CI_REGISTRY/fda-analyse-service:$TAG ./fda-analyse-service - - docker push $CI_REGISTRY/fda-analyse-service:$TAG + - docker build -t $CI_REGISTRY/fda-analyse-at.tuwien.service:$TAG ./fda-analyse-at.tuwien.service + - docker push $CI_REGISTRY/fda-analyse-at.tuwien.service:$TAG - docker build -t $CI_REGISTRY/fda-discovery-server:$TAG ./fda-discovery-server - docker push $CI_REGISTRY/fda-discovery-server:$TAG - - docker build -t $CI_REGISTRY/fda-gateway-service:$TAG ./fda-gateway-service - - docker push $CI_REGISTRY/fda-gateway-service:$TAG - - docker build -t $CI_REGISTRY/fda-database-managing-service:$TAG ./fda-database-managing-service - - docker push $CI_REGISTRY/fda-database-managing-service:$TAG - - docker build -t $CI_REGISTRY/fda-container-managing-service:$TAG ./fda-container-managing-service - - docker push $CI_REGISTRY/fda-container-managing-service:$TAG - - docker build -t $CI_REGISTRY/fda-query-service:$TAG ./fda-query-service - - docker push $CI_REGISTRY/fda-query-service:$TAG - - docker build -t $CI_REGISTRY/fda-table-service:$TAG ./fda-table-service - - docker push $CI_REGISTRY/fda-table-service:$TAG + - docker build -t $CI_REGISTRY/fda-gateway-at.tuwien.service:$TAG ./fda-gateway-at.tuwien.service + - docker push $CI_REGISTRY/fda-gateway-at.tuwien.service:$TAG + - docker build -t $CI_REGISTRY/fda-database-managing-at.tuwien.service:$TAG ./fda-database-managing-at.tuwien.service + - docker push $CI_REGISTRY/fda-database-managing-at.tuwien.service:$TAG + - docker build -t $CI_REGISTRY/fda-container-managing-at.tuwien.service:$TAG ./fda-container-managing-at.tuwien.service + - docker push $CI_REGISTRY/fda-container-managing-at.tuwien.service:$TAG + - docker build -t $CI_REGISTRY/fda-query-at.tuwien.service:$TAG ./fda-query-at.tuwien.service + - docker push $CI_REGISTRY/fda-query-at.tuwien.service:$TAG + - docker build -t $CI_REGISTRY/fda-table-at.tuwien.service:$TAG ./fda-table-at.tuwien.service + - docker push $CI_REGISTRY/fda-table-at.tuwien.service:$TAG - docker build -t $CI_REGISTRY/fda-ui:$TAG ./fda-ui - docker push $CI_REGISTRY/fda-ui:$TAG - docker logout $CI_REGISTRY @@ -66,20 +66,20 @@ deploy-prod: variables: TAG: stable script: - - docker build -t $CI_REGISTRY/fda-analyse-service:$TAG ./fda-analyse-service - - docker push $CI_REGISTRY/fda-analyse-service:$TAG + - docker build -t $CI_REGISTRY/fda-analyse-at.tuwien.service:$TAG ./fda-analyse-at.tuwien.service + - docker push $CI_REGISTRY/fda-analyse-at.tuwien.service:$TAG - docker build -t $CI_REGISTRY/fda-discovery-server:$TAG ./fda-discovery-server - docker push $CI_REGISTRY/fda-discovery-server:$TAG - - docker build -t $CI_REGISTRY/fda-gateway-service:$TAG ./fda-gateway-service - - docker push $CI_REGISTRY/fda-gateway-service:$TAG - - docker build -t $CI_REGISTRY/fda-database-managing-service:$TAG ./fda-database-managing-service - - docker push $CI_REGISTRY/fda-database-managing-service:$TAG - - docker build -t $CI_REGISTRY/fda-container-managing-service:$TAG ./fda-container-managing-service - - docker push $CI_REGISTRY/fda-container-managing-service:$TAG - - docker build -t $CI_REGISTRY/fda-query-service:$TAG ./fda-query-service - - docker push $CI_REGISTRY/fda-query-service:$TAG - - docker build -t $CI_REGISTRY/fda-table-service:$TAG ./fda-table-service - - docker push $CI_REGISTRY/fda-table-service:$TAG + - docker build -t $CI_REGISTRY/fda-gateway-at.tuwien.service:$TAG ./fda-gateway-at.tuwien.service + - docker push $CI_REGISTRY/fda-gateway-at.tuwien.service:$TAG + - docker build -t $CI_REGISTRY/fda-database-managing-at.tuwien.service:$TAG ./fda-database-managing-at.tuwien.service + - docker push $CI_REGISTRY/fda-database-managing-at.tuwien.service:$TAG + - docker build -t $CI_REGISTRY/fda-container-managing-at.tuwien.service:$TAG ./fda-container-managing-at.tuwien.service + - docker push $CI_REGISTRY/fda-container-managing-at.tuwien.service:$TAG + - docker build -t $CI_REGISTRY/fda-query-at.tuwien.service:$TAG ./fda-query-at.tuwien.service + - docker push $CI_REGISTRY/fda-query-at.tuwien.service:$TAG + - docker build -t $CI_REGISTRY/fda-table-at.tuwien.service:$TAG ./fda-table-at.tuwien.service + - docker push $CI_REGISTRY/fda-table-at.tuwien.service:$TAG - docker build -t $CI_REGISTRY/fda-ui:$TAG ./fda-ui - docker push $CI_REGISTRY/fda-ui:$TAG - docker logout $CI_REGISTRY diff --git a/README.md b/README.md index d9d76944c45174245f14c4f8ec8642050b630b57..3869447c0af87b6303169ce8b948aac0377ad8b6 100644 --- a/README.md +++ b/README.md @@ -11,13 +11,13 @@ docker login https://docker.martinweise.at ``` ```bash -docker pull docker.martinweise.at/fda-analyse-service +docker pull docker.martinweise.at/fda-analyse-at.tuwien.service docker pull docker.martinweise.at/fda-discovery-server -docker pull docker.martinweise.at/fda-gateway-service -docker pull docker.martinweise.at/fda-database-managing-service -docker pull docker.martinweise.at/fda-container-managing-service -docker pull docker.martinweise.at/fda-query-service -docker pull docker.martinweise.at/fda-table-service +docker pull docker.martinweise.at/fda-gateway-at.tuwien.service +docker pull docker.martinweise.at/fda-database-managing-at.tuwien.service +docker pull docker.martinweise.at/fda-container-managing-at.tuwien.service +docker pull docker.martinweise.at/fda-query-at.tuwien.service +docker pull docker.martinweise.at/fda-table-at.tuwien.service docker pull docker.martinweise.at/fda-ui ``` diff --git a/docker-compose.dbrepo.yml b/docker-compose.dbrepo.yml index 7e1cc17cc339b5584ac79916a30fba8a9cdbf7a3..1580cbbe55e779afd921ad76d828bcea2b4b3bd7 100644 --- a/docker-compose.dbrepo.yml +++ b/docker-compose.dbrepo.yml @@ -13,9 +13,9 @@ services: - 9090:9090 fda-gateway-service: - container_name: fda-gateway-service - hostname: fda-gateway-service - image: docker.martinweise.at/fda-gateway-service:latest + container_name: fda-gateway-at.tuwien.service + hostname: fda-gateway-at.tuwien.service + image: docker.martinweise.at/fda-gateway-at.tuwien.service:latest network_mode: bridge environment: SPRING_PROFILES_ACTIVE: docker @@ -37,9 +37,9 @@ services: driver: json-file fda-database-managing-service: - container_name: fda-database-managing-service - hostname: fda-database-managing-service - image: docker.martinweise.at/fda-database-managing-service:latest + container_name: fda-database-managing-at.tuwien.service + hostname: fda-database-managing-at.tuwien.service + image: docker.martinweise.at/fda-database-managing-at.tuwien.service:latest network_mode: bridge environment: SPRING_PROFILES_ACTIVE: docker @@ -55,9 +55,9 @@ services: driver: json-file fda-container-managing-service: - container_name: fda-container-managing-service - hostname: fda-container-managing-service - image: docker.martinweise.at/fda-container-managing-service:latest + container_name: fda-container-managing-at.tuwien.service + hostname: fda-container-managing-at.tuwien.service + image: docker.martinweise.at/fda-container-managing-at.tuwien.service:latest network_mode: bridge environment: SPRING_PROFILES_ACTIVE: docker @@ -73,9 +73,9 @@ services: driver: json-file fda-query-service: - container_name: fda-query-service - hostname: fda-query-service - image: docker.martinweise.at/fda-query-service:latest + container_name: fda-query-at.tuwien.service + hostname: fda-query-at.tuwien.service + image: docker.martinweise.at/fda-query-at.tuwien.service:latest network_mode: bridge environment: SPRING_PROFILES_ACTIVE: docker @@ -93,9 +93,9 @@ services: driver: json-file fda-table-service: - container_name: fda-table-service - hostname: fda-table-service - image: docker.martinweise.at/fda-table-service:latest + container_name: fda-table-at.tuwien.service + hostname: fda-table-at.tuwien.service + image: docker.martinweise.at/fda-table-at.tuwien.service:latest network_mode: bridge environment: SPRING_PROFILES_ACTIVE: docker @@ -112,9 +112,9 @@ services: - fda-discovery-server fda-analyse-service: - container_name: fda-analyse-service - hostname: fda-analyse-service - image: docker.martinweise.at/fda-analyse-service:latest + container_name: fda-analyse-at.tuwien.service + hostname: fda-analyse-at.tuwien.service + image: docker.martinweise.at/fda-analyse-at.tuwien.service:latest network_mode: bridge command: sh -c "/wait && flask run" environment: @@ -149,4 +149,4 @@ services: - fda-discovery-server environment: HOST: 0.0.0.0 - API_URL: //fda-database-managing-service:9092/api + API_URL: //fda-database-managing-at.tuwien.service:9092/api diff --git a/docker-compose.yml b/docker-compose.yml index 1246e91bd87aa161d1388b92081abc44dbf83e1b..124bf6db0679a125efced6740aa3230537aae69d 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -36,8 +36,8 @@ services: fda-gateway-service: restart: always - container_name: fda-gateway-service - hostname: fda-gateway-service + container_name: fda-gateway-at.tuwien.service + hostname: fda-gateway-at.tuwien.service build: ./fda-gateway-service image: fda-gateway-service network_mode: bridge @@ -62,8 +62,8 @@ services: fda-database-managing-service: restart: always - container_name: fda-database-managing-service - hostname: fda-database-managing-service + container_name: fda-database-managing-at.tuwien.service + hostname: fda-database-managing-at.tuwien.service build: context: ./fda-database-managing-service image: fda-database-managing-service @@ -83,8 +83,8 @@ services: fda-container-managing-service: restart: always - container_name: fda-container-managing-service - hostname: fda-container-managing-service + container_name: fda-container-managing-at.tuwien.service + hostname: fda-container-managing-at.tuwien.service build: ./fda-container-managing-service image: fda-container-managing-service network_mode: bridge @@ -103,8 +103,8 @@ services: fda-query-service: restart: always - container_name: fda-query-service - hostname: fda-query-service + container_name: fda-query-at.tuwien.service + hostname: fda-query-at.tuwien.service build: ./fda-query-service image: fda-query-service network_mode: bridge @@ -125,8 +125,8 @@ services: fda-table-service: restart: always - container_name: fda-table-service - hostname: fda-table-service + container_name: fda-table-at.tuwien.service + hostname: fda-table-at.tuwien.service build: ./fda-table-service image: fda-table-service network_mode: bridge @@ -146,8 +146,8 @@ services: fda-analyse-service: restart: always - container_name: fda-analyse-service - hostname: fda-analyse-service + container_name: fda-analyse-at.tuwien.service + hostname: fda-analyse-at.tuwien.service build: ./fda-analyse-service image: fda-analyse-service network_mode: bridge @@ -186,4 +186,4 @@ services: - fda-discovery-server environment: HOST: 0.0.0.0 - API_URL: //fda-database-managing-service:9092/api + API_URL: //fda-database-managing-at.tuwien.service:9092/api diff --git a/fda-analyse-service/README.md b/fda-analyse-service/README.md index 5dac2237735ad80fb56338ace6e5514776c53a32..3aea990ff36e737d668ee6d44e636982e46052d8 100644 --- a/fda-analyse-service/README.md +++ b/fda-analyse-service/README.md @@ -49,4 +49,4 @@ run `python3 app.py` add '/upload' to url ### Running with Docker -Building the image: `sudo docker build -t analyse-service .` +Building the image: `sudo docker build -t analyse-at.tuwien.service .` diff --git a/fda-analyse-service/app.py b/fda-analyse-service/app.py index 641a4102e8be55ae465664645702c3b9f97e9656..4082030d3826b645c46fc2a61b7c75ccec5bef99 100644 --- a/fda-analyse-service/app.py +++ b/fda-analyse-service/app.py @@ -77,7 +77,7 @@ def extract_tables(): rest_server_port = 5000 eureka_client.init(eureka_server=os.getenv('EUREKA_SERVER', 'http://localhost:9090/eureka/'), - app_name="fda-analyse-service", + app_name="fda-analyse-at.tuwien.service", instance_port=rest_server_port) diff --git a/fda-container-managing-service/pom.xml b/fda-container-managing-service/pom.xml index b35382b8532622a4c269a556b2feef7b130651df..f61be9ce5f7852b7aa76d70938e5e1a37660d1b7 100644 --- a/fda-container-managing-service/pom.xml +++ b/fda-container-managing-service/pom.xml @@ -25,7 +25,6 @@ <java.version>11</java.version> <spring-cloud.version>Hoxton.SR8</spring-cloud.version> <mapstruct.version>1.4.2.Final</mapstruct.version> - <mainClass>at.tuwien.FdaContainerManagingApplication</mainClass> </properties> <dependencies> @@ -41,11 +40,13 @@ <groupId>org.springframework.boot</groupId> <artifactId>spring-boot-starter-data-jpa</artifactId> </dependency> + <!-- DataSource --> <dependency> <groupId>org.postgresql</groupId> <artifactId>postgresql</artifactId> <scope>runtime</scope> </dependency> + <!-- Testing --> <dependency> <groupId>org.springframework.boot</groupId> <artifactId>spring-boot-starter-test</artifactId> @@ -57,25 +58,18 @@ </exclusion> </exclusions> </dependency> - <dependency> - <groupId>org.projectlombok</groupId> - <artifactId>lombok</artifactId> - </dependency> + <!-- DTO --> <dependency> <groupId>io.springfox</groupId> <artifactId>springfox-spring-web</artifactId> <version>2.9.2</version> </dependency> + <!-- IDE --> <dependency> - <groupId>io.swagger</groupId> - <artifactId>swagger-annotations</artifactId> - <version>1.5.20</version> - </dependency> - <dependency> - <groupId>io.springfox</groupId> - <artifactId>springfox-swagger2</artifactId> - <version>2.9.2</version> + <groupId>org.projectlombok</groupId> + <artifactId>lombok</artifactId> </dependency> + <!-- Docker --> <dependency> <groupId>com.github.docker-java</groupId> <artifactId>docker-java-api</artifactId> @@ -86,6 +80,34 @@ <artifactId>docker-java</artifactId> <version>3.2.1</version> </dependency> + <!-- Mapping --> + <dependency> + <groupId>org.mapstruct</groupId> + <artifactId>mapstruct-processor</artifactId> + <version>${mapstruct.version}</version> + <optional>true</optional><!-- IntelliJ --> + </dependency> + <dependency> + <groupId>org.mapstruct</groupId> + <artifactId>mapstruct</artifactId> + <version>${mapstruct.version}</version> + </dependency> + <dependency> + <groupId>io.swagger</groupId> + <artifactId>swagger-annotations</artifactId> + <version>1.5.20</version> + </dependency> + <dependency> + <groupId>io.springfox</groupId> + <artifactId>springfox-swagger2</artifactId> + <version>2.9.2</version> + <exclusions> + <exclusion> + <groupId>org.mapstruct</groupId> + <artifactId>mapstruct</artifactId> + </exclusion> + </exclusions> + </dependency> </dependencies> <dependencyManagement> <dependencies> diff --git a/fda-container-managing-service/services/src/main/java/at/tuwien/entities/Auditable.java b/fda-container-managing-service/services/src/main/java/at/tuwien/entities/Auditable.java index a8e209adc979d3baf7a81169f8d16c112bb2a1ff..eef245f8f6a183f6b868bd1d05550260b196ce7e 100644 --- a/fda-container-managing-service/services/src/main/java/at/tuwien/entities/Auditable.java +++ b/fda-container-managing-service/services/src/main/java/at/tuwien/entities/Auditable.java @@ -12,7 +12,6 @@ import org.springframework.data.jpa.domain.support.AuditingEntityListener; import javax.persistence.*; import java.time.Instant; -@Data @EqualsAndHashCode(onlyExplicitlyIncluded = true) @ToString(onlyExplicitlyIncluded = true) @MappedSuperclass diff --git a/fda-container-managing-service/services/src/main/java/at/tuwien/entities/DatabaseContainer.java b/fda-container-managing-service/services/src/main/java/at/tuwien/entities/DatabaseContainer.java index 49355e55dc406d82b435ddd1546b7cdc806f3bb3..8c8947ab180bfa9d7055e357c6eff89c8ee79940 100644 --- a/fda-container-managing-service/services/src/main/java/at/tuwien/entities/DatabaseContainer.java +++ b/fda-container-managing-service/services/src/main/java/at/tuwien/entities/DatabaseContainer.java @@ -8,6 +8,7 @@ import java.time.Instant; @Entity +@Data @EqualsAndHashCode(callSuper = true, onlyExplicitlyIncluded = true) @ToString(callSuper = true, onlyExplicitlyIncluded = true) public class DatabaseContainer extends Auditable{ @@ -19,7 +20,7 @@ public class DatabaseContainer extends Auditable{ private Instant containerCreated; @Column(nullable = false) - private String containerName; + private String name; @Column(nullable = false) private String databaseName; diff --git a/fda-container-managing-service/services/src/main/java/at/tuwien/mapper/DatabaseContainerMapper.java b/fda-container-managing-service/services/src/main/java/at/tuwien/mapper/DatabaseContainerMapper.java index 26a92c68b4743c3b53b07f9a58597d18a251f922..d23a617cbf2df9fc53f07e9984273c7dbdde989e 100644 --- a/fda-container-managing-service/services/src/main/java/at/tuwien/mapper/DatabaseContainerMapper.java +++ b/fda-container-managing-service/services/src/main/java/at/tuwien/mapper/DatabaseContainerMapper.java @@ -5,6 +5,7 @@ import at.tuwien.api.dto.container.DatabaseContainerDto; import com.github.dockerjava.api.command.InspectContainerResponse; import com.github.dockerjava.api.model.Container; import at.tuwien.entities.DatabaseContainer; +import com.github.dockerjava.api.model.NetworkSettings; import org.mapstruct.Mapper; import org.mapstruct.Mapping; import org.mapstruct.Mappings; @@ -13,11 +14,8 @@ import org.mapstruct.Mappings; public interface DatabaseContainerMapper { @Mappings({ - @Mapping(source = "id", target = "id"), - @Mapping(source = "name", target = "containerId"), - @Mapping(source = "created", target = "created"), - @Mapping(source = "ipAddress", target = "ipAddress"), - @Mapping(source = "dbName", target = "dbName"), + @Mapping(source = "id", target = "containerId"), + @Mapping(source = "created", target = "containerCreated"), }) DatabaseContainer inspectContainerResponseToDatabaseContainer(InspectContainerResponse containerResponse); // public DatabaseContainer map(InspectContainerResponse containerResponse) { @@ -28,6 +26,10 @@ public interface DatabaseContainerMapper { // return databaseContainer; // } + default String networkSettingsNetworksBridgeToIpAddress(NetworkSettings data) { + return data.getNetworks().get("bridge").getIpAddress(); + } + DatabaseContainer containerToDatabaseContainer(Container data); DatabaseContainerBriefDto databaseContainerToDataBaseContainerBriefDto(DatabaseContainer data); diff --git a/fda-gateway-service/Dockerfile b/fda-gateway-service/Dockerfile index ff3ac6687295ee0ef817fa847b4e9a6b932c1272..6dba7455f7d7b948ed13ca2acc479932fc4f0cc0 100644 --- a/fda-gateway-service/Dockerfile +++ b/fda-gateway-service/Dockerfile @@ -13,7 +13,7 @@ RUN mvn -q clean package > /dev/null ###### SECOND STAGE ###### FROM openjdk:11-jre-slim as runtime -COPY --from=build ./target/fda-gateway-service-*.jar ./gateway.jar +COPY --from=build ./target/fda-gateway-at.tuwien.service-*.jar ./gateway.jar EXPOSE 9095 diff --git a/fda-gateway-service/pom.xml b/fda-gateway-service/pom.xml index 8432ad081db2a049a39c8eaebc0d43e0caf25b16..d4fc0d4e1895d2790ca8a1f73573c035f9a84a3d 100644 --- a/fda-gateway-service/pom.xml +++ b/fda-gateway-service/pom.xml @@ -9,9 +9,9 @@ <relativePath/> <!-- lookup parent from repository --> </parent> <groupId>at.tuwien</groupId> - <artifactId>fda-gateway-service</artifactId> + <artifactId>fda-gateway-at.tuwien.service</artifactId> <version>0.0.1-SNAPSHOT</version> - <name>fda-gateway-service</name> + <name>fda-gateway-at.tuwien.service</name> <description>Demo project for Spring Boot</description> <properties> 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 2d3c88315db0daf2d903ebde958e4491662178bd..fd3dc21da3f368daa48d4ac36be251ea6d606a25 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 @@ -11,17 +11,17 @@ public class GatewayConfig { @Bean public RouteLocator routes(RouteLocatorBuilder builder) { return builder.routes() - .route("database-managing-service", r -> r.path("/database/**") + .route("database-managing-at.tuwien.service", r -> r.path("/database/**") .and() .method("POST","GET") .and() .uri("lb://FDA-Database-Managing")) - .route("table-service", r -> r.path("/table/**") + .route("table-at.tuwien.service", r -> r.path("/table/**") .and() .method("POST","GET") .and() .uri("lb://FDA-Table-Service")) - .route("query-service", r -> r.path("/query/executeQuery") + .route("query-at.tuwien.service", r -> r.path("/query/executeQuery") .and() .method("POST") .and() diff --git a/fda-gateway-service/src/main/resources/application-docker.properties b/fda-gateway-service/src/main/resources/application-docker.properties index ecfe4a0bcd177da552ac8600e4ef78096779a009..0682e3d60608e957e9a9e8cafc6a1231194dc5d8 100644 --- a/fda-gateway-service/src/main/resources/application-docker.properties +++ b/fda-gateway-service/src/main/resources/application-docker.properties @@ -1,5 +1,5 @@ server.port=9095 -spring.application.name=fda-gateway-service +spring.application.name=fda-gateway-at.tuwien.service spring.main.banner-mode=off spring.cloud.loadbalancer.ribbon.enabled=false logging.level.root=warn diff --git a/fda-gateway-service/src/main/resources/application.properties b/fda-gateway-service/src/main/resources/application.properties index 16f488a6c7437cd79c006032973081d1d2ad6d18..eed34841fa7f5ccbb05ca6317a87e290af321080 100644 --- a/fda-gateway-service/src/main/resources/application.properties +++ b/fda-gateway-service/src/main/resources/application.properties @@ -1,3 +1,3 @@ -spring.application.name=fda-gateway-service +spring.application.name=fda-gateway-at.tuwien.service server.port=9095 eureka.client.serviceUrl.defaultZone=http://localhost:9090/eureka/ \ No newline at end of file diff --git a/fda-query-service/Dockerfile b/fda-query-service/Dockerfile index 7c86e3e735092bc934fac494300eecf118f60981..b203a500572f2f891c8f414cb1031463ac703a79 100644 --- a/fda-query-service/Dockerfile +++ b/fda-query-service/Dockerfile @@ -9,7 +9,7 @@ RUN mvn -fn -B dependency:go-offline > /dev/null COPY ./api ./api COPY ./gateways ./gateways COPY ./persistence ./persistence -COPY ./rest-service ./rest-service +COPY ./rest-at.tuwien.service ./rest-at.tuwien.service COPY ./services ./services RUN mvn -q clean package > /dev/null @@ -17,7 +17,7 @@ RUN mvn -q clean package > /dev/null ###### SECOND STAGE ###### FROM openjdk:11-jre-slim as runtime -COPY --from=build ./rest-service/target/fda-query-service-*.jar ./rest.jar +COPY --from=build ./rest-at.tuwien.service/target/fda-query-at.tuwien.service-*.jar ./rest.jar EXPOSE 9093 diff --git a/fda-query-service/api/pom.xml b/fda-query-service/api/pom.xml index 86e0a6f805babdda2c79b27afe97641ae5fc1931..47a67c6b45c76f50c236e60771e5a0c7aac4900b 100644 --- a/fda-query-service/api/pom.xml +++ b/fda-query-service/api/pom.xml @@ -3,7 +3,7 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <parent> - <artifactId>fda-query-service</artifactId> + <artifactId>fda-query-at.tuwien.service</artifactId> <groupId>at.tuwien</groupId> <version>0.0.1-SNAPSHOT</version> </parent> diff --git a/fda-query-service/gateways/pom.xml b/fda-query-service/gateways/pom.xml index c6fbd9e1d45a36c4c2854721be4131891c575a29..12c9d7a5ae872d64cca9b7a94019572c5c2eed64 100644 --- a/fda-query-service/gateways/pom.xml +++ b/fda-query-service/gateways/pom.xml @@ -3,7 +3,7 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <parent> - <artifactId>fda-query-service</artifactId> + <artifactId>fda-query-at.tuwien.service</artifactId> <groupId>at.tuwien</groupId> <version>0.0.1-SNAPSHOT</version> </parent> diff --git a/fda-query-service/gateways/src/main/java/at/tuwien/client/FdaContainerManagingClient.java b/fda-query-service/gateways/src/main/java/at/tuwien/client/FdaContainerManagingClient.java index 610be0cb46797ea9b90b8df97b8f212ea89ea5b6..33b471620efb583c24ab90d194f77975b4c1094b 100644 --- a/fda-query-service/gateways/src/main/java/at/tuwien/client/FdaContainerManagingClient.java +++ b/fda-query-service/gateways/src/main/java/at/tuwien/client/FdaContainerManagingClient.java @@ -20,7 +20,7 @@ public class FdaContainerManagingClient { } public DatabaseContainer getDatabaseContainer(String containerID) { - LOGGER.debug("request fda-container-managing service for getting database container"); + LOGGER.debug("request fda-container-managing at.tuwien.service for getting database container"); DatabaseContainer databaseContainer = webClientBuilder .build() .get() diff --git a/fda-query-service/persistence/pom.xml b/fda-query-service/persistence/pom.xml index 761cf2871472612156f3a5df93eaf2b25f7c8b17..36b810590f619c7088a8bf83a64e2550fd3ae7c6 100644 --- a/fda-query-service/persistence/pom.xml +++ b/fda-query-service/persistence/pom.xml @@ -3,7 +3,7 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <parent> - <artifactId>fda-query-service</artifactId> + <artifactId>fda-query-at.tuwien.service</artifactId> <groupId>at.tuwien</groupId> <version>0.0.1-SNAPSHOT</version> </parent> diff --git a/fda-query-service/pom.xml b/fda-query-service/pom.xml index 3ad24a8eb46c89e2ff0e3dde8698c15e0e070186..56a8bfa67a66c2feffc6dcdb5154fe335baa69a2 100644 --- a/fda-query-service/pom.xml +++ b/fda-query-service/pom.xml @@ -4,7 +4,7 @@ <modelVersion>4.0.0</modelVersion> <packaging>pom</packaging> <modules> - <module>rest-service</module> + <module>rest-at.tuwien.service</module> <module>api</module> <module>services</module> <module>gateways</module> @@ -17,9 +17,9 @@ <relativePath/> <!-- lookup parent from repository --> </parent> <groupId>at.tuwien</groupId> - <artifactId>fda-query-service</artifactId> + <artifactId>fda-query-at.tuwien.service</artifactId> <version>0.0.1-SNAPSHOT</version> - <name>fda-query-service</name> + <name>fda-query-at.tuwien.service</name> <description>Demo project for Spring Boot</description> <properties> diff --git a/fda-query-service/rest-service/pom.xml b/fda-query-service/rest-service/pom.xml index 1bdec41486d6d782761b9816445fcd33d890ed07..8680d0409dcb6e9e0147c90adb639fc461271755 100644 --- a/fda-query-service/rest-service/pom.xml +++ b/fda-query-service/rest-service/pom.xml @@ -3,13 +3,13 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <parent> - <artifactId>fda-query-service</artifactId> + <artifactId>fda-query-at.tuwien.service</artifactId> <groupId>at.tuwien</groupId> <version>0.0.1-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> - <artifactId>rest-service</artifactId> + <artifactId>rest-at.tuwien.service</artifactId> <dependencies> <dependency> <groupId>at.tuwien</groupId> diff --git a/fda-query-service/rest-service/src/main/java/at/tuwien/SwaggerConfig.java b/fda-query-service/rest-service/src/main/java/at/tuwien/SwaggerConfig.java index 65c94d0cee21c5a7c9c24dc87d14c6704cd7c29a..45f99dd3da10a506c1c0a8cfb7cf8f53d6fd4715 100644 --- a/fda-query-service/rest-service/src/main/java/at/tuwien/SwaggerConfig.java +++ b/fda-query-service/rest-service/src/main/java/at/tuwien/SwaggerConfig.java @@ -27,7 +27,7 @@ public class SwaggerConfig { private ApiInfo apiInfo() { return new ApiInfo("FDA-Query-Service API", - "Service API for query service", + "Service API for query at.tuwien.service", "1.0", null, new Contact("Gökhan Dasdemir", "http://tuwien.at", "goekhan.dasdemir@tuwien.ac.at"), diff --git a/fda-query-service/rest-service/src/main/resources/application-docker.properties b/fda-query-service/rest-service/src/main/resources/application-docker.properties index d11e79ea25fc71af2431ab210a1c78e4f2acd1ee..692092a6a2eefe051937f6f9c79b95c5f9364083 100644 --- a/fda-query-service/rest-service/src/main/resources/application-docker.properties +++ b/fda-query-service/rest-service/src/main/resources/application-docker.properties @@ -1,5 +1,5 @@ server.port=9093 -spring.application.name=fda-query-service +spring.application.name=fda-query-at.tuwien.service spring.main.banner-mode=off spring.cloud.loadbalancer.ribbon.enabled=false logging.level.root=warn diff --git a/fda-query-service/rest-service/src/main/resources/application.properties b/fda-query-service/rest-service/src/main/resources/application.properties index 3e1f2745a136427f7d23e8ed7d9c57c479ce31f1..ffc41ba93d19af3abce486fd06789d01f6bfb0f2 100644 --- a/fda-query-service/rest-service/src/main/resources/application.properties +++ b/fda-query-service/rest-service/src/main/resources/application.properties @@ -1,3 +1,3 @@ -spring.application.name=fda-query-service +spring.application.name=fda-query-at.tuwien.service server.port=9093 eureka.client.serviceUrl.defaultZone=http://localhost:9090/eureka/ diff --git a/fda-query-service/services/pom.xml b/fda-query-service/services/pom.xml index 088989ebac352a02552ef94f5f27a5c83a0c57eb..9d4202642e7dbb64b00d3e3c474c7be4df8b9cff 100644 --- a/fda-query-service/services/pom.xml +++ b/fda-query-service/services/pom.xml @@ -3,7 +3,7 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <parent> - <artifactId>fda-query-service</artifactId> + <artifactId>fda-query-at.tuwien.service</artifactId> <groupId>at.tuwien</groupId> <version>0.0.1-SNAPSHOT</version> </parent> diff --git a/fda-table-service/Dockerfile b/fda-table-service/Dockerfile index 9a9c4c854a667c0fdc4fd0fa0948d7e32db57881..7bcaeb7d514c7d11fdfc3f46fb19b16968725665 100644 --- a/fda-table-service/Dockerfile +++ b/fda-table-service/Dockerfile @@ -8,7 +8,7 @@ RUN mvn -fn -B dependency:go-offline > /dev/null COPY ./api ./api COPY ./gateways ./gateways -COPY ./rest-service ./rest-service +COPY ./rest-at.tuwien.service ./rest-at.tuwien.service COPY ./services ./services RUN mvn -q clean package > /dev/null @@ -16,7 +16,7 @@ RUN mvn -q clean package > /dev/null ###### SECOND STAGE ###### FROM openjdk:11-jre-slim as runtime -COPY --from=build ./rest-service/target/fda-table-service-*.jar ./rest.jar +COPY --from=build ./rest-at.tuwien.service/target/fda-table-at.tuwien.service-*.jar ./rest.jar EXPOSE 9094 diff --git a/fda-table-service/api/pom.xml b/fda-table-service/api/pom.xml index a2ee421e94e8a7b9cb0c5a7e98c4667fe28a8c35..a47b57a00ad27293ca386ad279323690165b9637 100644 --- a/fda-table-service/api/pom.xml +++ b/fda-table-service/api/pom.xml @@ -3,7 +3,7 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <parent> - <artifactId>fda-table-service</artifactId> + <artifactId>fda-table-at.tuwien.service</artifactId> <groupId>at.tuwien</groupId> <version>0.0.1-SNAPSHOT</version> </parent> diff --git a/fda-table-service/gateways/pom.xml b/fda-table-service/gateways/pom.xml index 26715091e5df192f07d39b46c7c31112ccf4549f..9f4eea8ac4350cb49bf6cdc1a276a5d9680c2d96 100644 --- a/fda-table-service/gateways/pom.xml +++ b/fda-table-service/gateways/pom.xml @@ -3,7 +3,7 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <parent> - <artifactId>fda-table-service</artifactId> + <artifactId>fda-table-at.tuwien.service</artifactId> <groupId>at.tuwien</groupId> <version>0.0.1-SNAPSHOT</version> </parent> diff --git a/fda-table-service/gateways/src/main/java/at/tuwien/client/FdaAnalyseServiceClient.java b/fda-table-service/gateways/src/main/java/at/tuwien/client/FdaAnalyseServiceClient.java index f89e8b43a4e4088163028504b8c20d43a66d75d2..f76ee532b0c4e80e8bb94de26bb405a9a1977dc3 100644 --- a/fda-table-service/gateways/src/main/java/at/tuwien/client/FdaAnalyseServiceClient.java +++ b/fda-table-service/gateways/src/main/java/at/tuwien/client/FdaAnalyseServiceClient.java @@ -22,11 +22,11 @@ public class FdaAnalyseServiceClient { } public CSVColumnsResult determineDatatypes(String pathToCSVFile) { - LOGGER.debug("request analyse-service for getting determined datatypes"); + LOGGER.debug("request analyse-at.tuwien.service for getting determined datatypes"); CSVColumnsResult csvColumnsResult = webClientBuilder .build() .get() - .uri("http://fda-analyse-service/datatypesbypath?filepath=" + pathToCSVFile) + .uri("http://fda-analyse-at.tuwien.service/datatypesbypath?filepath=" + pathToCSVFile) .accept(MediaType.APPLICATION_JSON) .retrieve() .bodyToMono(CSVColumnsResult.class) 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 5de764ead16103a8b1b69bba24a1a1a7531a83a0..88321bd0a506deb3c43c2945bfd73cfe19794875 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 @@ -31,12 +31,12 @@ public class FdaQueryServiceClient { } public boolean executeStatement(CreateTableViaCsvDTO dto, String statement) { - LOGGER.debug("request fda-query-service for executing statement"); + LOGGER.debug("request fda-query-at.tuwien.service for executing statement"); ExecuteStatementDTO statementDTO = mapper.map(dto, statement); ClientResponse response = webClientBuilder .build() .post() - .uri("http://fda-query-service/query/executeStatement") + .uri("http://fda-query-at.tuwien.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/query/executeQuery") + .uri("http://fda-query-at.tuwien.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/query/copyCSVIntoTable") + .uri("http://fda-query-at.tuwien.service/query/copyCSVIntoTable") .contentType(MediaType.APPLICATION_JSON) .body(Mono.just(tableWithDataset), CreateCSVTableWithDataset.class) .exchange() diff --git a/fda-table-service/pom.xml b/fda-table-service/pom.xml index ecd1cc2d1ed8c9b6323198b3fb8a2754d8366962..663ff9a96e7037dc6649f681c758304ddbe0cfb1 100644 --- a/fda-table-service/pom.xml +++ b/fda-table-service/pom.xml @@ -5,7 +5,7 @@ <packaging>pom</packaging> <modules> <module>api</module> - <module>rest-service</module> + <module>rest-at.tuwien.service</module> <module>services</module> <module>gateways</module> </modules> @@ -16,9 +16,9 @@ <relativePath/> <!-- lookup parent from repository --> </parent> <groupId>at.tuwien</groupId> - <artifactId>fda-table-service</artifactId> + <artifactId>fda-table-at.tuwien.service</artifactId> <version>0.0.1-SNAPSHOT</version> - <name>fda-table-service</name> + <name>fda-table-at.tuwien.service</name> <description>Demo project for Spring Boot</description> <properties> diff --git a/fda-table-service/rest-service/pom.xml b/fda-table-service/rest-service/pom.xml index c81f057c561d5de65d9a7ba1282a1ddbae7e94bd..1661d32170dae8b0607be56111c63e1457fb758b 100644 --- a/fda-table-service/rest-service/pom.xml +++ b/fda-table-service/rest-service/pom.xml @@ -3,13 +3,13 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <parent> - <artifactId>fda-table-service</artifactId> + <artifactId>fda-table-at.tuwien.service</artifactId> <groupId>at.tuwien</groupId> <version>0.0.1-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> - <artifactId>rest-service</artifactId> + <artifactId>rest-at.tuwien.service</artifactId> <dependencies> <dependency> <groupId>at.tuwien</groupId> diff --git a/fda-table-service/rest-service/src/main/java/at/tuwien/config/SwaggerConfig.java b/fda-table-service/rest-service/src/main/java/at/tuwien/config/SwaggerConfig.java index ba71a43d6e26b6fca792ea38239176dd722cb160..b0b0eda18a5f5c08449523141c6a8a6f6a34453a 100644 --- a/fda-table-service/rest-service/src/main/java/at/tuwien/config/SwaggerConfig.java +++ b/fda-table-service/rest-service/src/main/java/at/tuwien/config/SwaggerConfig.java @@ -27,7 +27,7 @@ public class SwaggerConfig { private ApiInfo apiInfo() { return new ApiInfo("FDA-Table-Service API", - "Service API for table service", + "Service API for table at.tuwien.service", "1.0", null, new Contact("Gökhan Dasdemir", "http://tuwien.at", "goekhan.dasdemir@tuwien.ac.at"), diff --git a/fda-table-service/rest-service/src/main/resources/application-docker.properties b/fda-table-service/rest-service/src/main/resources/application-docker.properties index 73adf26fd1ab11a94ee574e6d449fbfcdbf28b7c..8548aab2af59ea4f081fe34ffd25e5abc35f5d63 100644 --- a/fda-table-service/rest-service/src/main/resources/application-docker.properties +++ b/fda-table-service/rest-service/src/main/resources/application-docker.properties @@ -1,5 +1,5 @@ server.port=9094 -spring.application.name=fda-table-service +spring.application.name=fda-table-at.tuwien.service spring.main.banner-mode=off spring.cloud.loadbalancer.ribbon.enabled=false logging.level.root=warn diff --git a/fda-table-service/rest-service/src/main/resources/application.properties b/fda-table-service/rest-service/src/main/resources/application.properties index e4d45d9008ff0fcbefe63e618eb44d33fc1451a5..bcbf084c6b7b901ab98d44c9ea16e55101d91f72 100644 --- a/fda-table-service/rest-service/src/main/resources/application.properties +++ b/fda-table-service/rest-service/src/main/resources/application.properties @@ -1,4 +1,4 @@ -spring.application.name=fda-table-service +spring.application.name=fda-table-at.tuwien.service server.port=9094 eureka.client.serviceUrl.defaultZone=http://localhost:9090/eureka/ spring.servlet.multipart.max-file-size=50MB diff --git a/fda-table-service/services/pom.xml b/fda-table-service/services/pom.xml index d2b073b5d374b9af56cdb05b1d376407907f732c..b3f1ef252aef21a21530b3b83f691dd1333d0039 100644 --- a/fda-table-service/services/pom.xml +++ b/fda-table-service/services/pom.xml @@ -3,7 +3,7 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <parent> - <artifactId>fda-table-service</artifactId> + <artifactId>fda-table-at.tuwien.service</artifactId> <groupId>at.tuwien</groupId> <version>0.0.1-SNAPSHOT</version> </parent> diff --git a/hystrix-dashboard/Dockerfile b/hystrix-dashboard/Dockerfile index 49ab8f0772975576d6602db59f9f6a8f1757d42d..2dcc35d4f8084a1dc08f817018ed61243e6afed3 100644 --- a/hystrix-dashboard/Dockerfile +++ b/hystrix-dashboard/Dockerfile @@ -12,6 +12,6 @@ RUN mvn -q clean package > /dev/null ###### SECOND STAGE ###### FROM openjdk:11-jre-slim as runtime -COPY --from=build ./rest-service/target/hystrix-dashboard-*.jar ./hystrix.jar +COPY --from=build ./rest-at.tuwien.service/target/hystrix-dashboard-*.jar ./hystrix.jar ENTRYPOINT ["java", "-jar", "./hystrix.jar"]