Merge branch 'develop' into master-to-develop

reportportal · Mar 13, 2024 · 640d104 · 640d104
2 parents e5ddd07 + 1297150
commit 640d104
Show file tree

Hide file tree

Showing 9 changed files with 19 additions and 18 deletions.
diff --git a/build.gradle b/build.gradle
@@ -30,7 +30,7 @@ repositories {
 
 dependencyManagement {
     imports {
-        mavenBom(releaseMode ? 'com.epam.reportportal:commons-bom:' + getProperty('bom.version') : 'com.github.reportportal:commons-bom:7affe20')
+        mavenBom(releaseMode ? 'com.epam.reportportal:commons-bom:5.10.0' : 'com.epam.reportportal:commons-bom:5.10.0')
     }
 }
 
@@ -40,9 +40,10 @@ dependencies {
         compile 'com.epam.reportportal:commons-rules'
         compile 'com.epam.reportportal:commons-dao'
     } else {
-        compile 'com.github.reportportal:commons-dao:126ee2e'
-        compile 'com.github.reportportal:commons-model:83f012f'
-        compile 'com.github.reportportal:commons-rules:01ec4d17'
+        compile 'com.github.reportportal:commons-dao:d0894a1'
+        compile 'com.github.reportportal:commons-model:f466951'
+        compile 'com.github.reportportal:commons-rules:1f6bfed'
+        compile 'com.github.reportportal:commons-reporting:12c31b1'
     }
     compile 'org.pf4j:pf4j:2.4.0'
 

diff --git a/src/main/java/com/epam/reportportal/extension/AdminCommand.java b/src/main/java/com/epam/reportportal/extension/AdminCommand.java
@@ -3,7 +3,7 @@
 import com.epam.ta.reportportal.commons.ReportPortalUser;
 import com.epam.ta.reportportal.commons.validation.BusinessRule;
 import com.epam.ta.reportportal.entity.user.UserRole;
-import com.epam.ta.reportportal.ws.model.ErrorType;
+import com.epam.ta.reportportal.ws.reporting.ErrorType;
 import org.springframework.security.core.context.SecurityContextHolder;
 
 import java.util.Map;

diff --git a/src/main/java/com/epam/reportportal/extension/ProjectManagerCommand.java b/src/main/java/com/epam/reportportal/extension/ProjectManagerCommand.java
@@ -6,7 +6,7 @@
 import com.epam.ta.reportportal.entity.project.Project;
 import com.epam.ta.reportportal.entity.project.ProjectRole;
 import com.epam.ta.reportportal.exception.ReportPortalException;
-import com.epam.ta.reportportal.ws.model.ErrorType;
+import com.epam.ta.reportportal.ws.reporting.ErrorType;
 
 import static java.util.Optional.ofNullable;
 

diff --git a/src/main/java/com/epam/reportportal/extension/ProjectMemberCommand.java b/src/main/java/com/epam/reportportal/extension/ProjectMemberCommand.java
@@ -6,7 +6,7 @@
 import com.epam.ta.reportportal.dao.ProjectRepository;
 import com.epam.ta.reportportal.entity.project.Project;
 import com.epam.ta.reportportal.exception.ReportPortalException;
-import com.epam.ta.reportportal.ws.model.ErrorType;
+import com.epam.ta.reportportal.ws.reporting.ErrorType;
 import org.springframework.security.core.context.SecurityContextHolder;
 
 import java.util.Map;

diff --git a/src/main/java/com/epam/reportportal/extension/classloader/DelegatingClassLoader.java b/src/main/java/com/epam/reportportal/extension/classloader/DelegatingClassLoader.java
@@ -17,7 +17,7 @@
 package com.epam.reportportal.extension.classloader;
 
 import com.epam.ta.reportportal.commons.validation.BusinessRule;
-import com.epam.ta.reportportal.ws.model.ErrorType;
+import com.epam.ta.reportportal.ws.reporting.ErrorType;
 import org.springframework.stereotype.Service;
 
 import java.util.LinkedHashMap;

diff --git a/src/main/java/com/epam/reportportal/extension/event/GetLaunchResourceCollectionEvent.java b/src/main/java/com/epam/reportportal/extension/event/GetLaunchResourceCollectionEvent.java
@@ -16,15 +16,15 @@
 
 package com.epam.reportportal.extension.event;
 
-import com.epam.ta.reportportal.ws.model.launch.LaunchResource;
-
+import com.epam.ta.reportportal.ws.reporting.LaunchResource;
 import java.util.Collection;
 
 /**
  * @author <a href="mailto:[email protected]">Ivan Budayeu</a>
  */
 public class GetLaunchResourceCollectionEvent extends EntityCollectionEvent<LaunchResource> {
-	public GetLaunchResourceCollectionEvent(Collection<LaunchResource> entities) {
-		super(entities);
-	}
+
+  public GetLaunchResourceCollectionEvent(Collection<LaunchResource> entities) {
+    super(entities);
+  }
 }
diff --git a/src/main/java/com/epam/reportportal/extension/util/CommandParamUtils.java b/src/main/java/com/epam/reportportal/extension/util/CommandParamUtils.java
@@ -17,8 +17,7 @@
 
 import com.epam.ta.reportportal.commons.validation.Suppliers;
 import com.epam.ta.reportportal.exception.ReportPortalException;
-import com.epam.ta.reportportal.ws.model.ErrorType;
-
+import com.epam.ta.reportportal.ws.reporting.ErrorType;
 import javax.validation.ConstraintViolation;
 import javax.validation.Path;
 import java.util.Iterator;

diff --git a/src/main/java/com/epam/reportportal/extension/util/RequestEntityConverter.java b/src/main/java/com/epam/reportportal/extension/util/RequestEntityConverter.java
@@ -17,7 +17,7 @@
 
 import com.epam.ta.reportportal.commons.validation.Suppliers;
 import com.epam.ta.reportportal.exception.ReportPortalException;
-import com.epam.ta.reportportal.ws.model.ErrorType;
+import com.epam.ta.reportportal.ws.reporting.ErrorType;
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
 

diff --git a/src/main/java/com/epam/reportportal/extension/util/RequestEntityValidator.java b/src/main/java/com/epam/reportportal/extension/util/RequestEntityValidator.java
@@ -16,8 +16,8 @@
 package com.epam.reportportal.extension.util;
 
 import com.epam.ta.reportportal.exception.ReportPortalException;
-import com.epam.ta.reportportal.ws.model.ErrorType;
 
+import com.epam.ta.reportportal.ws.reporting.ErrorType;
 import javax.validation.Validation;
 import javax.validation.Validator;
 import java.util.List;
@@ -42,7 +42,8 @@ public static <T> void validate(T entity) {
 				.map(it -> it.getPropertyPath() + " " + it.getMessage())
 				.collect(Collectors.toList());
 		if (!errors.isEmpty()) {
-			throw new ReportPortalException(ErrorType.BAD_REQUEST_ERROR, String.join(VALIDATION_EXCEPTION_DELIMITER, errors));
+			throw new ReportPortalException(
+					ErrorType.BAD_REQUEST_ERROR, String.join(VALIDATION_EXCEPTION_DELIMITER, errors));
 		}
 	}
 }