Merge branch 'develop' into feature/orgs

# Conflicts: # src/main/java/com/epam/ta/reportportal/ws/model/ActivityResource.java # src/main/java/com/epam/ta/reportportal/ws/model/ErrorType.java
reportportal · Feb 28, 2024 · 38a52fb · 38a52fb
2 parents 23adba8 + f466951
commit 38a52fb
Show file tree

Hide file tree

Showing 63 changed files with 116 additions and 3,526 deletions.
diff --git a/build.gradle b/build.gradle
@@ -41,11 +41,11 @@ wrapper {
 }
 
 dependencies {
-    compile "io.swagger:swagger-annotations:${swaggerAnnotationsVersion}"
-    compile "com.fasterxml.jackson.core:jackson-databind:${jacksonVersion}"
-    compile "javax.validation:validation-api:${validationApiVersion}"
-    compile "org.apache.commons:commons-lang3:${commonsLangVersion}"
-    compile group: 'com.google.guava', name: 'guava', version: '28.2-jre'
+    implementation "org.springdoc:springdoc-openapi-data-rest:${sprindocAnnotationsVersion}"
+    implementation "com.fasterxml.jackson.core:jackson-databind:${jacksonVersion}"
+    implementation "javax.validation:validation-api:${validationApiVersion}"
+    implementation "org.apache.commons:commons-lang3:${commonsLangVersion}"
+    implementation group: 'com.google.guava', name: 'guava', version: '28.2-jre'
 
     // add lombok support
     compileOnly "org.projectlombok:lombok:${lombokVersion}"

diff --git a/gradle.properties b/gradle.properties
@@ -4,7 +4,7 @@ hibernateValidatorVersion=6.1.2.Final
 validationApiVersion=2.0.1.Final
 junitVersion=4.12
 elApiVersion=3.0.0
-swaggerAnnotationsVersion=1.6.0
+sprindocAnnotationsVersion=1.7.0
 commonsLangVersion=3.9
 mockitoJunitJupiter=2.23.0
 jacksonVersion=2.10.2

diff --git a/src/main/java/com/epam/ta/reportportal/ws/annotations/In.java b/src/main/java/com/epam/ta/reportportal/ws/annotations/In.java
@@ -16,8 +16,12 @@
 
 package com.epam.ta.reportportal.ws.annotations;
 
+import java.lang.annotation.Documented;
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
 import javax.validation.Constraint;
-import java.lang.annotation.*;
 
 /**
  * Can be used with strings.

diff --git a/src/main/java/com/epam/ta/reportportal/ws/annotations/InCollectionValidator.java b/src/main/java/com/epam/ta/reportportal/ws/annotations/InCollectionValidator.java
@@ -16,12 +16,12 @@
 
 package com.epam.ta.reportportal.ws.annotations;
 
-import javax.validation.ConstraintValidator;
-import javax.validation.ConstraintValidatorContext;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collection;
 import java.util.List;
+import javax.validation.ConstraintValidator;
+import javax.validation.ConstraintValidatorContext;
 
 /**
  * @author <a href="mailto:[email protected]">Ihar Kahadouski</a>
@@ -40,7 +40,7 @@ public void initialize(In constraintAnnotation) {
 
 	@Override
 	public boolean isValid(Collection<String> value, ConstraintValidatorContext context) {
-		List<String> upperCaseList = new ArrayList<String>();
+		List<String> upperCaseList = new ArrayList<>();
 		for (String next : value) {
 			upperCaseList.add(next.toUpperCase());
 		}

diff --git a/src/main/java/com/epam/ta/reportportal/ws/annotations/NotBlankString.java b/src/main/java/com/epam/ta/reportportal/ws/annotations/NotBlankString.java
@@ -16,8 +16,12 @@
 
 package com.epam.ta.reportportal.ws.annotations;
 
+import java.lang.annotation.Documented;
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
 import javax.validation.Constraint;
-import java.lang.annotation.*;
 
 /**
  * Can be used with strings.

diff --git a/src/main/java/com/epam/ta/reportportal/ws/annotations/NotBlankStringCollection.java b/src/main/java/com/epam/ta/reportportal/ws/annotations/NotBlankStringCollection.java
@@ -16,8 +16,12 @@
 
 package com.epam.ta.reportportal.ws.annotations;
 
+import java.lang.annotation.Documented;
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
 import javax.validation.Constraint;
-import java.lang.annotation.*;
 
 /**
  * Can be used with collection of strings.

diff --git a/src/main/java/com/epam/ta/reportportal/ws/annotations/NotBlankStringCollectionValidator.java b/src/main/java/com/epam/ta/reportportal/ws/annotations/NotBlankStringCollectionValidator.java
@@ -16,9 +16,9 @@
 
 package com.epam.ta.reportportal.ws.annotations;
 
+import java.util.Collection;
 import javax.validation.ConstraintValidator;
 import javax.validation.ConstraintValidatorContext;
-import java.util.Collection;
 
 /**
  * @author <a href="mailto:[email protected]">Ihar Kahadouski</a>

diff --git a/src/main/java/com/epam/ta/reportportal/ws/annotations/NotBlankWithSize.java b/src/main/java/com/epam/ta/reportportal/ws/annotations/NotBlankWithSize.java
@@ -16,19 +16,18 @@
 
 package com.epam.ta.reportportal.ws.annotations;
 
-import com.epam.ta.reportportal.ws.model.validation.NotBlankWithSizeValidator;
-
-import javax.validation.Constraint;
-import javax.validation.Payload;
-import java.lang.annotation.Documented;
-import java.lang.annotation.Retention;
-import java.lang.annotation.Target;
-
 import static java.lang.annotation.ElementType.FIELD;
 import static java.lang.annotation.ElementType.METHOD;
 import static java.lang.annotation.RetentionPolicy.RUNTIME;
 import static org.apache.commons.lang3.StringUtils.EMPTY;
 
+import com.epam.ta.reportportal.ws.model.validation.NotBlankWithSizeValidator;
+import java.lang.annotation.Documented;
+import java.lang.annotation.Retention;
+import java.lang.annotation.Target;
+import javax.validation.Constraint;
+import javax.validation.Payload;
+
 /**
  * @author <a href="mailto:[email protected]">Tatyana Gladysheva</a>
  */

diff --git a/src/main/java/com/epam/ta/reportportal/ws/annotations/NotNullMapValue.java b/src/main/java/com/epam/ta/reportportal/ws/annotations/NotNullMapValue.java
@@ -16,11 +16,11 @@
 
 package com.epam.ta.reportportal.ws.annotations;
 
-import javax.validation.Constraint;
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
+import javax.validation.Constraint;
 
 @Constraint(validatedBy = { NotNullMapValueValidator.class })
 @Target({ ElementType.FIELD })

diff --git a/src/main/java/com/epam/ta/reportportal/ws/annotations/NotNullMapValueValidator.java b/src/main/java/com/epam/ta/reportportal/ws/annotations/NotNullMapValueValidator.java
@@ -16,9 +16,9 @@
 
 package com.epam.ta.reportportal.ws.annotations;
 
+import java.util.Map;
 import javax.validation.ConstraintValidator;
 import javax.validation.ConstraintValidatorContext;
-import java.util.Map;
 
 public class NotNullMapValueValidator implements ConstraintValidator<NotNullMapValue, Map<?, ?>> {
 

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
@@ -19,7 +19,8 @@
 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 io.swagger.v3.oas.annotations.media.Schema;
+import io.swagger.v3.oas.annotations.media.Schema.RequiredMode;
 import java.util.Date;
 import javax.validation.constraints.NotNull;
 import lombok.Getter;
@@ -39,37 +40,37 @@ public class ActivityResource {
 
   @NotNull
   @JsonProperty(value = "id", required = true)
-  @ApiModelProperty(required = true)
+  @Schema(requiredMode = RequiredMode.REQUIRED)
   private Long id;
 
   @NotNull
   @JsonProperty(value = "user", required = true)
-  @ApiModelProperty(required = true)
+  @Schema(requiredMode = RequiredMode.REQUIRED)
   private String user;
 
   @NotNull
   @JsonProperty(value = "loggedObjectId", required = true)
-  @ApiModelProperty(required = true)
+  @Schema(requiredMode = RequiredMode.REQUIRED)
   private Long loggedObjectId;
 
   @NotNull
   @JsonProperty(value = "lastModified", required = true)
-  @ApiModelProperty(required = true)
+  @Schema(requiredMode = RequiredMode.REQUIRED)
   private Date lastModified;
 
   @NotNull
   @JsonProperty(value = "actionType", required = true)
-  @ApiModelProperty(required = true)
+  @Schema(requiredMode = RequiredMode.REQUIRED)
   private String actionType;
 
   @NotNull
   @JsonProperty(value = "objectType", required = true)
-  @ApiModelProperty(required = true)
+  @Schema(requiredMode = RequiredMode.REQUIRED)
   private String objectType;
 
   @NotNull
   @JsonProperty(value = "projectId", required = true)
-  @ApiModelProperty(required = true)
+  @Schema(requiredMode = RequiredMode.REQUIRED)
   private Long projectId;
 
   @JsonProperty(value = "projectName")

diff --git a/src/main/java/com/epam/ta/reportportal/ws/model/BatchElementCreatedRS.java b/src/main/java/com/epam/ta/reportportal/ws/model/BatchElementCreatedRS.java
diff --git a/src/main/java/com/epam/ta/reportportal/ws/model/BatchSaveOperatingRS.java b/src/main/java/com/epam/ta/reportportal/ws/model/BatchSaveOperatingRS.java