structure now according to mavens standard

fda-container-managing-service/rest-service/src/main/resources/application-dev.yml

+spring:
+  datasource:
+    url: jdbc:postgresql://localhost:5432/fda
+    driver-class-name: org.postgresql.Driver
+    username: postgres
+    password: postgres
+  jpa:
+    show-sql: true
+    properties:
+      hibernate:
+        ddl-auto: update
+        dialect: org.hibernate.dialect.PostgreSQLDialect
+    hibernate.ddl-auto: none
+    hibernate.show-sql: true
+  application:
+    name: fda-container-managing
+server.port: 9091
+eureka:
+  client.serviceUrl.defaultZone: http://localhost:9090/eureka/
\ No newline at end of file

fda-container-managing-service/rest-service/src/main/resources/application-docker.yml

+spring:
+  main.banner-mode: off
+  datasource:
+    url: jdbc:postgresql://fda-metadata-db:5432/fda
+    driver-class-name: org.postgresql.Driver
+    username: postgres
+    password: postgres
+  jpa:
+    show-sql: true
+      properties:
+        hibernate:
+          ddl-auto: update
+          dialect: org.hibernate.dialect.PostgreSQLDialect
+      hibernate.ddl-auto: none
+      hibernate.show-sql: true
+  application:
+    name: fda-container-managing
+  cloud:
+    loadbalancer.ribbon.enabled: false
+server.port: 9091
+logging:
+  pattern.console: %d %highlight(%-5level) %msg%n
+  level:
+    root: warn
+    at.: info
+eureka:
+  instance.hostname: fda-discovery-server
+  client.serviceUrl.defaultZone: http://${eureka.instance.hostname}:9090/eureka/
\ No newline at end of file

fda-container-managing-service/src/main/java/services/pom.xml → fda-container-managing-service/services/pom.xml

@@ -2,36 +2,27 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0"
          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">
+    <modelVersion>4.0.0</modelVersion>
+    <dependencies>
+        <dependency>
+            <groupId>at.tuwien</groupId>
+            <artifactId>api</artifactId>
+            <version>0.0.1-SNAPSHOT</version>
+            <scope>compile</scope>
+        </dependency>
+    </dependencies>
     <parent>
-        <artifactId>fda-container-managing-service</artifactId>
         <groupId>at.tuwien</groupId>
+        <artifactId>fda-container-managing-service</artifactId>
         <version>0.0.1-SNAPSHOT</version>
     </parent>
-    <modelVersion>4.0.0</modelVersion>
 
     <artifactId>services</artifactId>
+    <version>0.0.1-SNAPSHOT</version>
 
     <properties>
-        <mapstruct.version>1.4.2.Final</mapstruct.version>
+        <maven.compiler.source>11</maven.compiler.source>
+        <maven.compiler.target>11</maven.compiler.target>
     </properties>
 
-    <dependencies>
-        <dependency>
-            <groupId>at.tuwien</groupId>
-            <artifactId>api</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-
-        <dependency>
-            <groupId>com.github.docker-java</groupId>
-            <artifactId>docker-java</artifactId>
-            <version>3.2.1</version>
-        </dependency>
-        <dependency>
-            <groupId>org.mapstruct</groupId>
-            <artifactId>mapstruct</artifactId>
-            <version>${mapstruct.version}</version>
-        </dependency>
-    </dependencies>
-
 </project>
\ No newline at end of file

fda-container-managing-service/src/main/java/services/config/ContainerSpringConfig.java → fda-container-managing-service/services/src/main/java/config/ContainerSpringConfig.java

-package services.config;
+package config;
 
 import com.github.dockerjava.api.DockerClient;
 import com.github.dockerjava.core.DefaultDockerClientConfig;

fda-container-managing-service/src/main/java/services/entities/DatabaseContainer.java → fda-container-managing-service/services/src/main/java/entities/DatabaseContainer.java

-package services.entities;
+package entities;
 
 import lombok.Getter;
-import lombok.NoArgsConstructor;
 import lombok.Setter;
 
 
-@NoArgsConstructor
 @Getter
 @Setter
 public class DatabaseContainer {

fda-container-managing-service/src/main/java/services/mapper/DatabaseContainerMapper.java → fda-container-managing-service/services/src/main/java/mapper/DatabaseContainerMapper.java

-package services.mapper;
+package mapper;
 
 import api.dto.container.DatabaseContainerBriefDto;
 import api.dto.container.DatabaseContainerDto;
 import com.github.dockerjava.api.command.InspectContainerResponse;
 import com.github.dockerjava.api.model.Container;
+import entities.DatabaseContainer;
 import org.mapstruct.Mapper;
 import org.mapstruct.Mapping;
 import org.mapstruct.Mappings;
-import services.entities.DatabaseContainer;
 
 @Mapper(componentModel = "spring")
 public interface DatabaseContainerMapper {

fda-container-managing-service/src/main/java/services/repositories/MetadataRepository.java → fda-container-managing-service/services/src/main/java/repositories/MetadataRepository.java

-package services.repositories;
+package repositories;
 
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.stereotype.Repository;

fda-container-managing-service/src/main/java/services/service/ContainerService.java → fda-container-managing-service/services/src/main/java/service/ContainerService.java

-package services.service;
+package service;
 
 import api.dto.database.CreateDatabaseContainerDto;
-import services.entities.DatabaseContainer;
-import services.mapper.DatabaseContainerMapper;
 import com.github.dockerjava.api.DockerClient;
-import com.github.dockerjava.api.command.CreateContainerResponse;
 import com.github.dockerjava.api.command.InspectContainerResponse;
 import com.github.dockerjava.api.model.Container;
 import com.github.dockerjava.api.model.HostConfig;
 import com.github.dockerjava.api.model.PortBinding;
 import com.github.dockerjava.api.model.RestartPolicy;
+import entities.DatabaseContainer;
+import mapper.DatabaseContainerMapper;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.util.SocketUtils;

fda-container-managing-service/src/main/java/rest/pom.xml

-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         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-container-managing-service</artifactId>
-        <groupId>at.tuwien</groupId>
-        <version>0.0.1-SNAPSHOT</version>
-    </parent>
-    <modelVersion>4.0.0</modelVersion>
-
-    <artifactId>rest-service</artifactId>
-    <dependencies>
-        <dependency>
-            <groupId>at.tuwien</groupId>
-            <artifactId>services</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>at.tuwien</groupId>
-            <artifactId>api</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>io.springfox</groupId>
-            <artifactId>springfox-swagger2</artifactId>
-            <version>2.9.2</version>
-        </dependency>
-        <dependency>
-            <groupId>io.springfox</groupId>
-            <artifactId>springfox-swagger-ui</artifactId>
-            <version>2.9.2</version>
-        </dependency>
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <scope>test</scope>
-        </dependency>
-    </dependencies>
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.springframework.boot</groupId>
-                <artifactId>spring-boot-maven-plugin</artifactId>
-                <configuration>
-                    <finalName>${project.parent.artifactId}-${project.version}</finalName>
-                    <mainClass>at.tuwien.FdaContainerManagingApplication</mainClass>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
-</project>
\ No newline at end of file

fda-container-managing-service/src/main/resources/application-docker.properties

-server.port=9091
-spring.application.name=fda-container-managing
-spring.main.banner-mode=off
-spring.cloud.loadbalancer.ribbon.enabled=false
-logging.level.root=warn
-logging.level.at.=info
-logging.pattern.console=%d %highlight(%-5level): %msg%n
-eureka.instance.hostname=fda-discovery-server
-eureka.client.serviceUrl.defaultZone=http://${eureka.instance.hostname}:9090/eureka/
-fda.db.images=postgres,redis
\ No newline at end of file

fda-container-managing-service/src/main/resources/application.properties

-spring.application.name=fda-container-managing
-server.port=9091
-eureka.client.serviceUrl.defaultZone=http://localhost:9090/eureka/
-fda.db.images=postgres,redis
\ No newline at end of file