Added image 2

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

@@ -149,6 +149,30 @@ public abstract class BaseUnitTest {
             .defaultPort(IMAGE_1_PORT)
             .build();
 
+    public final static Long IMAGE_2_ID = 2L;
+    public final static String IMAGE_2_REPOSITORY = "mysql";
+    public final static String IMAGE_2_TAG = "8.0";
+    public final static String IMAGE_2_HASH = "83b40f2726e5";
+    public final static Integer IMAGE_2_PORT = 3306;
+    public final static String IMAGE_2_DIALECT = "org.hibernate.dialect.MySQLDialect";
+    public final static String IMAGE_2_DRIVER = "com.mysql.jdbc.Driver";
+    public final static String IMAGE_2_JDBC = "mysql";
+    public final static Long IMAGE_2_SIZE = 12000L;
+    public final static Instant IMAGE_2_BUILT = Instant.now().minus(38, HOURS);
+
+    public final static List<ImageEnvItemDto> IMAGE_2_ENV_DTO = List.of(ImageEnvItemDto.builder()
+                    .iid(IMAGE_2_ID)
+                    .key("MYSQL_USER")
+                    .value("mysql")
+                    .type(ImageEnvItemTypeDto.USERNAME)
+                    .build(),
+            ImageEnvItemDto.builder()
+                    .iid(IMAGE_2_ID)
+                    .key("MYSQL_PASSWORD")
+                    .value("mysql")
+                    .type(ImageEnvItemTypeDto.PASSWORD)
+                    .build());
+
     public final static Long CONTAINER_1_ID = 1L;
     public final static String CONTAINER_1_HASH = "deadbeef";
     public final static String CONTAINER_1_NAME = "fda-userdb-u01";

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

@@ -68,13 +68,13 @@ public class ImageServiceIntegrationTest extends BaseUnitTest {
     public void create_succeeds()
             throws ImageAlreadyExistsException, DockerClientException, ImageNotFoundException, UserNotFoundException {
         final ImageCreateDto request = ImageCreateDto.builder()
-                .repository(IMAGE_1_REPOSITORY)
-                .tag(IMAGE_1_TAG)
-                .dialect(IMAGE_1_DIALECT)
-                .driverClass(IMAGE_1_DRIVER)
-                .jdbcMethod(IMAGE_1_JDBC)
-                .defaultPort(IMAGE_1_PORT)
-                .environment(IMAGE_1_ENV_DTO)
+                .repository(IMAGE_2_REPOSITORY)
+                .tag(IMAGE_2_TAG)
+                .jdbcMethod(IMAGE_2_JDBC)
+                .dialect(IMAGE_2_DIALECT)
+                .driverClass(IMAGE_2_DRIVER)
+                .environment(IMAGE_2_ENV_DTO)
+                .defaultPort(IMAGE_2_PORT)
                 .build();
         final Principal principal = new BasicUserPrincipal(USER_1_USERNAME);
 

fda-container-service/services/src/main/java/at/tuwien/service/impl/ImageServiceImpl.java

@@ -127,7 +127,7 @@ public class ImageServiceImpl implements ImageService {
 
     @Override
     @Transactional
-    public void delete(Long imageId) throws ImageNotFoundException, PersistenceException {
+    public void delete(Long imageId) throws ImageNotFoundException {
         try {
             imageRepository.deleteById(imageId);
         } catch (EntityNotFoundException | EmptyResultDataAccessException e) {