Removed dependencies on docker from metadata DB

dbrepo-metadata-db/api/src/main/java/at/tuwien/api/container/ContainerBriefDto.java

 package at.tuwien.api.container;
 
-import at.tuwien.api.database.DatabaseBriefDto;
 import at.tuwien.api.user.UserBriefDto;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.*;
-
 import jakarta.validation.constraints.NotBlank;
 import jakarta.validation.constraints.NotNull;
+import lombok.*;
 import lombok.extern.jackson.Jacksonized;
 
 import java.time.Instant;
@@ -45,9 +43,6 @@ public class ContainerBriefDto {
     @Schema(example = "true")
     private Boolean running;
 
-    @org.springframework.data.annotation.Transient
-    private DatabaseBriefDto database;
-
     @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX", timezone = "UTC")
     private Instant created;
 }

dbrepo-metadata-db/api/src/main/java/at/tuwien/api/container/ContainerChangeDto.java

-package at.tuwien.api.container;
-
-import io.swagger.v3.oas.annotations.Parameter;
-import lombok.*;
-
-import jakarta.validation.constraints.NotNull;
-import lombok.extern.jackson.Jacksonized;
-
-@Getter
-@Setter
-@Builder
-@NoArgsConstructor
-@AllArgsConstructor
-@Jacksonized
-@ToString
-public class ContainerChangeDto {
-
-    @NotNull
-    @Parameter(required = true, example = "start")
-    private ContainerActionTypeDto action;
-
-}

dbrepo-metadata-db/api/src/main/java/at/tuwien/api/container/ContainerCreateRequestDto.java

 package at.tuwien.api.container;
 
 import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.*;
-
 import jakarta.validation.constraints.NotBlank;
+import lombok.*;
 import lombok.extern.jackson.Jacksonized;
 
 @Getter
@@ -20,11 +19,21 @@ public class ContainerCreateRequestDto {
     private String name;
 
     @NotBlank
-    @Schema(example = "mariadb")
-    private String repository;
+    @Schema(description = "Image ID")
+    private Long imageId;
 
     @NotBlank
-    @Schema(example = "10.5")
-    private String tag;
+    @Schema(description = "Hostname of container")
+    private String host;
+
+    @Schema(description = "Port of container")
+    private Integer port;
 
+    @NotBlank
+    @Schema(description = "Username of privileged user", example = "root")
+    private String privilegedUsername;
+
+    @NotBlank
+    @Schema(description = "Password of privileged user")
+    private String privilegedPassword;
 }

dbrepo-metadata-db/api/src/main/java/at/tuwien/api/container/ContainerDto.java

 package at.tuwien.api.container;
 
 import at.tuwien.api.container.image.ImageBriefDto;
-import at.tuwien.api.database.DatabaseDto;
 import at.tuwien.api.user.UserBriefDto;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.*;
-
 import jakarta.validation.constraints.NotBlank;
 import jakarta.validation.constraints.NotNull;
+import lombok.*;
 import lombok.extern.jackson.Jacksonized;
 
 import java.time.Instant;
@@ -26,10 +24,6 @@ public class ContainerDto {
     @NotNull
     private Long id;
 
-    @NotNull
-    @Schema(example = "f829dd8a884182d0da846f365dee1221fd16610a14c81b8f9f295ff162749e50")
-    private String hash;
-
     @NotBlank
     @Schema(example = "Air Quality")
     private String name;
@@ -39,24 +33,13 @@ public class ContainerDto {
     @Schema(example = "air-quality")
     private String internalName;
 
-    @Schema(example = "running")
-    private ContainerStateDto state;
-
-    @Schema
-    @ToString.Exclude
-    private DatabaseDto database;
-
-    @JsonProperty("ip_address")
-    private String ipAddress;
+    @NotBlank
+    private String host;
 
-    @NotNull
-    @Schema(example = "true")
-    private Boolean running;
+    private Integer port;
 
     private ImageBriefDto image;
 
-    private Integer port;
-
     private UserBriefDto owner;
 
     @NotNull

dbrepo-metadata-db/api/src/main/java/at/tuwien/api/container/ContainerStateDto.java

-package at.tuwien.api.container;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-import lombok.Getter;
-import lombok.ToString;
-
-@Getter
-public enum ContainerStateDto {
-
-    @JsonProperty("created")
-    CREATED("created"),
-
-    @JsonProperty("restarting")
-    RESTARTING("restarting"),
-
-    @JsonProperty("running")
-    RUNNING("running"),
-
-    @JsonProperty("paused")
-    PAUSED("paused"),
-
-    @JsonProperty("exited")
-    EXITED("exited"),
-
-    @JsonProperty("dead")
-    DEAD("dead");
-
-    private String name;
-
-    ContainerStateDto(String name) {
-        this.name = name;
-    }
-
-    @Override
-    public String toString() {
-        return this.name;
-    }
-}

dbrepo-metadata-db/api/src/main/java/at/tuwien/api/container/image/ImageBriefDto.java

 package at.tuwien.api.container.image;
 
 import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.*;
-
 import jakarta.validation.constraints.NotBlank;
 import jakarta.validation.constraints.NotNull;
+import lombok.*;
 import lombok.extern.jackson.Jacksonized;
 
 @Getter
@@ -19,16 +18,12 @@ public class ImageBriefDto {
     @NotNull
     private Long id;
 
-    @NotBlank
-    @Schema(example = "docker.io/library")
-    private String registry;
-
     @NotBlank
     @Schema(example = "mariadb")
-    private String repository;
+    private String name;
 
     @NotBlank
     @Schema(example = "10.5")
-    private String tag;
+    private String version;
 
 }

dbrepo-metadata-db/api/src/main/java/at/tuwien/api/container/image/ImageChangeDto.java

@@ -2,15 +2,12 @@ package at.tuwien.api.container.image;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.*;
-
 import jakarta.validation.constraints.Max;
 import jakarta.validation.constraints.Min;
 import jakarta.validation.constraints.NotBlank;
+import lombok.*;
 import lombok.extern.jackson.Jacksonized;
 
-import java.util.List;
-
 @Getter
 @Setter
 @Builder
@@ -29,8 +26,6 @@ public class ImageChangeDto {
     @Schema(example = "5432")
     private Integer defaultPort;
 
-    private List<ImageEnvItemDto> environment;
-
     @NotBlank
     @JsonProperty("driver_class")
     @Schema(example = "org.postgresql.Driver")

dbrepo-metadata-db/api/src/main/java/at/tuwien/api/container/image/ImageCreateDto.java

@@ -5,14 +5,11 @@ import io.swagger.v3.oas.annotations.Parameter;
 import io.swagger.v3.oas.annotations.media.Schema;
 import jakarta.validation.constraints.Max;
 import jakarta.validation.constraints.Min;
-import lombok.*;
-
 import jakarta.validation.constraints.NotBlank;
 import jakarta.validation.constraints.NotNull;
+import lombok.*;
 import lombok.extern.jackson.Jacksonized;
 
-import java.util.List;
-
 @Getter
 @Setter
 @Builder
@@ -28,11 +25,11 @@ public class ImageCreateDto {
 
     @NotBlank
     @Schema(example = "mariadb")
-    private String repository;
+    private String name;
 
     @NotBlank
     @Parameter(example = "10.5")
-    private String tag;
+    private String version;
 
     @NotBlank
     @JsonProperty("driver_class")
@@ -55,6 +52,4 @@ public class ImageCreateDto {
     @Parameter(required = true, example = "3006")
     private Integer defaultPort;
 
-    private List<ImageEnvItemDto> environment;
-
 }

dbrepo-metadata-db/api/src/main/java/at/tuwien/api/container/image/ImageDto.java

 package at.tuwien.api.container.image;
 
-import com.fasterxml.jackson.annotation.JsonFormat;
-import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.*;
-
 import jakarta.validation.constraints.NotBlank;
 import jakarta.validation.constraints.NotNull;
+import lombok.*;
 import lombok.extern.jackson.Jacksonized;
 
-import java.math.BigInteger;
-import java.time.Instant;
 import java.util.List;
 
 @Getter
@@ -32,11 +27,11 @@ public class ImageDto {
 
     @NotBlank
     @Schema(example = "mariadb")
-    private String repository;
+    private String name;
 
     @NotBlank
     @Schema(example = "10.5")
-    private String tag;
+    private String version;
 
     @NotBlank
     @JsonProperty("driver_class")
@@ -59,25 +54,9 @@ public class ImageDto {
     @org.springframework.data.annotation.Transient
     private String jdbcMethod;
 
-    @Schema(example = "sha256:c5ec7353d87dfc35067e7bffeb25d6a0d52dad41e8b7357213e3b12d6e7ff78e")
-    private String hash;
-
-    @Schema(example = "2021-03-12T15:26:21.678396092Z")
-    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX", timezone = "UTC")
-    private Instant compiled;
-
-    @Schema(example = "314295447")
-    private BigInteger size;
-
     @NotNull
     @JsonProperty("default_port")
     @Schema(example = "3306")
     private Integer defaultPort;
 
-    @NotNull
-    @JsonIgnore
-    @ToString.Exclude
-    @org.springframework.data.annotation.Transient
-    private List<ImageEnvItemDto> environment;
-
 }

dbrepo-metadata-db/api/src/main/java/at/tuwien/api/container/image/ImageEnvItemDto.java

-package at.tuwien.api.container.image;
-
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.*;
-
-import jakarta.validation.constraints.NotBlank;
-import jakarta.validation.constraints.NotNull;
-import lombok.extern.jackson.Jacksonized;
-
-@Getter
-@Setter
-@Builder
-@NoArgsConstructor
-@AllArgsConstructor
-@Jacksonized
-@ToString
-public class ImageEnvItemDto {
-
-    @NotNull
-    private Long iid;
-
-    @NotBlank
-    @Schema(example = "MARIADB_ROOT_PASSWORD")
-    private String key;
-
-    @NotBlank
-    @JsonIgnore
-    @ToString.Exclude
-    @Schema(example = "mariadb")
-    private String value;
-
-    @NotNull
-    @Schema(example = "PRIVILEGED_PASSWORD")
-    private ImageEnvItemTypeDto type;
-
-}

dbrepo-metadata-db/api/src/main/java/at/tuwien/api/container/image/ImageEnvItemTypeDto.java

-package at.tuwien.api.container.image;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-public enum ImageEnvItemTypeDto {
-
-    @JsonProperty("username")
-    USERNAME("username"),
-
-    @JsonProperty("password")
-    PASSWORD("password"),
-
-    @JsonProperty("privileged_username")
-    PRIVILEGED_USERNAME("privileged_username"),
-
-    @JsonProperty("privileged_password")
-    PRIVILEGED_PASSWORD("privileged_password");
-
-    private String name;
-
-    ImageEnvItemTypeDto(String name) {
-        this.name = name;
-    }
-
-    @Override
-    public String toString() {
-        return this.name;
-    }
-}

dbrepo-metadata-db/api/src/main/java/at/tuwien/api/database/DatabaseBriefDto.java

 package at.tuwien.api.database;
 
 import at.tuwien.api.container.ContainerBriefDto;
+import at.tuwien.api.container.image.ImageBriefDto;
 import at.tuwien.api.identifier.IdentifierBriefDto;
 import at.tuwien.api.user.UserBriefDto;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.*;
-
 import jakarta.validation.constraints.NotBlank;
 import jakarta.validation.constraints.NotNull;
+import lombok.*;
 import lombok.extern.jackson.Jacksonized;
 
 import java.time.Instant;
@@ -55,4 +55,7 @@ public class DatabaseBriefDto {
     @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX", timezone = "UTC")
     private Instant created;
 
+    @NotNull
+    private ImageBriefDto image;
+
 }

dbrepo-metadata-db/api/src/main/java/at/tuwien/api/database/DatabaseCreateDto.java

@@ -2,10 +2,9 @@ package at.tuwien.api.database;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.*;
-
 import jakarta.validation.constraints.NotBlank;
 import jakarta.validation.constraints.NotNull;
+import lombok.*;
 import lombok.extern.jackson.Jacksonized;
 
 @Getter
@@ -17,6 +16,11 @@ import lombok.extern.jackson.Jacksonized;
 @ToString
 public class DatabaseCreateDto {
 
+    @NotNull(message = "Container id is required")
+    @JsonProperty("container_id")
+    @Schema(example = "1")
+    private Long cid;
+
     @NotBlank(message = "database name is required")
     @Schema(example = "Air Quality")
     private String name;

dbrepo-metadata-db/api/src/main/java/at/tuwien/api/database/DatabaseDto.java

@@ -8,11 +8,10 @@ import at.tuwien.api.user.UserBriefDto;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.*;
-import lombok.extern.jackson.Jacksonized;
-
 import jakarta.validation.constraints.NotBlank;
 import jakarta.validation.constraints.NotNull;
+import lombok.*;
+import lombok.extern.jackson.Jacksonized;
 import org.springframework.data.elasticsearch.annotations.Document;
 import org.springframework.data.elasticsearch.annotations.Field;
 
@@ -65,7 +64,6 @@ public class DatabaseDto {
     @org.springframework.data.annotation.Transient
     private ImageDto image;
 
-    @org.springframework.data.annotation.Transient
     private ContainerDto container;
 
     private List<DatabaseAccessDto> accesses;

dbrepo-metadata-db/api/src/main/java/at/tuwien/api/database/table/TableDto.java

@@ -6,11 +6,10 @@ import at.tuwien.api.user.UserBriefDto;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.*;
-import lombok.extern.jackson.Jacksonized;
-
 import jakarta.validation.constraints.NotBlank;
 import jakarta.validation.constraints.NotNull;
+import lombok.*;
+import lombok.extern.jackson.Jacksonized;
 import org.springframework.data.elasticsearch.annotations.Document;
 import org.springframework.data.elasticsearch.annotations.Field;
 
@@ -27,11 +26,6 @@ import java.util.List;
 @Document(indexName = "table")
 public class TableDto {
 
-    @NotNull
-    @Field(name = "container_id")
-    @JsonProperty("container_id")
-    private Long containerId;
-
     @NotNull
     @Field(name = "database_id")
     @JsonProperty("database_id")

dbrepo-metadata-db/api/src/main/java/at/tuwien/api/database/table/columns/ColumnDto.java

@@ -6,11 +6,10 @@ import at.tuwien.api.database.table.columns.concepts.UnitDto;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import io.swagger.v3.oas.annotations.Parameter;
 import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.*;
-import lombok.extern.jackson.Jacksonized;
-
 import jakarta.validation.constraints.NotBlank;
 import jakarta.validation.constraints.NotNull;
+import lombok.*;
+import lombok.extern.jackson.Jacksonized;
 import org.springframework.data.elasticsearch.annotations.Document;
 import org.springframework.data.elasticsearch.annotations.Field;
 
@@ -24,11 +23,6 @@ import org.springframework.data.elasticsearch.annotations.Field;
 @Document(indexName = "column")
 public class ColumnDto {
 
-    @NotNull
-    @Field(name = "container_id")
-    @JsonProperty("container_id")
-    private Long containerId;
-
     @NotNull
     @Field(name = "database_id")
     @JsonProperty("database_id")

dbrepo-metadata-db/api/src/main/java/at/tuwien/api/identifier/IdentifierBriefDto.java

@@ -4,10 +4,9 @@ import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.*;
-
 import jakarta.validation.constraints.NotBlank;
 import jakarta.validation.constraints.NotNull;
+import lombok.*;
 import lombok.extern.jackson.Jacksonized;
 
 import java.time.Instant;
@@ -25,11 +24,6 @@ public class IdentifierBriefDto {
     @NotNull
     private Long id;
 
-    @NotNull
-    @JsonProperty("container_id")
-    @Schema(name = "container id", example = "1")
-    private Long containerId;
-
     @NotNull
     @JsonProperty("database_id")
     @Schema(name = "database id", example = "1")

dbrepo-metadata-db/api/src/main/java/at/tuwien/api/identifier/IdentifierCreateDto.java

@@ -4,11 +4,10 @@ import at.tuwien.api.database.LanguageTypeDto;
 import at.tuwien.api.database.LicenseDto;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.*;
-
 import jakarta.validation.constraints.NotBlank;
-import jakarta.validation.constraints.NotNull;
 import jakarta.validation.constraints.NotEmpty;
+import jakarta.validation.constraints.NotNull;
+import lombok.*;
 import lombok.extern.jackson.Jacksonized;
 
 import java.util.List;
@@ -22,9 +21,6 @@ import java.util.List;
 @ToString
 public class IdentifierCreateDto {
 
-    @NotNull
-    private Long cid;
-
     @NotNull
     private Long dbid;
 

dbrepo-metadata-db/api/src/main/java/at/tuwien/api/identifier/IdentifierDto.java

@@ -7,11 +7,10 @@ import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.*;
-import lombok.extern.jackson.Jacksonized;
-
 import jakarta.validation.constraints.NotBlank;
 import jakarta.validation.constraints.NotNull;
+import lombok.*;
+import lombok.extern.jackson.Jacksonized;
 import org.springframework.data.elasticsearch.annotations.Document;
 
 import java.time.Instant;
@@ -29,11 +28,6 @@ public class IdentifierDto {
 
     private Long id;
 
-    @NotNull
-    @JsonProperty("container_id")
-    @Schema(name = "container id", example = "1")
-    private Long containerId;
-
     @NotNull
     @JsonProperty("database_id")
     @Schema(name = "database id", example = "1")

dbrepo-metadata-db/api/src/main/java/at/tuwien/api/identifier/IdentifierUpdateDto.java

@@ -4,11 +4,10 @@ import at.tuwien.api.database.LanguageTypeDto;
 import at.tuwien.api.database.LicenseDto;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.*;
-
 import jakarta.validation.constraints.NotBlank;
-import jakarta.validation.constraints.NotNull;
 import jakarta.validation.constraints.NotEmpty;
+import jakarta.validation.constraints.NotNull;
+import lombok.*;
 import lombok.extern.jackson.Jacksonized;
 
 import java.util.List;
@@ -22,9 +21,6 @@ import java.util.List;
 @ToString
 public class IdentifierUpdateDto {
 
-    @NotNull
-    private Long cid;
-
     @NotNull
     private Long dbid;