diff --git a/build.gradle b/build.gradle index 09cc43e..6bebb39 100644 --- a/build.gradle +++ b/build.gradle @@ -40,9 +40,10 @@ dependencies { compile 'com.epam.reportportal:commons-rules' compile 'com.epam.reportportal:commons-dao' } else { - compile 'com.github.reportportal:commons-dao:0a2a4276f9' - compile 'com.github.reportportal:commons-model:83f012f' - compile 'com.github.reportportal:commons-rules:42d4dd5634' + 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 index cd42de1..316556f 100644 --- 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 index f5aac2d..9a5ed66 100644 --- 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 index c9bbcd6..4d3734f 100644 --- 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 index 9f9ec82..364a305 100644 --- 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 index 11fa78b..2f412c8 100644 --- 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 Ivan Budayeu */ public class GetLaunchResourceCollectionEvent extends EntityCollectionEvent { - public GetLaunchResourceCollectionEvent(Collection entities) { - super(entities); - } + + public GetLaunchResourceCollectionEvent(Collection 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 index bdbdb9f..26d591d 100644 --- 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 index a72b5d0..56196e0 100644 --- 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 index a0e16a5..be55acb 100644 --- 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 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)); } } }