From 7ba098580e45a302531b1d27cd559480b1f52c9d Mon Sep 17 00:00:00 2001
From: Reingold Shekhtel <raikbitters@gmail.com>
Date: Fri, 7 Jun 2024 12:54:11 +0200
Subject: [PATCH] Update imports for SAML models and SamlParameter

---
 build.gradle                                                | 2 +-
 .../auth/integration/converter/SamlConverter.java           | 1 +
 .../auth/integration/parameter/ParameterUtils.java          | 1 +
 .../epam/reportportal/auth/model/SamlProvidersResource.java | 2 +-
 .../java/com/epam/reportportal/auth/model/SamlResource.java | 6 +++---
 5 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/build.gradle b/build.gradle
index 067356df..9f41eb87 100644
--- a/build.gradle
+++ b/build.gradle
@@ -42,7 +42,7 @@ dependencies {
         api 'com.epam.reportportal:commons-dao'
         api 'com.epam.reportportal:commons'
     } else {
-        api 'com.github.reportportal:commons-dao:fa04c1fc02'
+        api 'com.github.reportportal:commons-dao:b0e00d6'
         api 'com.github.reportportal:commons:83ea1a5b9e'
     }
 
diff --git a/src/main/java/com/epam/reportportal/auth/integration/converter/SamlConverter.java b/src/main/java/com/epam/reportportal/auth/integration/converter/SamlConverter.java
index b10785f0..381b3f5c 100644
--- a/src/main/java/com/epam/reportportal/auth/integration/converter/SamlConverter.java
+++ b/src/main/java/com/epam/reportportal/auth/integration/converter/SamlConverter.java
@@ -26,6 +26,7 @@
 import static com.epam.reportportal.auth.integration.parameter.SamlParameter.IDP_NAME_ID;
 import static com.epam.reportportal.auth.integration.parameter.SamlParameter.IDP_URL;
 import static com.epam.reportportal.auth.integration.parameter.SamlParameter.LAST_NAME_ATTRIBUTE;
+import static com.epam.reportportal.auth.integration.parameter.SamlParameter.ROLES_ATTRIBUTE;
 import static java.util.Optional.ofNullable;
 
 import com.epam.reportportal.auth.integration.parameter.ParameterUtils;
diff --git a/src/main/java/com/epam/reportportal/auth/integration/parameter/ParameterUtils.java b/src/main/java/com/epam/reportportal/auth/integration/parameter/ParameterUtils.java
index f682943d..a82a0605 100644
--- a/src/main/java/com/epam/reportportal/auth/integration/parameter/ParameterUtils.java
+++ b/src/main/java/com/epam/reportportal/auth/integration/parameter/ParameterUtils.java
@@ -25,6 +25,7 @@
 import static com.epam.reportportal.auth.integration.parameter.SamlParameter.IDP_NAME_ID;
 import static com.epam.reportportal.auth.integration.parameter.SamlParameter.IDP_URL;
 import static com.epam.reportportal.auth.integration.parameter.SamlParameter.LAST_NAME_ATTRIBUTE;
+import static com.epam.reportportal.auth.integration.parameter.SamlParameter.ROLES_ATTRIBUTE;
 
 import com.epam.ta.reportportal.entity.integration.Integration;
 import com.epam.reportportal.model.integration.auth.UpdateAuthRQ;
diff --git a/src/main/java/com/epam/reportportal/auth/model/SamlProvidersResource.java b/src/main/java/com/epam/reportportal/auth/model/SamlProvidersResource.java
index 3510bd3d..3851a9f5 100644
--- a/src/main/java/com/epam/reportportal/auth/model/SamlProvidersResource.java
+++ b/src/main/java/com/epam/reportportal/auth/model/SamlProvidersResource.java
@@ -16,7 +16,7 @@
 
 package com.epam.reportportal.auth.model;
 
-import com.epam.ta.reportportal.ws.model.integration.auth.AbstractAuthResource;
+import com.epam.reportportal.model.integration.auth.AbstractAuthResource;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import lombok.Getter;
 import lombok.Setter;
diff --git a/src/main/java/com/epam/reportportal/auth/model/SamlResource.java b/src/main/java/com/epam/reportportal/auth/model/SamlResource.java
index 6e31b2c7..24154b55 100644
--- a/src/main/java/com/epam/reportportal/auth/model/SamlResource.java
+++ b/src/main/java/com/epam/reportportal/auth/model/SamlResource.java
@@ -16,10 +16,10 @@
 
 package com.epam.reportportal.auth.model;
 
-import com.epam.ta.reportportal.ws.model.integration.auth.AbstractAuthResource;
+import com.epam.reportportal.model.integration.auth.AbstractAuthResource;
 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 lombok.Getter;
 import lombok.Setter;
 
@@ -31,7 +31,7 @@
 
 @Setter
 @Getter
-@ApiModel
+@Schema
 @JsonInclude(JsonInclude.Include.NON_NULL)
 public class SamlResource extends AbstractAuthResource {