From a732f121dde2a6efc356d9c67c4692f607b71359 Mon Sep 17 00:00:00 2001 From: CaptainB Date: Wed, 31 May 2023 09:45:14 +0800 Subject: [PATCH] build: sdk domain --- .../main/java/io/metersphere/sdk/domain/Environment.java | 8 +++----- .../java/io/metersphere/sdk/domain/EnvironmentGroup.java | 8 +++----- .../metersphere/sdk/domain/EnvironmentGroupProject.java | 6 ++---- .../java/io/metersphere/sdk/domain/ExecutionQueue.java | 6 ++---- .../io/metersphere/sdk/domain/ExecutionQueueDetail.java | 6 ++---- .../java/io/metersphere/sdk/domain/RelationshipEdge.java | 8 +++----- .../main/java/io/metersphere/sdk/domain/ShareInfo.java | 8 +++----- 7 files changed, 18 insertions(+), 32 deletions(-) diff --git a/backend/framework/domain/src/main/java/io/metersphere/sdk/domain/Environment.java b/backend/framework/domain/src/main/java/io/metersphere/sdk/domain/Environment.java index 5dcc0fabf0..e04da3429b 100644 --- a/backend/framework/domain/src/main/java/io/metersphere/sdk/domain/Environment.java +++ b/backend/framework/domain/src/main/java/io/metersphere/sdk/domain/Environment.java @@ -1,10 +1,8 @@ package io.metersphere.sdk.domain; -import io.metersphere.validation.groups.Created; -import io.metersphere.validation.groups.Updated; +import io.metersphere.validation.groups.*; import io.swagger.v3.oas.annotations.media.Schema; -import jakarta.validation.constraints.NotBlank; -import jakarta.validation.constraints.Size; +import jakarta.validation.constraints.*; import java.io.Serializable; import lombok.Data; @@ -37,7 +35,7 @@ public class Environment implements Serializable { @Schema(title = "端口") private Integer port; - @Schema(title = "创建人", requiredMode = Schema.RequiredMode.REQUIRED) + @Schema(title = "创建人") private String createUser; @Schema(title = "创建时间") diff --git a/backend/framework/domain/src/main/java/io/metersphere/sdk/domain/EnvironmentGroup.java b/backend/framework/domain/src/main/java/io/metersphere/sdk/domain/EnvironmentGroup.java index 283a66b289..ff44e56504 100644 --- a/backend/framework/domain/src/main/java/io/metersphere/sdk/domain/EnvironmentGroup.java +++ b/backend/framework/domain/src/main/java/io/metersphere/sdk/domain/EnvironmentGroup.java @@ -1,10 +1,8 @@ package io.metersphere.sdk.domain; -import io.metersphere.validation.groups.Created; -import io.metersphere.validation.groups.Updated; +import io.metersphere.validation.groups.*; import io.swagger.v3.oas.annotations.media.Schema; -import jakarta.validation.constraints.NotBlank; -import jakarta.validation.constraints.Size; +import jakarta.validation.constraints.*; import java.io.Serializable; import lombok.Data; @@ -28,7 +26,7 @@ public class EnvironmentGroup implements Serializable { @Schema(title = "环境组描述") private String description; - @Schema(title = "创建人", requiredMode = Schema.RequiredMode.REQUIRED) + @Schema(title = "创建人") private String createUser; @Schema(title = "创建时间") diff --git a/backend/framework/domain/src/main/java/io/metersphere/sdk/domain/EnvironmentGroupProject.java b/backend/framework/domain/src/main/java/io/metersphere/sdk/domain/EnvironmentGroupProject.java index fb7f6da800..c6ce757057 100644 --- a/backend/framework/domain/src/main/java/io/metersphere/sdk/domain/EnvironmentGroupProject.java +++ b/backend/framework/domain/src/main/java/io/metersphere/sdk/domain/EnvironmentGroupProject.java @@ -1,10 +1,8 @@ package io.metersphere.sdk.domain; -import io.metersphere.validation.groups.Created; -import io.metersphere.validation.groups.Updated; +import io.metersphere.validation.groups.*; import io.swagger.v3.oas.annotations.media.Schema; -import jakarta.validation.constraints.NotBlank; -import jakarta.validation.constraints.Size; +import jakarta.validation.constraints.*; import java.io.Serializable; import lombok.Data; diff --git a/backend/framework/domain/src/main/java/io/metersphere/sdk/domain/ExecutionQueue.java b/backend/framework/domain/src/main/java/io/metersphere/sdk/domain/ExecutionQueue.java index 226411b63b..f41694f4d4 100644 --- a/backend/framework/domain/src/main/java/io/metersphere/sdk/domain/ExecutionQueue.java +++ b/backend/framework/domain/src/main/java/io/metersphere/sdk/domain/ExecutionQueue.java @@ -1,10 +1,8 @@ package io.metersphere.sdk.domain; -import io.metersphere.validation.groups.Created; -import io.metersphere.validation.groups.Updated; +import io.metersphere.validation.groups.*; import io.swagger.v3.oas.annotations.media.Schema; -import jakarta.validation.constraints.NotBlank; -import jakarta.validation.constraints.Size; +import jakarta.validation.constraints.*; import java.io.Serializable; import lombok.Data; diff --git a/backend/framework/domain/src/main/java/io/metersphere/sdk/domain/ExecutionQueueDetail.java b/backend/framework/domain/src/main/java/io/metersphere/sdk/domain/ExecutionQueueDetail.java index fd2efe18b3..5dc5812d94 100644 --- a/backend/framework/domain/src/main/java/io/metersphere/sdk/domain/ExecutionQueueDetail.java +++ b/backend/framework/domain/src/main/java/io/metersphere/sdk/domain/ExecutionQueueDetail.java @@ -1,10 +1,8 @@ package io.metersphere.sdk.domain; -import io.metersphere.validation.groups.Created; -import io.metersphere.validation.groups.Updated; +import io.metersphere.validation.groups.*; import io.swagger.v3.oas.annotations.media.Schema; -import jakarta.validation.constraints.NotBlank; -import jakarta.validation.constraints.Size; +import jakarta.validation.constraints.*; import java.io.Serializable; import lombok.Data; diff --git a/backend/framework/domain/src/main/java/io/metersphere/sdk/domain/RelationshipEdge.java b/backend/framework/domain/src/main/java/io/metersphere/sdk/domain/RelationshipEdge.java index 5b6a6bd694..3bc908311d 100644 --- a/backend/framework/domain/src/main/java/io/metersphere/sdk/domain/RelationshipEdge.java +++ b/backend/framework/domain/src/main/java/io/metersphere/sdk/domain/RelationshipEdge.java @@ -1,10 +1,8 @@ package io.metersphere.sdk.domain; -import io.metersphere.validation.groups.Created; -import io.metersphere.validation.groups.Updated; +import io.metersphere.validation.groups.*; import io.swagger.v3.oas.annotations.media.Schema; -import jakarta.validation.constraints.NotBlank; -import jakarta.validation.constraints.Size; +import jakarta.validation.constraints.*; import java.io.Serializable; import lombok.Data; @@ -30,7 +28,7 @@ public class RelationshipEdge implements Serializable { @Size(min = 1, max = 50, message = "{relationship_edge.graph_id.length_range}", groups = {Created.class, Updated.class}) private String graphId; - @Schema(title = "创建人", requiredMode = Schema.RequiredMode.REQUIRED) + @Schema(title = "创建人") private String createUser; @Schema(title = "") diff --git a/backend/framework/domain/src/main/java/io/metersphere/sdk/domain/ShareInfo.java b/backend/framework/domain/src/main/java/io/metersphere/sdk/domain/ShareInfo.java index 2fb19e310f..d9126ce696 100644 --- a/backend/framework/domain/src/main/java/io/metersphere/sdk/domain/ShareInfo.java +++ b/backend/framework/domain/src/main/java/io/metersphere/sdk/domain/ShareInfo.java @@ -1,10 +1,8 @@ package io.metersphere.sdk.domain; -import io.metersphere.validation.groups.Created; -import io.metersphere.validation.groups.Updated; +import io.metersphere.validation.groups.*; import io.swagger.v3.oas.annotations.media.Schema; -import jakarta.validation.constraints.NotBlank; -import jakarta.validation.constraints.Size; +import jakarta.validation.constraints.*; import java.io.Serializable; import lombok.Data; @@ -18,7 +16,7 @@ public class ShareInfo implements Serializable { @Schema(title = "创建时间") private Long createTime; - @Schema(title = "创建人", requiredMode = Schema.RequiredMode.REQUIRED) + @Schema(title = "创建人") private String createUser; @Schema(title = "更新时间")