Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions gradle.properties
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
version=5.14.0
version=5.15.1

org.gradle.parallel=true
org.gradle.caching=true
Expand All @@ -8,6 +8,6 @@ hibernateValidatorVersion=8.0.2.Final
junitVersion=5.11.4
mockitoJunitJupiter=5.14.2
springDocVersion=2.7.0
commonsLangVersion=3.17.0
commonsLangVersion=3.20.0
jacksonVersion=2.18.2
lombokVersion=1.18.36
lombokVersion=1.18.42
Original file line number Diff line number Diff line change
Expand Up @@ -25,15 +25,17 @@
import jakarta.validation.constraints.Size;
import lombok.Getter;
import lombok.Setter;
import lombok.ToString;

/**
* Base entity for sharable resources. This resource should contains owner in response.
* Base entity for sharable resources. This resource should contain owner in response.
*
* @author Aliaksei_Makayed
*/
@Setter
@Getter
@JsonInclude(Include.NON_NULL)
@ToString
public class OwnedResource {

@JsonProperty(value = "owner")
Expand All @@ -42,10 +44,7 @@ public class OwnedResource {
@Size(min = MIN_DESCRIPTION, max = MAX_ENTITY_DESCRIPTION)
private String description;

@Override
public String toString() {
return "OwnedResource{" + "owner='" + owner + '\''
+ ", description='" + description + '\''
+ '}';
}
@JsonProperty(value = "locked")
private boolean locked;

}
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,10 @@
import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
import io.swagger.v3.oas.annotations.media.Schema;
import io.swagger.v3.oas.annotations.media.Schema.RequiredMode;
import java.time.Instant;
import jakarta.validation.constraints.NotNull;
import jakarta.validation.constraints.Pattern;
import jakarta.validation.constraints.Size;
import java.time.Instant;
import lombok.Getter;
import lombok.Setter;
import lombok.ToString;
Expand Down Expand Up @@ -62,7 +64,8 @@ public class SaveLogRQ {
private String message;

@JsonProperty(value = "level")
@Schema(allowableValues = "error, warn, info, debug, trace, fatal, unknown")
@Size(min = 3, max = 16)
@Pattern(regexp = "^[A-Za-z0-9 ]+$")
private String level;

@JsonProperty(value = "file")
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,13 +21,12 @@
import com.fasterxml.jackson.annotation.JsonInclude.Include;
import com.fasterxml.jackson.annotation.JsonProperty;
import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
import lombok.Getter;
import lombok.Setter;
import lombok.ToString;

import java.time.Instant;
import java.util.List;
import java.util.Set;
import lombok.Getter;
import lombok.Setter;
import lombok.ToString;

/**
* JSON Representation of Report Portal domain object
Expand Down Expand Up @@ -117,4 +116,10 @@ public class TestItemResource {
@JsonProperty(value = "path")
private String path;

@JsonProperty(value = "hasNestedSteps")
private boolean hasNestedSteps;

@JsonProperty(value = "analysisOwner")
private String analysisOwner;

}