From ac3947f64456a474579e83ab89949d104745eed4 Mon Sep 17 00:00:00 2001 From: siarhei_hrabko Date: Mon, 5 Feb 2024 15:42:38 +0300 Subject: [PATCH 1/2] EPMRPP-88461 switch to LocalDateTime --- .../ws/model/ActivityResource.java | 166 +++-------- .../ws/model/FinishExecutionRQ.java | 91 ++---- .../ta/reportportal/ws/model/StartRQ.java | 66 +---- .../ws/model/launch/LaunchResource.java | 262 ++++-------------- .../reportportal/ws/model/log/SaveLogRQ.java | 176 +++--------- 5 files changed, 161 insertions(+), 600 deletions(-) diff --git a/src/main/java/com/epam/ta/reportportal/ws/model/ActivityResource.java b/src/main/java/com/epam/ta/reportportal/ws/model/ActivityResource.java index b2aee9cc..857683a2 100644 --- a/src/main/java/com/epam/ta/reportportal/ws/model/ActivityResource.java +++ b/src/main/java/com/epam/ta/reportportal/ws/model/ActivityResource.java @@ -20,8 +20,9 @@ import com.fasterxml.jackson.annotation.JsonInclude.Include; import com.fasterxml.jackson.annotation.JsonProperty; import io.swagger.annotations.ApiModelProperty; -import java.util.Date; +import java.time.LocalDateTime; import javax.validation.constraints.NotNull; +import lombok.Data; /** * JSON Representation of Report Portal's Activity domain object. @@ -29,144 +30,51 @@ * @see HATEOAS Description */ @JsonInclude(Include.NON_NULL) +@Data public class ActivityResource { - @NotNull - @JsonProperty(value = "id", required = true) - @ApiModelProperty(required = true) - private Long id; + @NotNull + @JsonProperty(value = "id", required = true) + @ApiModelProperty(required = true) + private Long id; - @NotNull - @JsonProperty(value = "user", required = true) - @ApiModelProperty(required = true) - private String user; + @NotNull + @JsonProperty(value = "user", required = true) + @ApiModelProperty(required = true) + private String user; - @NotNull - @JsonProperty(value = "loggedObjectId", required = true) - @ApiModelProperty(required = true) - private Long loggedObjectId; + @NotNull + @JsonProperty(value = "loggedObjectId", required = true) + @ApiModelProperty(required = true) + private Long loggedObjectId; - @NotNull - @JsonProperty(value = "lastModified", required = true) - @ApiModelProperty(required = true) - private Date lastModified; + @NotNull + @JsonProperty(value = "lastModified", required = true) + @ApiModelProperty(required = true) + private LocalDateTime lastModified; - @NotNull - @JsonProperty(value = "actionType", required = true) - @ApiModelProperty(required = true) - private String actionType; + @NotNull + @JsonProperty(value = "actionType", required = true) + @ApiModelProperty(required = true) + private String actionType; - @NotNull - @JsonProperty(value = "objectType", required = true) - @ApiModelProperty(required = true) - private String objectType; + @NotNull + @JsonProperty(value = "objectType", required = true) + @ApiModelProperty(required = true) + private String objectType; - @NotNull - @JsonProperty(value = "projectId", required = true) - @ApiModelProperty(required = true) - private Long projectId; + @NotNull + @JsonProperty(value = "projectId", required = true) + @ApiModelProperty(required = true) + private Long projectId; - @JsonProperty(value = "projectName") - private String projectName; + @JsonProperty(value = "projectName") + private String projectName; - @JsonProperty(value = "details") - private Object details; + @JsonProperty(value = "details") + private Object details; - @JsonProperty(value = "objectName") - private String objectName; + @JsonProperty(value = "objectName") + private String objectName; - public Long getId() { - return id; - } - - public void setId(Long id) { - this.id = id; - } - - public String getUser() { - return user; - } - - public void setUser(String user) { - this.user = user; - } - - public Long getLoggedObjectId() { - return loggedObjectId; - } - - public void setLoggedObjectId(Long loggedObjectId) { - this.loggedObjectId = loggedObjectId; - } - - public Date getLastModified() { - return lastModified; - } - - public void setLastModified(Date lastModified) { - this.lastModified = lastModified; - } - - public String getActionType() { - return actionType; - } - - public void setActionType(String actionType) { - this.actionType = actionType; - } - - public String getObjectType() { - return objectType; - } - - public void setObjectType(String objectType) { - this.objectType = objectType; - } - - public Long getProjectId() { - return projectId; - } - - public void setProjectId(Long projectId) { - this.projectId = projectId; - } - - public String getProjectName() { - return projectName; - } - - public void setProjectName(String projectName) { - this.projectName = projectName; - } - - public Object getDetails() { - return details; - } - - public void setDetails(Object details) { - this.details = details; - } - - public String getObjectName() { - return objectName; - } - - public void setObjectName(String objectName) { - this.objectName = objectName; - } - - @Override - public String toString() { - return "ActivityResource{" + "id=" + id - + ", user='" + user + '\'' - + ", loggedObjectId='" + loggedObjectId + '\'' - + ", lastModified=" + lastModified - + ", actionType='" + actionType + '\'' - + ", objectType='" + objectType + '\'' - + ", projectId=" + projectId - + ", projectName='" + projectName + '\'' - + ", objectName='" + objectName + '\'' - + ", details=" + details - + '}'; - } } diff --git a/src/main/java/com/epam/ta/reportportal/ws/model/FinishExecutionRQ.java b/src/main/java/com/epam/ta/reportportal/ws/model/FinishExecutionRQ.java index 40478e77..014441fa 100644 --- a/src/main/java/com/epam/ta/reportportal/ws/model/FinishExecutionRQ.java +++ b/src/main/java/com/epam/ta/reportportal/ws/model/FinishExecutionRQ.java @@ -16,6 +16,8 @@ package com.epam.ta.reportportal.ws.model; +import static com.epam.ta.reportportal.ws.model.ValidationConstraints.MAX_PARAMETERS_LENGTH; + import com.epam.ta.reportportal.ws.annotations.In; import com.epam.ta.reportportal.ws.model.attribute.ItemAttributesRQ; import com.fasterxml.jackson.annotation.JsonAlias; @@ -23,84 +25,41 @@ import com.fasterxml.jackson.annotation.JsonInclude.Include; import com.fasterxml.jackson.annotation.JsonProperty; import io.swagger.annotations.ApiModelProperty; - +import java.time.LocalDateTime; +import java.util.Set; import javax.validation.Valid; import javax.validation.constraints.NotNull; import javax.validation.constraints.Size; -import java.util.Date; -import java.util.Set; - -import static com.epam.ta.reportportal.ws.model.ValidationConstraints.MAX_PARAMETERS_LENGTH; +import lombok.Data; /** - * Finishes some entity execution in Report Portal
- * May be Launch, TestSuite, Test, TestStep + * Finishes some entity execution in Report Portal
May be Launch, TestSuite, Test, TestStep * * @author Andrei Varabyeu */ @JsonInclude(Include.NON_NULL) +@Data public class FinishExecutionRQ { - @NotNull - @JsonProperty(value = "endTime", required = true) - @JsonAlias({ "endTime", "end_time" }) - @ApiModelProperty(required = true) - private Date endTime; - - @JsonProperty(value = "status") - @In(allowedValues = { "passed", "failed", "stopped", "skipped", "interrupted", "cancelled", "info", "warn" }) - @ApiModelProperty(allowableValues = "PASSED, FAILED, STOPPED, SKIPPED, INTERRUPTED, CANCELLED, INFO, WARN") - private String status; - - @JsonProperty(value = "description") - private String description; - - @Size(max = MAX_PARAMETERS_LENGTH) - @Valid - @JsonProperty - @JsonAlias({ "attributes", "tags" }) - private Set attributes; - - public String getDescription() { - return description; - } - - public void setDescription(String description) { - this.description = description; - } - - public Set getAttributes() { - return attributes; - } - - public void setAttributes(Set attributes) { - this.attributes = attributes; - } - - public Date getEndTime() { - return endTime; - } + @NotNull + @JsonProperty(value = "endTime", required = true) + @JsonAlias({"endTime", "end_time"}) + @ApiModelProperty(required = true) + private LocalDateTime endTime; - public void setEndTime(Date endTime) { - this.endTime = endTime; - } + @JsonProperty(value = "status") + @In(allowedValues = {"passed", "failed", "stopped", "skipped", "interrupted", "cancelled", "info", + "warn"}) + @ApiModelProperty(allowableValues = "PASSED, FAILED, STOPPED, SKIPPED, INTERRUPTED, CANCELLED, INFO, WARN") + private String status; - public String getStatus() { - return status; - } + @JsonProperty(value = "description") + private String description; - public void setStatus(String status) { - this.status = status; - } + @Size(max = MAX_PARAMETERS_LENGTH) + @Valid + @JsonProperty + @JsonAlias({"attributes", "tags"}) + private Set attributes; - @Override - public String toString() { - final StringBuilder sb = new StringBuilder("FinishExecutionRQ{"); - sb.append("endTime=").append(endTime); - sb.append(", status='").append(status).append('\''); - sb.append(", description='").append(description).append('\''); - sb.append(", attributes=").append(attributes); - sb.append('}'); - return sb.toString(); - } -} \ No newline at end of file +} diff --git a/src/main/java/com/epam/ta/reportportal/ws/model/StartRQ.java b/src/main/java/com/epam/ta/reportportal/ws/model/StartRQ.java index 992ae3e5..e1bb2813 100644 --- a/src/main/java/com/epam/ta/reportportal/ws/model/StartRQ.java +++ b/src/main/java/com/epam/ta/reportportal/ws/model/StartRQ.java @@ -16,20 +16,20 @@ package com.epam.ta.reportportal.ws.model; +import static com.epam.ta.reportportal.ws.model.ValidationConstraints.MAX_PARAMETERS_LENGTH; + import com.epam.ta.reportportal.ws.model.attribute.ItemAttributesRQ; import com.fasterxml.jackson.annotation.JsonAlias; import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonInclude.Include; import com.fasterxml.jackson.annotation.JsonProperty; import io.swagger.annotations.ApiModelProperty; - +import java.time.LocalDateTime; +import java.util.Set; import javax.validation.Valid; import javax.validation.constraints.NotNull; import javax.validation.constraints.Size; -import java.util.Date; -import java.util.Set; - -import static com.epam.ta.reportportal.ws.model.ValidationConstraints.MAX_PARAMETERS_LENGTH; +import lombok.Data; /** * Base entity for start requests @@ -37,6 +37,7 @@ * @author Andrei Varabyeu */ @JsonInclude(Include.NON_NULL) +@Data public class StartRQ { @JsonProperty(value = "name", required = true) @@ -56,63 +57,12 @@ public class StartRQ { @JsonProperty(required = true) @JsonAlias({ "startTime", "start_time" }) @ApiModelProperty(required = true) - private Date startTime; + private LocalDateTime startTime; @ApiModelProperty(hidden = true) @JsonProperty(value = "uuid") private String uuid; - public String getName() { - return name; - } - - public void setName(String name) { - this.name = name; - } - - public String getDescription() { - return description; - } - - public void setDescription(String description) { - this.description = description; - } - - public Set getAttributes() { - return attributes; - } - - public void setAttributes(Set attributes) { - this.attributes = attributes; - } - - public String getUuid() { - return uuid; - } - - public void setUuid(String uuid) { - this.uuid = uuid; - } - - public Date getStartTime() { - return startTime; - } - - public void setStartTime(Date startTime) { - this.startTime = startTime; - } - - @Override - public String toString() { - final StringBuilder sb = new StringBuilder("StartRQ{"); - sb.append("name='").append(name).append('\''); - sb.append(", description='").append(description).append('\''); - sb.append(", attributes=").append(attributes); - sb.append(", startTime=").append(startTime); - sb.append('}'); - return sb.toString(); - } - @Override public boolean equals(Object o) { if (this == o) { @@ -144,4 +94,4 @@ public int hashCode() { result = 31 * result + (startTime != null ? startTime.hashCode() : 0); return result; } -} \ No newline at end of file +} diff --git a/src/main/java/com/epam/ta/reportportal/ws/model/launch/LaunchResource.java b/src/main/java/com/epam/ta/reportportal/ws/model/launch/LaunchResource.java index 83f3b50f..2e560489 100644 --- a/src/main/java/com/epam/ta/reportportal/ws/model/launch/LaunchResource.java +++ b/src/main/java/com/epam/ta/reportportal/ws/model/launch/LaunchResource.java @@ -23,15 +23,16 @@ import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonInclude.Include; import com.fasterxml.jackson.annotation.JsonProperty; - +import java.time.LocalDateTime; +import java.util.LinkedHashSet; +import java.util.Map; +import java.util.Set; import javax.validation.Valid; import javax.validation.constraints.NotBlank; import javax.validation.constraints.NotNull; import javax.validation.constraints.Size; -import java.util.Date; -import java.util.LinkedHashSet; -import java.util.Map; -import java.util.Set; +import lombok.Data; +import lombok.EqualsAndHashCode; /** * JSON Representation of Report Portal's Launch domain object @@ -39,229 +40,68 @@ * @author Andrei Varabyeu */ @JsonInclude(Include.NON_NULL) +@Data +@EqualsAndHashCode(callSuper = true) public class LaunchResource extends OwnedResource { - @NotNull - @JsonProperty(value = "id", required = true) - private Long launchId; - - @NotBlank - @JsonProperty(value = "uuid", required = true) - private String uuid; - - @NotBlank - @Size(min = ValidationConstraints.MIN_NAME_LENGTH, max = ValidationConstraints.MAX_NAME_LENGTH) - @JsonProperty(value = "name", required = true) - private String name; - - @NotNull - @JsonProperty(value = "number", required = true) - private Long number; - - @JsonProperty(value = "description") - @Size(max = ValidationConstraints.MAX_LAUNCH_DESCRIPTION_LENGTH) - private String description; - - @NotNull - @JsonProperty(value = "startTime", required = true) - private Date startTime; - - @JsonProperty(value = "endTime") - private Date endTime; - - @JsonProperty(value = "lastModified") - private Date lastModified; - - @NotNull - @JsonProperty(value = "status", required = true) - private String status; - - @JsonProperty(value = "statistics") - @Valid - private StatisticsResource statisticsResource; - - @JsonProperty(value = "attributes") - private Set attributes; - - @JsonProperty(value = "mode") - private Mode mode; - - @JsonProperty(value = "analysing") - private Set analyzers = new LinkedHashSet<>(); - - @JsonProperty(value = "approximateDuration") - private double approximateDuration; - - @JsonProperty(value = "hasRetries") - private boolean hasRetries; - - @JsonProperty(value = "rerun") - private boolean rerun; - - @JsonProperty(value = "metadata") - private Map metadata; - - public double getApproximateDuration() { - return approximateDuration; - } - - public void setApproximateDuration(double approximateDuration) { - this.approximateDuration = approximateDuration; - } - - public Long getLaunchId() { - return launchId; - } - - public void setLaunchId(Long launchId) { - this.launchId = launchId; - } - - public String getUuid() { - return uuid; - } - - public void setUuid(String uuid) { - this.uuid = uuid; - } - - public String getName() { - return name; - } - - public void setName(String name) { - this.name = name; - } - - public Long getNumber() { - return number; - } - - public void setNumber(Long number) { - this.number = number; - } - - public String getDescription() { - return description; - } - - public void setDescription(String description) { - this.description = description; - } - - public Date getStartTime() { - return startTime; - } - - public void setStartTime(Date startTime) { - this.startTime = startTime; - } - - public Date getEndTime() { - return endTime; - } - - public void setEndTime(Date endTime) { - this.endTime = endTime; - } - - public Date getLastModified() { - return lastModified; - } - - public void setLastModified(Date lastModified) { - this.lastModified = lastModified; - } - - public String getStatus() { - return status; - } + @NotNull + @JsonProperty(value = "id", required = true) + private Long launchId; - public void setStatus(String status) { - this.status = status; - } + @NotBlank + @JsonProperty(value = "uuid", required = true) + private String uuid; - public StatisticsResource getStatisticsResource() { - return statisticsResource; - } + @NotBlank + @Size(min = ValidationConstraints.MIN_NAME_LENGTH, max = ValidationConstraints.MAX_NAME_LENGTH) + @JsonProperty(value = "name", required = true) + private String name; - public void setStatisticsResource(StatisticsResource statisticsResource) { - this.statisticsResource = statisticsResource; - } + @NotNull + @JsonProperty(value = "number", required = true) + private Long number; - public Set getAttributes() { - return attributes; - } + @JsonProperty(value = "description") + @Size(max = ValidationConstraints.MAX_LAUNCH_DESCRIPTION_LENGTH) + private String description; - public void setAttributes(Set attributes) { - this.attributes = attributes; - } + @NotNull + @JsonProperty(value = "startTime", required = true) + private LocalDateTime startTime; - public Mode getMode() { - return mode; - } + @JsonProperty(value = "endTime") + private LocalDateTime endTime; - public void setMode(Mode mode) { - this.mode = mode; - } + @JsonProperty(value = "lastModified") + private LocalDateTime lastModified; - public Set getAnalyzers() { - return analyzers; - } + @NotNull + @JsonProperty(value = "status", required = true) + private String status; - public void setAnalyzers(Set analyzers) { - this.analyzers = analyzers; - } + @JsonProperty(value = "statistics") + @Valid + private StatisticsResource statisticsResource; - public boolean isHasRetries() { - return hasRetries; - } + @JsonProperty(value = "attributes") + private Set attributes; - public boolean getHasRetries() { - return hasRetries; - } + @JsonProperty(value = "mode") + private Mode mode; - public void setHasRetries(boolean hasRetries) { - this.hasRetries = hasRetries; - } + @JsonProperty(value = "analysing") + private Set analyzers = new LinkedHashSet<>(); - public boolean isRerun() { - return rerun; - } + @JsonProperty(value = "approximateDuration") + private double approximateDuration; - public void setRerun(boolean rerun) { - this.rerun = rerun; - } + @JsonProperty(value = "hasRetries") + private boolean hasRetries; - public Map getMetadata() { - return metadata; - } + @JsonProperty(value = "rerun") + private boolean rerun; - public void setMetadata(Map metadata) { - this.metadata = metadata; - } + @JsonProperty(value = "metadata") + private Map metadata; - @Override - public String toString() { - final StringBuilder sb = new StringBuilder("LaunchResource{"); - sb.append("launchId=").append(launchId); - sb.append(", uuid='").append(uuid).append('\''); - sb.append(", name='").append(name).append('\''); - sb.append(", number=").append(number); - sb.append(", description='").append(description).append('\''); - sb.append(", startTime=").append(startTime); - sb.append(", endTime=").append(endTime); - sb.append(", lastModified=").append(lastModified); - sb.append(", status='").append(status).append('\''); - sb.append(", statisticsResource=").append(statisticsResource); - sb.append(", attributes=").append(attributes); - sb.append(", mode=").append(mode); - sb.append(", analyzers=").append(analyzers); - sb.append(", approximateDuration=").append(approximateDuration); - sb.append(", hasRetries=").append(hasRetries); - sb.append(", rerun=").append(rerun); - sb.append(", metadata=").append(metadata); - sb.append('}'); - return sb.toString(); - } } diff --git a/src/main/java/com/epam/ta/reportportal/ws/model/log/SaveLogRQ.java b/src/main/java/com/epam/ta/reportportal/ws/model/log/SaveLogRQ.java index e2d50c0e..87dc395f 100644 --- a/src/main/java/com/epam/ta/reportportal/ws/model/log/SaveLogRQ.java +++ b/src/main/java/com/epam/ta/reportportal/ws/model/log/SaveLogRQ.java @@ -22,158 +22,62 @@ import com.fasterxml.jackson.annotation.JsonInclude.Include; import com.fasterxml.jackson.annotation.JsonProperty; import io.swagger.annotations.ApiModelProperty; - +import java.time.LocalDateTime; import javax.validation.constraints.NotNull; -import java.util.Arrays; -import java.util.Date; +import lombok.Data; +import lombok.Getter; +import lombok.Setter; +import lombok.ToString; /** * @author Henadzi_Vrubleuski * @author Andrei Varabyeu */ @JsonInclude(Include.NON_NULL) +@Data public class SaveLogRQ { - @JsonProperty("uuid") - private String uuid; + @JsonProperty("uuid") + private String uuid; + + @JsonAlias({"itemUuid", "item_id"}) + @ApiModelProperty(value = "UUID of test item owned this log") + private String itemUuid; + + @JsonProperty(value = "launchUuid") + @ApiModelProperty(required = true) + private String launchUuid; + + @NotNull + @JsonProperty(value = "time", required = true) + @ApiModelProperty(required = true) + private LocalDateTime logTime; - @JsonAlias({ "itemUuid", "item_id" }) - @ApiModelProperty(value = "UUID of test item owned this log") - private String itemUuid; + @JsonProperty(value = "message") + private String message; - @JsonProperty(value = "launchUuid") - @ApiModelProperty(required = true) - private String launchUuid; + @JsonProperty(value = "level") + @ApiModelProperty(allowableValues = "error, warn, info, debug, trace, fatal, unknown") + private String level; - @NotNull - @JsonProperty(value = "time", required = true) - @ApiModelProperty(required = true) - private Date logTime; + @JsonProperty(value = "file") + private File file; - @JsonProperty(value = "message") - private String message; + @JsonInclude(Include.NON_NULL) + @Getter + @Setter + @ToString + public static class File { - @JsonProperty(value = "level") - @ApiModelProperty(allowableValues = "error, warn, info, debug, trace, fatal, unknown") - private String level; + @JsonProperty(value = "name") + private String name; - @JsonProperty(value = "file") - private File file; + @JsonIgnore + private byte[] content; - public String getUuid() { - return uuid; - } + @JsonIgnore + private String contentType; - public void setUuid(String uuid) { - this.uuid = uuid; - } + } - public Date getLogTime() { - return logTime; - } - - public void setLogTime(Date logTime) { - this.logTime = logTime; - } - - public String getMessage() { - return message; - } - - public void setMessage(String message) { - this.message = message; - } - - public String getItemUuid() { - return itemUuid; - } - - public void setItemUuid(String itemUuid) { - this.itemUuid = itemUuid; - } - - public String getLaunchUuid() { - return launchUuid; - } - - public void setLaunchUuid(String launchUuid) { - this.launchUuid = launchUuid; - } - - public void setLevel(String level) { - this.level = level; - } - - public String getLevel() { - return level; - } - - public void setFile(File file) { - this.file = file; - } - - public File getFile() { - return file; - } - - @JsonInclude(Include.NON_NULL) - public static class File { - - @JsonProperty(value = "name") - private String name; - - @JsonIgnore - private byte[] content; - - @JsonIgnore - private String contentType; - - public void setName(String name) { - this.name = name; - } - - public String getName() { - return name; - } - - public byte[] getContent() { - return content; - } - - public void setContent(byte[] content) { - this.content = content; - } - - public String getContentType() { - return contentType; - } - - public void setContentType(String contentType) { - this.contentType = contentType; - } - - @Override - public String toString() { - final StringBuilder sb = new StringBuilder("File{"); - sb.append("name='").append(name).append('\''); - sb.append(", content=").append(Arrays.toString(content)); - sb.append(", contentType='").append(contentType).append('\''); - sb.append('}'); - return sb.toString(); - } - } - - @Override - public String toString() { - final StringBuilder sb = new StringBuilder("SaveLogRQ{"); - sb.append("uuid='").append(uuid).append('\''); - sb.append(", itemUuid='").append(itemUuid).append('\''); - sb.append(", launchUuid='").append(launchUuid).append('\''); - sb.append(", logTime=").append(logTime); - sb.append(", message='").append(message).append('\''); - sb.append(", level='").append(level).append('\''); - sb.append(", file=").append(file); - sb.append('}'); - return sb.toString(); - } } From a44a49efbd5ffd28a54d2ed9419b073f7dcb665a Mon Sep 17 00:00:00 2001 From: siarhei_hrabko Date: Tue, 20 Feb 2024 13:40:55 +0300 Subject: [PATCH 2/2] EPMRPP-89261 merge conflicts --- .../com/epam/ta/reportportal/ws/model/FinishExecutionRQ.java | 2 -- src/main/java/com/epam/ta/reportportal/ws/model/StartRQ.java | 2 -- .../java/com/epam/ta/reportportal/ws/model/log/SaveLogRQ.java | 2 -- 3 files changed, 6 deletions(-) diff --git a/src/main/java/com/epam/ta/reportportal/ws/model/FinishExecutionRQ.java b/src/main/java/com/epam/ta/reportportal/ws/model/FinishExecutionRQ.java index d1e61178..f5040a68 100644 --- a/src/main/java/com/epam/ta/reportportal/ws/model/FinishExecutionRQ.java +++ b/src/main/java/com/epam/ta/reportportal/ws/model/FinishExecutionRQ.java @@ -24,10 +24,8 @@ import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonInclude.Include; import com.fasterxml.jackson.annotation.JsonProperty; - import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.media.Schema.RequiredMode; -import io.swagger.annotations.ApiModelProperty; import java.time.LocalDateTime; import java.util.Set; import javax.validation.Valid; diff --git a/src/main/java/com/epam/ta/reportportal/ws/model/StartRQ.java b/src/main/java/com/epam/ta/reportportal/ws/model/StartRQ.java index f17a76ed..3c107db7 100644 --- a/src/main/java/com/epam/ta/reportportal/ws/model/StartRQ.java +++ b/src/main/java/com/epam/ta/reportportal/ws/model/StartRQ.java @@ -23,10 +23,8 @@ import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonInclude.Include; import com.fasterxml.jackson.annotation.JsonProperty; - import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.media.Schema.RequiredMode; -import io.swagger.annotations.ApiModelProperty; import java.time.LocalDateTime; import java.util.Set; import javax.validation.Valid; diff --git a/src/main/java/com/epam/ta/reportportal/ws/model/log/SaveLogRQ.java b/src/main/java/com/epam/ta/reportportal/ws/model/log/SaveLogRQ.java index ebc4c124..212906eb 100644 --- a/src/main/java/com/epam/ta/reportportal/ws/model/log/SaveLogRQ.java +++ b/src/main/java/com/epam/ta/reportportal/ws/model/log/SaveLogRQ.java @@ -21,10 +21,8 @@ import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonInclude.Include; import com.fasterxml.jackson.annotation.JsonProperty; - import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.media.Schema.RequiredMode; -import io.swagger.annotations.ApiModelProperty; import java.time.LocalDateTime; import javax.validation.constraints.NotNull; import lombok.Data;