EPMRPP-89703 || Update libs with one merged (#54)

* EPMRPP-89703 || Update libs to merged ones * EPMRPP-89703 || Update libs to merged ones * EPMRPP-89703 || Update libs with moved exception classes * EPMRPP-89703 || Add reporting as a separate lib * EPMRPP-89703 || Make libs transitive --------- Co-authored-by: Pavel Bortnik <[email protected]>
reportportal · Apr 5, 2024 · 1ce447f · 1ce447f
1 parent b70df9f
commit 1ce447f
Show file tree

Hide file tree

Showing 12 changed files with 32 additions and 33 deletions.
diff --git a/build.gradle b/build.gradle
@@ -1,6 +1,7 @@
 plugins {
     id 'io.spring.dependency-management' version '1.0.8.RELEASE'
     id 'java'
+    id 'java-library'
 }
 
 project.ext {
@@ -36,14 +37,12 @@ dependencyManagement {
 
 dependencies {
     if (releaseMode) {
-        compile 'com.epam.reportportal:commons-model'
-        compile 'com.epam.reportportal:commons-rules'
+        compile 'com.epam.reportportal:commons'
         compile 'com.epam.reportportal:commons-dao'
     } else {
-        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'
+        implementation 'com.github.reportportal:commons-dao:fa04c1fc02'
+        api 'com.github.reportportal:commons-reporting:6b3ed9d'
+        api 'com.github.reportportal:commons:83ea1a5'
     }
     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
@@ -1,9 +1,9 @@
 package com.epam.reportportal.extension;
 
+import com.epam.reportportal.rules.commons.validation.BusinessRule;
+import com.epam.reportportal.rules.exception.ErrorType;
 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.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
@@ -1,12 +1,12 @@
 package com.epam.reportportal.extension;
 
+import com.epam.reportportal.rules.commons.validation.BusinessRule;
+import com.epam.reportportal.rules.exception.ReportPortalException;
 import com.epam.ta.reportportal.commons.ReportPortalUser;
-import com.epam.ta.reportportal.commons.validation.BusinessRule;
 import com.epam.ta.reportportal.dao.ProjectRepository;
 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.reporting.ErrorType;
+import com.epam.reportportal.rules.exception.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
@@ -1,12 +1,12 @@
 package com.epam.reportportal.extension;
 
+import com.epam.reportportal.rules.commons.validation.BusinessRule;
+import com.epam.reportportal.rules.commons.validation.Suppliers;
+import com.epam.reportportal.rules.exception.ReportPortalException;
 import com.epam.ta.reportportal.commons.ReportPortalUser;
-import com.epam.ta.reportportal.commons.validation.BusinessRule;
-import com.epam.ta.reportportal.commons.validation.Suppliers;
 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.reporting.ErrorType;
+import com.epam.reportportal.rules.exception.ErrorType;
 import org.springframework.security.core.context.SecurityContextHolder;
 
 import java.util.Map;

diff --git a/src/main/java/com/epam/reportportal/extension/bugtracking/BtsExtension.java b/src/main/java/com/epam/reportportal/extension/bugtracking/BtsExtension.java
@@ -15,15 +15,14 @@
  */
 package com.epam.reportportal.extension.bugtracking;
 
+import com.epam.reportportal.model.externalsystem.PostFormField;
+import com.epam.reportportal.model.externalsystem.PostTicketRQ;
+import com.epam.reportportal.model.externalsystem.Ticket;
 import com.epam.ta.reportportal.entity.integration.Integration;
-import com.epam.ta.reportportal.ws.model.externalsystem.PostFormField;
-import com.epam.ta.reportportal.ws.model.externalsystem.PostTicketRQ;
-import com.epam.ta.reportportal.ws.model.externalsystem.Ticket;
+import java.util.Optional;
 import org.pf4j.ExtensionPoint;
 
 import java.util.List;
-import java.util.Optional;
-
 /**
  * Generic interface to access third-party bug tracking systems
  *

diff --git a/src/main/java/com/epam/reportportal/extension/bugtracking/InternalTicketAssembler.java b/src/main/java/com/epam/reportportal/extension/bugtracking/InternalTicketAssembler.java
@@ -16,13 +16,13 @@
 package com.epam.reportportal.extension.bugtracking;
 
 import com.epam.reportportal.extension.util.FileNameExtractor;
+import com.epam.reportportal.model.externalsystem.PostFormField;
+import com.epam.reportportal.model.externalsystem.PostTicketRQ;
 import com.epam.ta.reportportal.binary.impl.AttachmentDataStoreService;
 import com.epam.ta.reportportal.dao.LogRepository;
 import com.epam.ta.reportportal.dao.TestItemRepository;
 import com.epam.ta.reportportal.entity.log.Log;
 import com.epam.ta.reportportal.filesystem.DataEncoder;
-import com.epam.ta.reportportal.ws.model.externalsystem.PostFormField;
-import com.epam.ta.reportportal.ws.model.externalsystem.PostTicketRQ;
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.LinkedListMultimap;
 import com.google.common.collect.Multimap;

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

diff --git a/src/main/java/com/epam/reportportal/extension/event/GetClusterResourcesEvent.java b/src/main/java/com/epam/reportportal/extension/event/GetClusterResourcesEvent.java
@@ -1,7 +1,7 @@
 package com.epam.reportportal.extension.event;
 
-import com.epam.ta.reportportal.ws.model.launch.cluster.ClusterInfoResource;
 
+import com.epam.reportportal.model.launch.cluster.ClusterInfoResource;
 import java.util.Collection;
 
 /**

diff --git a/src/main/java/com/epam/reportportal/extension/event/GetLaunchResourceCollectionEvent.java b/src/main/java/com/epam/reportportal/extension/event/GetLaunchResourceCollectionEvent.java
@@ -22,6 +22,7 @@
 /**
  * @author <a href="mailto:[email protected]">Ivan Budayeu</a>
  */
+// TODO: replace with different dto object to unwire commons-reporting lib
 public class GetLaunchResourceCollectionEvent extends EntityCollectionEvent<LaunchResource> {
 
   public GetLaunchResourceCollectionEvent(Collection<LaunchResource> 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
@@ -15,9 +15,9 @@
  */
 package com.epam.reportportal.extension.util;
 
-import com.epam.ta.reportportal.commons.validation.Suppliers;
-import com.epam.ta.reportportal.exception.ReportPortalException;
-import com.epam.ta.reportportal.ws.reporting.ErrorType;
+import com.epam.reportportal.rules.commons.validation.Suppliers;
+import com.epam.reportportal.rules.exception.ReportPortalException;
+import com.epam.reportportal.rules.exception.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
@@ -15,9 +15,9 @@
  */
 package com.epam.reportportal.extension.util;
 
-import com.epam.ta.reportportal.commons.validation.Suppliers;
-import com.epam.ta.reportportal.exception.ReportPortalException;
-import com.epam.ta.reportportal.ws.reporting.ErrorType;
+import com.epam.reportportal.rules.commons.validation.Suppliers;
+import com.epam.reportportal.rules.exception.ReportPortalException;
+import com.epam.reportportal.rules.exception.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
@@ -15,9 +15,9 @@
  */
 package com.epam.reportportal.extension.util;
 
-import com.epam.ta.reportportal.exception.ReportPortalException;
 
-import com.epam.ta.reportportal.ws.reporting.ErrorType;
+import com.epam.reportportal.rules.exception.ReportPortalException;
+import com.epam.reportportal.rules.exception.ErrorType;
 import javax.validation.Validation;
 import javax.validation.Validator;
 import java.util.List;