fixed weird structure for container-managing service

fda-container-managing-service/Dockerfile

@@ -6,16 +6,16 @@ COPY ./pom.xml ./
 
 RUN mvn -fn -B dependency:go-offline > /dev/null
 
-COPY ./api ./api
-COPY ./rest-service ./rest-service
-COPY ./services ./services
+COPY src/main/java/api ./api
+COPY src/main/java/rest ./rest-service
+COPY src/main/java/services ./services
 
 RUN mvn -q clean package > /dev/null
 
 ###### SECOND STAGE ######
 FROM openjdk:11-jre-slim as runtime
 
-COPY --from=build ./rest-service/target/fda-container-managing-service-*.jar ./rest.jar
+COPY --from=build src/main/java/rest/target/fda-container-managing-service-*.jar ./rest.jar
 
 EXPOSE 9091
 

fda-container-managing-service/pom.xml

@@ -53,6 +53,31 @@
             <groupId>org.projectlombok</groupId>
             <artifactId>lombok</artifactId>
         </dependency>
+        <dependency>
+            <groupId>io.springfox</groupId>
+            <artifactId>springfox-spring-web</artifactId>
+            <version>2.9.2</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>
+        </dependency>
+        <dependency>
+            <groupId>com.github.docker-java</groupId>
+            <artifactId>docker-java-api</artifactId>
+            <version>3.2.1</version>
+        </dependency>
+        <dependency>
+            <groupId>com.github.docker-java</groupId>
+            <artifactId>docker-java</artifactId>
+            <version>3.2.1</version>
+        </dependency>
     </dependencies>
     <dependencyManagement>
         <dependencies>

fda-container-managing-service/rest-service/src/main/java/at/tuwien/entities/DatabaseContainer.java

-package at.tuwien.entities;
-
-import lombok.AllArgsConstructor;
-import lombok.Builder;
-import lombok.NoArgsConstructor;
-
-import javax.persistence.Entity;
-import javax.persistence.Id;
-
-@Entity
-@Builder
-@NoArgsConstructor
-@AllArgsConstructor
-public class DatabaseContainer {
-    
-    @Id
-    private String id;
-
-}

fda-container-managing-service/rest-service/src/test/java/at/tuwien/EndpointTest.java

-package at.tuwien;
-
-import at.tuwien.base.BaseIntegrationTest;
-import org.junit.jupiter.api.Test;
-
-public class EndpointTest extends BaseIntegrationTest {
-
-    @Test
-    public void contextLoads() {
-    }
-
-}
\ No newline at end of file

fda-container-managing-service/rest-service/src/test/java/at/tuwien/base/BaseIntegrationTest.java

-package at.tuwien.base;
-
-import at.tuwien.entities.DatabaseContainer;
-import at.tuwien.repositories.MetadataRepository;
-import lombok.extern.log4j.Log4j2;
-import org.junit.Before;
-import org.mockito.BDDMockito;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.boot.test.mock.mockito.MockBean;
-import org.springframework.boot.web.server.LocalServerPort;
-
-import java.util.List;
-
-@SpringBootTest()
-@Log4j2
-public abstract class BaseIntegrationTest {
-
-    @Value("${server.context-path}")
-    private String contextPath;
-
-    @LocalServerPort
-    private int port;
-
-    @MockBean
-    MetadataRepository metadataRepository;
-
-    @Before
-    public void beforeBase() {
-        BDDMockito.when(metadataRepository.findAll())
-                .thenReturn(List.of(
-                        DatabaseContainer.builder()
-                                .id("deadbeef")
-                                .build()
-                ));
-    }
-}
\ No newline at end of file

fda-container-managing-service/services/src/main/java/at/tuwien/config/DatabaseProperties.java

-package at.tuwien.config;
-
-import lombok.Getter;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.context.annotation.Configuration;
-
-import java.util.List;
-
-@Getter
-@Configuration
-public class DatabaseProperties {
-
-    @Value("#{'${fda.db.images}'.split(',')}")
-    private List<String> databaseImages;
-}

fda-container-managing-service/api/src/main/java/at/tuwien/dto/container/ContainerActionTypeDto.java → fda-container-managing-service/src/main/java/api/dto/container/ContainerActionTypeDto.java

-package at.tuwien.dto.container;
+package api.dto.container;
 
 public enum ContainerActionTypeDto {
     START, STOP, REMOVE

fda-container-managing-service/api/src/main/java/at/tuwien/dto/container/ContainerChangeDto.java → fda-container-managing-service/src/main/java/api/dto/container/ContainerChangeDto.java

-package at.tuwien.dto.container;
+package api.dto.container;
 
 import lombok.Getter;
 import lombok.Setter;

fda-container-managing-service/api/src/main/java/at/tuwien/dto/container/ContainerDto.java → fda-container-managing-service/src/main/java/api/dto/container/ContainerDto.java

-package at.tuwien.dto.container;
+package api.dto.container;
 
 import lombok.Getter;
 import lombok.Setter;
 
-import java.time.Instant;
-
 @Getter
 @Setter
 public class ContainerDto {

fda-container-managing-service/api/src/main/java/at/tuwien/dto/container/DatabaseContainerBriefDto.java → fda-container-managing-service/src/main/java/api/dto/container/DatabaseContainerBriefDto.java

-package at.tuwien.dto.container;
+package api.dto.container;
 
 import lombok.Getter;
 import lombok.Setter;

fda-container-managing-service/api/src/main/java/at/tuwien/dto/container/DatabaseContainerDto.java → fda-container-managing-service/src/main/java/api/dto/container/DatabaseContainerDto.java

-package at.tuwien.dto.container;
+package api.dto.container;
 
 import lombok.Getter;
 import lombok.Setter;

fda-container-managing-service/api/src/main/java/at/tuwien/dto/database/CreateDatabaseConnectionDataDto.java → fda-container-managing-service/src/main/java/api/dto/database/CreateDatabaseConnectionDataDto.java

-package at.tuwien.dto.database;
+package api.dto.database;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 import lombok.AllArgsConstructor;

fda-container-managing-service/api/src/main/java/at/tuwien/dto/database/CreateDatabaseContainerDto.java → fda-container-managing-service/src/main/java/api/dto/database/CreateDatabaseContainerDto.java

-package at.tuwien.dto.database;
+package api.dto.database;
 
-import com.fasterxml.jackson.annotation.JsonProperty;
-import lombok.Builder;
 import lombok.Getter;
-import lombok.NoArgsConstructor;
 import lombok.Setter;
 
 @Getter
 @Setter
-@Builder
 public class CreateDatabaseContainerDto {
 
-    @JsonProperty("container_name")
     private String containerName;
 
-    @JsonProperty("database_name")
     private String databaseName;
 
 }

fda-container-managing-service/api/src/main/java/at/tuwien/dto/database/CreateDatabaseResponseDto.java → fda-container-managing-service/src/main/java/api/dto/database/CreateDatabaseResponseDto.java

-package at.tuwien.dto.database;
+package api.dto.database;
 
 import lombok.Builder;
 import lombok.Getter;

fda-container-managing-service/rest-service/src/main/java/at/tuwien/FdaContainerManagingApplication.java → fda-container-managing-service/src/main/java/rest/FdaContainerManagingApplication.java

-package at.tuwien;
+package rest;
 
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
@@ -6,7 +6,7 @@ import org.springframework.context.annotation.ComponentScan;
 import springfox.documentation.swagger2.annotations.EnableSwagger2;
 
 @SpringBootApplication
-@ComponentScan(basePackages = "at.tuwien")
+@ComponentScan(basePackages = "services.entities")
 @EnableSwagger2
 public class FdaContainerManagingApplication {
 

fda-container-managing-service/rest-service/src/main/java/at/tuwien/config/SwaggerConfig.java → fda-container-managing-service/src/main/java/rest/config/SwaggerConfig.java

-package at.tuwien.config;
+package rest.config;
 
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;

fda-container-managing-service/rest-service/src/main/java/at/tuwien/endpoints/DatabaseContainerController.java → fda-container-managing-service/src/main/java/rest/endpoints/DatabaseContainerController.java

-package at.tuwien.endpoints;
+package rest.endpoints;
 
-import at.tuwien.dto.container.ContainerActionTypeDto;
-import at.tuwien.dto.container.DatabaseContainerBriefDto;
-import at.tuwien.dto.database.CreateDatabaseContainerDto;
-import at.tuwien.dto.database.CreateDatabaseResponseDto;
-import at.tuwien.mapper.DatabaseContainerMapper;
-import at.tuwien.model.DatabaseContainer;
-import at.tuwien.service.ContainerService;
+import api.dto.container.ContainerActionTypeDto;
+import api.dto.container.DatabaseContainerBriefDto;
+import api.dto.container.DatabaseContainerDto;
+import api.dto.database.CreateDatabaseContainerDto;
+import api.dto.database.CreateDatabaseResponseDto;
 import io.swagger.annotations.ApiOperation;
+import services.entities.DatabaseContainer;
+import services.mapper.DatabaseContainerMapper;
+import services.service.ContainerService;
 import lombok.extern.log4j.Log4j2;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpStatus;
@@ -54,8 +55,8 @@ public class DatabaseContainerController {
 
     @GetMapping("/database/{id}")
     @ApiOperation("Get info of database container")
-    public DatabaseContainer findById(@RequestParam String id) {
-        return containerService.getDatabaseById(id);
+    public DatabaseContainerDto findById(@RequestParam String id) {
+        return databaseContaineMapper.databaseContainerToDataBaseContainerDto(containerService.getDatabaseById(id));
 
     }
 

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

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