fixed mapstruct

.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

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
 ```
 

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

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

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 .`

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)
 
 

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>

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

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;

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);

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
 

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>

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()

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

 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

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

-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

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
 

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>

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>

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()

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>