From d113dc843d78d65b64dc983f7f1719a806f40a64 Mon Sep 17 00:00:00 2001
From: Martin Weise <martin.weise@tuwien.ac.at>
Date: Thu, 16 Nov 2023 19:50:11 +0100
Subject: [PATCH] Fixed some tests
---
.../at/tuwien/api/container/ContainerDto.java | 18 ++++++------------
.../tuwien/entities/container/Container.java | 10 +++++-----
2 files changed, 11 insertions(+), 17 deletions(-)
diff --git a/dbrepo-metadata-service/api/src/main/java/at/tuwien/api/container/ContainerDto.java b/dbrepo-metadata-service/api/src/main/java/at/tuwien/api/container/ContainerDto.java
index d891894782..78435fc540 100644
--- a/dbrepo-metadata-service/api/src/main/java/at/tuwien/api/container/ContainerDto.java
+++ b/dbrepo-metadata-service/api/src/main/java/at/tuwien/api/container/ContainerDto.java
@@ -38,20 +38,8 @@ public class ContainerDto {
@NotBlank
private String host;
- @NotNull
private Integer port;
- @NotBlank
- @JsonProperty("ui_host")
- private String uiHost;
-
- @NotNull
- @JsonProperty("ui_port")
- private Integer uiPort;
-
- @JsonProperty("ui_additional_flags")
- private String uiAdditionalFlags;
-
@NotBlank
@JsonProperty("sidecar_host")
private String sidecarHost;
@@ -60,6 +48,12 @@ public class ContainerDto {
@JsonProperty("sidecar_port")
private Integer sidecarPort;
+ @JsonProperty("ui_host")
+ private String uiHost;
+
+ @JsonProperty("ui_port")
+ private Integer uiPort;
+
private ImageBriefDto image;
@NotNull
diff --git a/dbrepo-metadata-service/entities/src/main/java/at/tuwien/entities/container/Container.java b/dbrepo-metadata-service/entities/src/main/java/at/tuwien/entities/container/Container.java
index 408f635e05..82b646e3ad 100644
--- a/dbrepo-metadata-service/entities/src/main/java/at/tuwien/entities/container/Container.java
+++ b/dbrepo-metadata-service/entities/src/main/java/at/tuwien/entities/container/Container.java
@@ -42,19 +42,19 @@ public class Container {
@Column(nullable = false)
private String host;
- @Column(nullable = false, columnDefinition = "integer default 3306")
+ @Column
private Integer port;
- @Column(nullable = false, columnDefinition = "varchar(255) default host")
+ @Column(nullable = false)
private String sidecarHost;
- @Column(nullable = false, columnDefinition = "integer default 3305")
+ @Column(nullable = false)
private Integer sidecarPort;
- @Column(columnDefinition = "varchar(255) default host")
+ @Column
private String uiHost;
- @Column(columnDefinition = "integer default port")
+ @Column
private Integer uiPort;
@Column
--
GitLab