Merge branch 'develop' of https://github.com/reportportal/commons-model…

… into EPMRPP-89384-lib-sep � Conflicts: � src/main/java/com/epam/ta/reportportal/ws/model/FinishExecutionRQ.java � src/main/java/com/epam/ta/reportportal/ws/model/FinishTestItemRQ.java � src/main/java/com/epam/ta/reportportal/ws/model/StartRQ.java � src/main/java/com/epam/ta/reportportal/ws/model/StartTestItemRQ.java � src/main/java/com/epam/ta/reportportal/ws/model/attribute/ItemAttributesRQ.java � src/main/java/com/epam/ta/reportportal/ws/model/integration/auth/SamlResource.java � src/main/java/com/epam/ta/reportportal/ws/model/launch/StartLaunchRQ.java � src/main/java/com/epam/ta/reportportal/ws/model/log/SaveLogRQ.java � src/main/java/com/epam/ta/reportportal/ws/model/project/AnalyzerConfig.java � src/main/java/com/epam/ta/reportportal/ws/model/settings/OAuthRegistrationResource.java
reportportal · Feb 26, 2024 · 8060d3a · 8060d3a
2 parents 5fe4c6f + 6a5e54d
commit 8060d3a
Show file tree

Hide file tree

Showing 6 changed files with 31 additions and 26 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/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;
 
@@ -33,37 +34,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/integration/auth/SamlResource.java b/src/main/java/com/epam/ta/reportportal/ws/model/integration/auth/SamlResource.java
@@ -18,14 +18,15 @@
 
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
-import io.swagger.annotations.ApiModel;
+
+import io.swagger.v3.oas.annotations.media.Schema;
 import javax.validation.constraints.NotEmpty;
 
 /**
  * @author <a href="mailto:[email protected]">Ihar Kahadouski</a>
  */
 
-@ApiModel
+@Schema
 @JsonInclude(JsonInclude.Include.NON_NULL)
 public class SamlResource extends AbstractAuthResource {
 

diff --git a/src/main/java/com/epam/ta/reportportal/ws/model/project/AnalyzerConfig.java b/src/main/java/com/epam/ta/reportportal/ws/model/project/AnalyzerConfig.java
@@ -16,22 +16,21 @@
 
 package com.epam.ta.reportportal.ws.model.project;
 
-import static com.epam.ta.reportportal.ws.model.ValidationConstraints.MAX_SHOULD_MATCH;
-import static com.epam.ta.reportportal.ws.model.ValidationConstraints.MIN_NUMBER_OF_LOG_LINES;
-import static com.epam.ta.reportportal.ws.model.ValidationConstraints.MIN_SHOULD_MATCH;
-
 import com.epam.ta.reportportal.ws.annotations.In;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
-import io.swagger.annotations.ApiModelProperty;
-import io.swagger.annotations.ApiParam;
+
+import io.swagger.v3.oas.annotations.media.Schema;
 import javax.validation.constraints.Max;
 import javax.validation.constraints.Min;
 
+import static com.epam.ta.reportportal.ws.model.ValidationConstraints.*;
+
 /**
  * @author Pavel Bortnik
  */
 @JsonInclude(JsonInclude.Include.NON_NULL)
+@Schema
 public class AnalyzerConfig {
 
 	@Min(value = MIN_SHOULD_MATCH)
@@ -53,11 +52,11 @@ public class AnalyzerConfig {
 
 	@JsonProperty(value = "analyzerMode")
 	@In(allowedValues = { "all", "launch_name", "current_launch", "previous_launch", "current_and_the_same_name" })
-	@ApiModelProperty(allowableValues = "ALL, LAUNCH_NAME, CURRENT_LAUNCH, PREVIOUS_LAUNCH, CURRENT_AND_THE_SAME_NAME")
+	@Schema(allowableValues = "ALL, LAUNCH_NAME, CURRENT_LAUNCH, PREVIOUS_LAUNCH, CURRENT_AND_THE_SAME_NAME")
 	private String analyzerMode;
 
 	@JsonProperty(value = "indexingRunning")
-	@ApiParam(hidden = true)
+	@Schema(hidden = true)
 	private boolean indexingRunning;
 
 	@JsonProperty(value = "allMessagesShouldMatch")

diff --git a/src/main/java/com/epam/ta/reportportal/ws/model/settings/OAuthRegistrationResource.java b/src/main/java/com/epam/ta/reportportal/ws/model/settings/OAuthRegistrationResource.java
@@ -18,11 +18,13 @@
 
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.Pattern;
 import java.io.Serializable;
 import java.util.Map;
 import java.util.Set;
-import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.Pattern;
 
 /**
  * Settings for OAuth provider registration.
@@ -55,10 +57,12 @@ public class OAuthRegistrationResource implements Serializable {
 
 	@Pattern(regexp = URL_PATTERN)
 	@JsonProperty(value = "authorizationUri")
+	@Schema(type = "string", pattern = URL_PATTERN, example = "string")
 	private String authorizationUri;
 
 	@Pattern(regexp = URL_PATTERN)
 	@JsonProperty(value = "tokenUri")
+	@Schema(type = "string", pattern = URL_PATTERN, example = "string")
 	private String tokenUri;
 
 	@JsonProperty(value = "userInfoEndpointUri")