From d3039021ade7d3d70bdd38b0bf0cd908478d8929 Mon Sep 17 00:00:00 2001 From: Vadzim Hushchanskou Date: Wed, 30 Oct 2024 14:09:42 +0300 Subject: [PATCH] Revert changes --- build.gradle | 6 ++-- .../epam/reportportal/annotations/Step.java | 2 +- .../epam/reportportal/aspect/StepAspect.java | 2 +- .../reportportal/aspect/StepRequestUtils.java | 4 +-- .../exception/ReportPortalException.java | 2 ++ .../listeners/ListenerParameters.java | 4 +-- .../com/epam/reportportal/service/Launch.java | 12 ++++---- .../epam/reportportal/service/LaunchImpl.java | 8 +++-- .../service/LaunchLoggingContext.java | 4 +-- .../reportportal/service/LoggingContext.java | 4 +-- .../reportportal/service/ReportPortal.java | 4 +-- .../service/ReportPortalClient.java | 6 +++- .../service/ReportPortalClientV2.java | 29 +++++++------------ .../service/launch/AbstractJoinedLaunch.java | 2 +- .../service/launch/PrimaryLaunch.java | 4 +-- .../service/launch/SecondaryLaunch.java | 4 +-- .../service/logs/LaunchLoggingCallback.java | 4 +-- .../service/logs/LogBatchingFlowable.java | 2 +- .../service/logs/LoggingSubscriber.java | 2 +- .../service/statistics/StatisticsService.java | 4 +-- .../service/step/DefaultStepReporter.java | 6 ++-- .../service/step/StepReporter.java | 4 +-- .../service/step/StepRequestUtils.java | 4 +-- .../service/tree/ItemTreeReporter.java | 4 +-- .../service/tree/TestItemTree.java | 2 +- .../reportportal/utils/AttributeParser.java | 2 +- .../reportportal/utils/ParameterUtils.java | 2 +- .../utils/http/HttpRequestUtils.java | 4 +-- .../properties/SystemAttributesExtractor.java | 2 +- .../reportportal/aspect/StepAspectCommon.java | 3 +- .../aspect/StepAspectFinishTest.java | 2 +- .../aspect/StepAspectStartTest.java | 2 +- .../listeners/ListenerParametersTest.java | 4 +-- .../ItemLoggingContextMultiThreadTest.java | 2 +- .../service/LaunchNullCheckTest.java | 2 +- .../epam/reportportal/service/LaunchTest.java | 12 +++----- .../service/LoggingContextTest.java | 4 +-- .../service/ReportPortalClientJoinTest.java | 14 ++++----- .../service/ReportPortalTest.java | 8 ++--- .../statistics/StatisticsServiceTest.java | 4 +-- .../service/step/FileLocatorTest.java | 6 ++-- .../service/step/ManualNestedStepTest.java | 4 +-- .../step/MultiThreadingStepReporterTest.java | 2 +- .../service/step/StepOrderTest.java | 8 ++--- .../com/epam/reportportal/test/TestUtils.java | 9 +++--- .../utils/AnnotationAttributeParserTest.java | 2 +- .../utils/ParameterUtilsTest.java | 2 +- .../utils/StringAttributeParserTest.java | 2 +- .../SystemAttributesExtractorTest.java | 2 +- 49 files changed, 115 insertions(+), 118 deletions(-) diff --git a/build.gradle b/build.gradle index c0c8783b..f014fbfc 100644 --- a/build.gradle +++ b/build.gradle @@ -18,7 +18,7 @@ apply plugin: 'java-library' apply from: "${project.scripts_url}/${project.scripts_branch}/build-quality.gradle" apply from: "${project.scripts_url}/${project.scripts_branch}/release-commons.gradle" -//apply from: "${project.scripts_url}/${project.scripts_branch}/signing.gradle" +apply from: "${project.scripts_url}/${project.scripts_branch}/signing.gradle" apply from: "${project.scripts_url}/${project.scripts_branch}/jacoco.gradle" project.ext.limits = [ @@ -38,11 +38,10 @@ compileTestJava.options.encoding = 'UTF-8' repositories { mavenLocal() mavenCentral() - maven { url 'https://jitpack.io' } } dependencies { - api ('com.epam.reportportal:commons-reporting:5.12.2') { + api ('com.epam.reportportal:commons-model:5.3.3') { exclude module: 'jackson-databind' exclude module: 'guava' } @@ -53,7 +52,6 @@ dependencies { api ("com.squareup.retrofit2:retrofit:${project.retrofit_version}") { exclude module: 'okhttp' } - implementation "org.apache.commons:commons-lang3:${project.lang3_version}" implementation "com.squareup.okhttp3:okhttp:${project.okhttp_version}" implementation "com.squareup.retrofit2:converter-scalars:${project.retrofit_version}" implementation ("com.squareup.retrofit2:converter-jackson:${project.retrofit_version}") { diff --git a/src/main/java/com/epam/reportportal/annotations/Step.java b/src/main/java/com/epam/reportportal/annotations/Step.java index 00e95dd8..ad03a4a9 100644 --- a/src/main/java/com/epam/reportportal/annotations/Step.java +++ b/src/main/java/com/epam/reportportal/annotations/Step.java @@ -16,7 +16,7 @@ package com.epam.reportportal.annotations; -import com.epam.ta.reportportal.ws.reporting.StartTestItemRQ; +import com.epam.ta.reportportal.ws.model.StartTestItemRQ; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/src/main/java/com/epam/reportportal/aspect/StepAspect.java b/src/main/java/com/epam/reportportal/aspect/StepAspect.java index 52857957..e0b1a8a2 100644 --- a/src/main/java/com/epam/reportportal/aspect/StepAspect.java +++ b/src/main/java/com/epam/reportportal/aspect/StepAspect.java @@ -18,7 +18,7 @@ import com.epam.reportportal.annotations.Step; import com.epam.reportportal.service.Launch; -import com.epam.ta.reportportal.ws.reporting.StartTestItemRQ; +import com.epam.ta.reportportal.ws.model.StartTestItemRQ; import org.aspectj.lang.JoinPoint; import org.aspectj.lang.annotation.*; import org.aspectj.lang.reflect.MethodSignature; diff --git a/src/main/java/com/epam/reportportal/aspect/StepRequestUtils.java b/src/main/java/com/epam/reportportal/aspect/StepRequestUtils.java index 767aa238..cd6f5d18 100644 --- a/src/main/java/com/epam/reportportal/aspect/StepRequestUtils.java +++ b/src/main/java/com/epam/reportportal/aspect/StepRequestUtils.java @@ -19,8 +19,8 @@ import com.epam.reportportal.annotations.Step; import com.epam.reportportal.annotations.attribute.Attributes; import com.epam.reportportal.utils.AttributeParser; -import com.epam.ta.reportportal.ws.reporting.ItemAttributesRQ; -import com.epam.ta.reportportal.ws.reporting.StartTestItemRQ; +import com.epam.ta.reportportal.ws.model.StartTestItemRQ; +import com.epam.ta.reportportal.ws.model.attribute.ItemAttributesRQ; import org.aspectj.lang.JoinPoint; import org.aspectj.lang.reflect.MethodSignature; diff --git a/src/main/java/com/epam/reportportal/exception/ReportPortalException.java b/src/main/java/com/epam/reportportal/exception/ReportPortalException.java index 38c32b99..ac73875e 100644 --- a/src/main/java/com/epam/reportportal/exception/ReportPortalException.java +++ b/src/main/java/com/epam/reportportal/exception/ReportPortalException.java @@ -15,6 +15,8 @@ */ package com.epam.reportportal.exception; +import com.epam.ta.reportportal.ws.model.ErrorRS; + import static org.apache.commons.lang3.StringUtils.isBlank; /** diff --git a/src/main/java/com/epam/reportportal/listeners/ListenerParameters.java b/src/main/java/com/epam/reportportal/listeners/ListenerParameters.java index f0bb8b2e..dedbdc1f 100644 --- a/src/main/java/com/epam/reportportal/listeners/ListenerParameters.java +++ b/src/main/java/com/epam/reportportal/listeners/ListenerParameters.java @@ -21,8 +21,8 @@ import com.epam.reportportal.utils.properties.ListenerProperty; import com.epam.reportportal.utils.properties.OutputTypes; import com.epam.reportportal.utils.properties.PropertiesLoader; -import com.epam.ta.reportportal.ws.reporting.ItemAttributesRQ; -import com.epam.ta.reportportal.ws.reporting.Mode; +import com.epam.ta.reportportal.ws.model.attribute.ItemAttributesRQ; +import com.epam.ta.reportportal.ws.model.launch.Mode; import javax.annotation.Nonnull; import javax.annotation.Nullable; diff --git a/src/main/java/com/epam/reportportal/service/Launch.java b/src/main/java/com/epam/reportportal/service/Launch.java index 8d19ea2a..fc1b3587 100644 --- a/src/main/java/com/epam/reportportal/service/Launch.java +++ b/src/main/java/com/epam/reportportal/service/Launch.java @@ -18,12 +18,12 @@ import com.epam.reportportal.listeners.ListenerParameters; import com.epam.reportportal.service.step.DefaultStepReporter; import com.epam.reportportal.service.step.StepReporter; -import com.epam.ta.reportportal.ws.reporting.FinishExecutionRQ; -import com.epam.ta.reportportal.ws.reporting.FinishTestItemRQ; -import com.epam.ta.reportportal.ws.reporting.Issue; -import com.epam.ta.reportportal.ws.reporting.Issue.ExternalSystemIssue; -import com.epam.ta.reportportal.ws.reporting.OperationCompletionRS; -import com.epam.ta.reportportal.ws.reporting.StartTestItemRQ; +import com.epam.reportportal.utils.StaticStructuresUtils; +import com.epam.ta.reportportal.ws.model.FinishExecutionRQ; +import com.epam.ta.reportportal.ws.model.FinishTestItemRQ; +import com.epam.ta.reportportal.ws.model.OperationCompletionRS; +import com.epam.ta.reportportal.ws.model.StartTestItemRQ; +import com.epam.ta.reportportal.ws.model.issue.Issue; import io.reactivex.Maybe; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/main/java/com/epam/reportportal/service/LaunchImpl.java b/src/main/java/com/epam/reportportal/service/LaunchImpl.java index c6abe6a7..9a85175b 100644 --- a/src/main/java/com/epam/reportportal/service/LaunchImpl.java +++ b/src/main/java/com/epam/reportportal/service/LaunchImpl.java @@ -15,7 +15,6 @@ */ package com.epam.reportportal.service; -import com.epam.reportportal.exception.ErrorType; import com.epam.reportportal.exception.InternalReportPortalClientException; import com.epam.reportportal.exception.ReportPortalException; import com.epam.reportportal.listeners.ItemStatus; @@ -24,7 +23,12 @@ import com.epam.reportportal.utils.RetryWithDelay; import com.epam.reportportal.utils.StaticStructuresUtils; import com.epam.reportportal.utils.properties.DefaultProperties; -import com.epam.ta.reportportal.ws.reporting.*; +import com.epam.ta.reportportal.ws.model.*; +import com.epam.ta.reportportal.ws.model.attribute.ItemAttributesRQ; +import com.epam.ta.reportportal.ws.model.issue.Issue; +import com.epam.ta.reportportal.ws.model.item.ItemCreatedRS; +import com.epam.ta.reportportal.ws.model.launch.StartLaunchRQ; +import com.epam.ta.reportportal.ws.model.launch.StartLaunchRS; import io.reactivex.*; import io.reactivex.functions.Consumer; import io.reactivex.functions.Function; diff --git a/src/main/java/com/epam/reportportal/service/LaunchLoggingContext.java b/src/main/java/com/epam/reportportal/service/LaunchLoggingContext.java index a69c0331..a3d09856 100644 --- a/src/main/java/com/epam/reportportal/service/LaunchLoggingContext.java +++ b/src/main/java/com/epam/reportportal/service/LaunchLoggingContext.java @@ -21,8 +21,8 @@ import com.epam.reportportal.service.logs.LogBatchingFlowable; import com.epam.reportportal.service.logs.LoggingSubscriber; import com.epam.reportportal.utils.http.HttpRequestUtils; -import com.epam.ta.reportportal.ws.reporting.BatchSaveOperatingRS; -import com.epam.ta.reportportal.ws.reporting.SaveLogRQ; +import com.epam.ta.reportportal.ws.model.BatchSaveOperatingRS; +import com.epam.ta.reportportal.ws.model.log.SaveLogRQ; import io.reactivex.*; import io.reactivex.functions.Function; import io.reactivex.internal.operators.flowable.FlowableFromObservable; diff --git a/src/main/java/com/epam/reportportal/service/LoggingContext.java b/src/main/java/com/epam/reportportal/service/LoggingContext.java index d0a49508..7d5854a6 100644 --- a/src/main/java/com/epam/reportportal/service/LoggingContext.java +++ b/src/main/java/com/epam/reportportal/service/LoggingContext.java @@ -20,8 +20,8 @@ import com.epam.reportportal.service.logs.LogBatchingFlowable; import com.epam.reportportal.service.logs.LoggingSubscriber; import com.epam.reportportal.utils.http.HttpRequestUtils; -import com.epam.ta.reportportal.ws.reporting.BatchSaveOperatingRS; -import com.epam.ta.reportportal.ws.reporting.SaveLogRQ; +import com.epam.ta.reportportal.ws.model.BatchSaveOperatingRS; +import com.epam.ta.reportportal.ws.model.log.SaveLogRQ; import com.epam.reportportal.utils.files.ByteSource; import io.reactivex.*; import io.reactivex.functions.Function; diff --git a/src/main/java/com/epam/reportportal/service/ReportPortal.java b/src/main/java/com/epam/reportportal/service/ReportPortal.java index b9fef716..684d736e 100644 --- a/src/main/java/com/epam/reportportal/service/ReportPortal.java +++ b/src/main/java/com/epam/reportportal/service/ReportPortal.java @@ -27,8 +27,8 @@ import com.epam.reportportal.utils.http.HttpRequestUtils; import com.epam.reportportal.utils.properties.ListenerProperty; import com.epam.reportportal.utils.properties.PropertiesLoader; -import com.epam.ta.reportportal.ws.reporting.StartLaunchRQ; -import com.epam.ta.reportportal.ws.reporting.SaveLogRQ; +import com.epam.ta.reportportal.ws.model.launch.StartLaunchRQ; +import com.epam.ta.reportportal.ws.model.log.SaveLogRQ; import io.reactivex.Maybe; import io.reactivex.schedulers.Schedulers; import okhttp3.Cookie; diff --git a/src/main/java/com/epam/reportportal/service/ReportPortalClient.java b/src/main/java/com/epam/reportportal/service/ReportPortalClient.java index 12f67d6c..69c8d3bf 100644 --- a/src/main/java/com/epam/reportportal/service/ReportPortalClient.java +++ b/src/main/java/com/epam/reportportal/service/ReportPortalClient.java @@ -15,7 +15,11 @@ */ package com.epam.reportportal.service; -import com.epam.ta.reportportal.ws.reporting.*; +import com.epam.ta.reportportal.ws.model.*; +import com.epam.ta.reportportal.ws.model.item.ItemCreatedRS; +import com.epam.ta.reportportal.ws.model.launch.*; +import com.epam.ta.reportportal.ws.model.log.SaveLogRQ; +import com.epam.ta.reportportal.ws.model.project.config.ProjectSettingsResource; import io.reactivex.Maybe; import okhttp3.MultipartBody; import retrofit2.http.*; diff --git a/src/main/java/com/epam/reportportal/service/ReportPortalClientV2.java b/src/main/java/com/epam/reportportal/service/ReportPortalClientV2.java index 4129772b..c7d260f3 100644 --- a/src/main/java/com/epam/reportportal/service/ReportPortalClientV2.java +++ b/src/main/java/com/epam/reportportal/service/ReportPortalClientV2.java @@ -15,27 +15,18 @@ */ package com.epam.reportportal.service; -import com.epam.ta.reportportal.ws.reporting.BatchSaveOperatingRS; -import com.epam.ta.reportportal.ws.reporting.EntryCreatedAsyncRS; -import com.epam.ta.reportportal.ws.reporting.FinishExecutionRQ; -import com.epam.ta.reportportal.ws.reporting.FinishTestItemRQ; -import com.epam.ta.reportportal.ws.reporting.ItemCreatedRS; -import com.epam.ta.reportportal.ws.reporting.LaunchResource; -import com.epam.ta.reportportal.ws.reporting.MergeLaunchesRQ; -import com.epam.ta.reportportal.ws.reporting.OperationCompletionRS; -import com.epam.ta.reportportal.ws.reporting.SaveLogRQ; -import com.epam.ta.reportportal.ws.reporting.StartLaunchRQ; -import com.epam.ta.reportportal.ws.reporting.StartLaunchRS; -import com.epam.ta.reportportal.ws.reporting.StartTestItemRQ; +import com.epam.ta.reportportal.ws.model.*; +import com.epam.ta.reportportal.ws.model.item.ItemCreatedRS; +import com.epam.ta.reportportal.ws.model.launch.LaunchResource; +import com.epam.ta.reportportal.ws.model.launch.MergeLaunchesRQ; +import com.epam.ta.reportportal.ws.model.launch.StartLaunchRQ; +import com.epam.ta.reportportal.ws.model.launch.StartLaunchRS; +import com.epam.ta.reportportal.ws.model.log.SaveLogRQ; import io.reactivex.Maybe; -import java.util.List; import okhttp3.MultipartBody; -import retrofit2.http.Body; -import retrofit2.http.Multipart; -import retrofit2.http.POST; -import retrofit2.http.PUT; -import retrofit2.http.Part; -import retrofit2.http.Path; +import retrofit2.http.*; + +import java.util.List; public interface ReportPortalClientV2 extends ReportPortalClient { diff --git a/src/main/java/com/epam/reportportal/service/launch/AbstractJoinedLaunch.java b/src/main/java/com/epam/reportportal/service/launch/AbstractJoinedLaunch.java index 438e2439..e8dad718 100644 --- a/src/main/java/com/epam/reportportal/service/launch/AbstractJoinedLaunch.java +++ b/src/main/java/com/epam/reportportal/service/launch/AbstractJoinedLaunch.java @@ -20,7 +20,7 @@ import com.epam.reportportal.service.LaunchIdLock; import com.epam.reportportal.service.LaunchImpl; import com.epam.reportportal.service.ReportPortalClient; -import com.epam.ta.reportportal.ws.reporting.StartLaunchRQ; +import com.epam.ta.reportportal.ws.model.launch.StartLaunchRQ; import io.reactivex.Maybe; import java.util.Random; diff --git a/src/main/java/com/epam/reportportal/service/launch/PrimaryLaunch.java b/src/main/java/com/epam/reportportal/service/launch/PrimaryLaunch.java index 6054e80f..b6f535b1 100644 --- a/src/main/java/com/epam/reportportal/service/launch/PrimaryLaunch.java +++ b/src/main/java/com/epam/reportportal/service/launch/PrimaryLaunch.java @@ -21,8 +21,8 @@ import com.epam.reportportal.service.LaunchIdLock; import com.epam.reportportal.service.ReportPortalClient; import com.epam.reportportal.utils.Waiter; -import com.epam.ta.reportportal.ws.reporting.FinishExecutionRQ; -import com.epam.ta.reportportal.ws.reporting.StartLaunchRQ; +import com.epam.ta.reportportal.ws.model.FinishExecutionRQ; +import com.epam.ta.reportportal.ws.model.launch.StartLaunchRQ; import java.util.Calendar; import java.util.concurrent.Callable; diff --git a/src/main/java/com/epam/reportportal/service/launch/SecondaryLaunch.java b/src/main/java/com/epam/reportportal/service/launch/SecondaryLaunch.java index d490ab31..9ba04f4f 100644 --- a/src/main/java/com/epam/reportportal/service/launch/SecondaryLaunch.java +++ b/src/main/java/com/epam/reportportal/service/launch/SecondaryLaunch.java @@ -22,8 +22,8 @@ import com.epam.reportportal.service.LaunchLoggingContext; import com.epam.reportportal.service.ReportPortalClient; import com.epam.reportportal.utils.Waiter; -import com.epam.ta.reportportal.ws.reporting.FinishExecutionRQ; -import com.epam.ta.reportportal.ws.reporting.LaunchResource; +import com.epam.ta.reportportal.ws.model.FinishExecutionRQ; +import com.epam.ta.reportportal.ws.model.launch.LaunchResource; import io.reactivex.Completable; import io.reactivex.Maybe; import io.reactivex.disposables.Disposable; diff --git a/src/main/java/com/epam/reportportal/service/logs/LaunchLoggingCallback.java b/src/main/java/com/epam/reportportal/service/logs/LaunchLoggingCallback.java index 7d659732..861b7da5 100644 --- a/src/main/java/com/epam/reportportal/service/logs/LaunchLoggingCallback.java +++ b/src/main/java/com/epam/reportportal/service/logs/LaunchLoggingCallback.java @@ -16,8 +16,8 @@ package com.epam.reportportal.service.logs; import com.epam.reportportal.service.Launch; -import com.epam.ta.reportportal.ws.reporting.EntryCreatedAsyncRS; -import com.epam.ta.reportportal.ws.reporting.OperationCompletionRS; +import com.epam.ta.reportportal.ws.model.EntryCreatedAsyncRS; +import com.epam.ta.reportportal.ws.model.OperationCompletionRS; import io.reactivex.functions.Consumer; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/main/java/com/epam/reportportal/service/logs/LogBatchingFlowable.java b/src/main/java/com/epam/reportportal/service/logs/LogBatchingFlowable.java index 992ffae0..969aa54b 100644 --- a/src/main/java/com/epam/reportportal/service/logs/LogBatchingFlowable.java +++ b/src/main/java/com/epam/reportportal/service/logs/LogBatchingFlowable.java @@ -18,7 +18,7 @@ import com.epam.reportportal.listeners.ListenerParameters; import com.epam.reportportal.utils.http.HttpRequestUtils; -import com.epam.ta.reportportal.ws.reporting.SaveLogRQ; +import com.epam.ta.reportportal.ws.model.log.SaveLogRQ; import io.reactivex.Flowable; import io.reactivex.FlowableSubscriber; import io.reactivex.internal.fuseable.HasUpstreamPublisher; diff --git a/src/main/java/com/epam/reportportal/service/logs/LoggingSubscriber.java b/src/main/java/com/epam/reportportal/service/logs/LoggingSubscriber.java index c0f3d1a1..5d663643 100644 --- a/src/main/java/com/epam/reportportal/service/logs/LoggingSubscriber.java +++ b/src/main/java/com/epam/reportportal/service/logs/LoggingSubscriber.java @@ -15,7 +15,7 @@ */ package com.epam.reportportal.service.logs; -import com.epam.ta.reportportal.ws.reporting.BatchSaveOperatingRS; +import com.epam.ta.reportportal.ws.model.BatchSaveOperatingRS; import io.reactivex.FlowableSubscriber; import org.reactivestreams.Subscription; import org.slf4j.Logger; diff --git a/src/main/java/com/epam/reportportal/service/statistics/StatisticsService.java b/src/main/java/com/epam/reportportal/service/statistics/StatisticsService.java index f0c3a8e1..a0e53f52 100644 --- a/src/main/java/com/epam/reportportal/service/statistics/StatisticsService.java +++ b/src/main/java/com/epam/reportportal/service/statistics/StatisticsService.java @@ -23,8 +23,8 @@ import com.epam.reportportal.utils.properties.ClientProperties; import com.epam.reportportal.utils.properties.DefaultProperties; import com.epam.reportportal.utils.properties.SystemAttributesExtractor; -import com.epam.ta.reportportal.ws.reporting.ItemAttributeResource; -import com.epam.ta.reportportal.ws.reporting.StartLaunchRQ; +import com.epam.ta.reportportal.ws.model.attribute.ItemAttributeResource; +import com.epam.ta.reportportal.ws.model.launch.StartLaunchRQ; import io.reactivex.Completable; import io.reactivex.Maybe; import io.reactivex.Scheduler; diff --git a/src/main/java/com/epam/reportportal/service/step/DefaultStepReporter.java b/src/main/java/com/epam/reportportal/service/step/DefaultStepReporter.java index 12d2ba73..d9cba68e 100644 --- a/src/main/java/com/epam/reportportal/service/step/DefaultStepReporter.java +++ b/src/main/java/com/epam/reportportal/service/step/DefaultStepReporter.java @@ -24,9 +24,9 @@ import com.epam.reportportal.utils.ObjectUtils; import com.epam.reportportal.utils.StatusEvaluation; import com.epam.reportportal.utils.files.Utils; -import com.epam.ta.reportportal.ws.reporting.FinishTestItemRQ; -import com.epam.ta.reportportal.ws.reporting.StartTestItemRQ; -import com.epam.ta.reportportal.ws.reporting.SaveLogRQ; +import com.epam.ta.reportportal.ws.model.FinishTestItemRQ; +import com.epam.ta.reportportal.ws.model.StartTestItemRQ; +import com.epam.ta.reportportal.ws.model.log.SaveLogRQ; import io.reactivex.Maybe; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/main/java/com/epam/reportportal/service/step/StepReporter.java b/src/main/java/com/epam/reportportal/service/step/StepReporter.java index 98f5292c..b1e4ef0d 100644 --- a/src/main/java/com/epam/reportportal/service/step/StepReporter.java +++ b/src/main/java/com/epam/reportportal/service/step/StepReporter.java @@ -17,8 +17,8 @@ package com.epam.reportportal.service.step; import com.epam.reportportal.listeners.ItemStatus; -import com.epam.ta.reportportal.ws.reporting.FinishTestItemRQ; -import com.epam.ta.reportportal.ws.reporting.StartTestItemRQ; +import com.epam.ta.reportportal.ws.model.FinishTestItemRQ; +import com.epam.ta.reportportal.ws.model.StartTestItemRQ; import io.reactivex.Maybe; import javax.annotation.Nonnull; diff --git a/src/main/java/com/epam/reportportal/service/step/StepRequestUtils.java b/src/main/java/com/epam/reportportal/service/step/StepRequestUtils.java index 5bb5203d..e4fa25ae 100644 --- a/src/main/java/com/epam/reportportal/service/step/StepRequestUtils.java +++ b/src/main/java/com/epam/reportportal/service/step/StepRequestUtils.java @@ -17,8 +17,8 @@ package com.epam.reportportal.service.step; import com.epam.reportportal.listeners.ItemStatus; -import com.epam.ta.reportportal.ws.reporting.FinishTestItemRQ; -import com.epam.ta.reportportal.ws.reporting.StartTestItemRQ; +import com.epam.ta.reportportal.ws.model.FinishTestItemRQ; +import com.epam.ta.reportportal.ws.model.StartTestItemRQ; import javax.annotation.Nonnull; import javax.annotation.Nullable; diff --git a/src/main/java/com/epam/reportportal/service/tree/ItemTreeReporter.java b/src/main/java/com/epam/reportportal/service/tree/ItemTreeReporter.java index 877b8e77..774da6e1 100644 --- a/src/main/java/com/epam/reportportal/service/tree/ItemTreeReporter.java +++ b/src/main/java/com/epam/reportportal/service/tree/ItemTreeReporter.java @@ -19,8 +19,8 @@ import com.epam.reportportal.message.TypeAwareByteSource; import com.epam.reportportal.service.ReportPortalClient; import com.epam.reportportal.utils.http.HttpRequestUtils; -import com.epam.ta.reportportal.ws.reporting.*; -import com.epam.ta.reportportal.ws.reporting.SaveLogRQ; +import com.epam.ta.reportportal.ws.model.*; +import com.epam.ta.reportportal.ws.model.log.SaveLogRQ; import io.reactivex.Maybe; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/main/java/com/epam/reportportal/service/tree/TestItemTree.java b/src/main/java/com/epam/reportportal/service/tree/TestItemTree.java index ffbf3f3a..25fbcda3 100644 --- a/src/main/java/com/epam/reportportal/service/tree/TestItemTree.java +++ b/src/main/java/com/epam/reportportal/service/tree/TestItemTree.java @@ -18,7 +18,7 @@ import com.epam.reportportal.listeners.ItemStatus; import com.epam.reportportal.listeners.ItemType; -import com.epam.ta.reportportal.ws.reporting.OperationCompletionRS; +import com.epam.ta.reportportal.ws.model.OperationCompletionRS; import io.reactivex.Maybe; import javax.annotation.Nonnull; diff --git a/src/main/java/com/epam/reportportal/utils/AttributeParser.java b/src/main/java/com/epam/reportportal/utils/AttributeParser.java index b342de10..cb0e0637 100644 --- a/src/main/java/com/epam/reportportal/utils/AttributeParser.java +++ b/src/main/java/com/epam/reportportal/utils/AttributeParser.java @@ -16,7 +16,7 @@ package com.epam.reportportal.utils; import com.epam.reportportal.annotations.attribute.*; -import com.epam.ta.reportportal.ws.reporting.ItemAttributesRQ; +import com.epam.ta.reportportal.ws.model.attribute.ItemAttributesRQ; import org.apache.commons.lang3.StringUtils; import javax.annotation.Nonnull; diff --git a/src/main/java/com/epam/reportportal/utils/ParameterUtils.java b/src/main/java/com/epam/reportportal/utils/ParameterUtils.java index 205cb7d9..544f9dd3 100644 --- a/src/main/java/com/epam/reportportal/utils/ParameterUtils.java +++ b/src/main/java/com/epam/reportportal/utils/ParameterUtils.java @@ -18,7 +18,7 @@ import com.epam.reportportal.annotations.ParameterKey; import com.epam.reportportal.utils.markdown.MarkdownUtils; -import com.epam.ta.reportportal.ws.reporting.ParameterResource; +import com.epam.ta.reportportal.ws.model.ParameterResource; import org.apache.commons.lang3.tuple.Pair; import javax.annotation.Nonnull; diff --git a/src/main/java/com/epam/reportportal/utils/http/HttpRequestUtils.java b/src/main/java/com/epam/reportportal/utils/http/HttpRequestUtils.java index 9172b27b..069f9f61 100644 --- a/src/main/java/com/epam/reportportal/utils/http/HttpRequestUtils.java +++ b/src/main/java/com/epam/reportportal/utils/http/HttpRequestUtils.java @@ -18,8 +18,8 @@ import com.epam.reportportal.exception.InternalReportPortalClientException; import com.epam.reportportal.utils.MimeTypeDetector; -import com.epam.ta.reportportal.ws.reporting.Constants; -import com.epam.ta.reportportal.ws.reporting.SaveLogRQ; +import com.epam.ta.reportportal.ws.model.Constants; +import com.epam.ta.reportportal.ws.model.log.SaveLogRQ; import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.core.type.TypeReference; import com.fasterxml.jackson.databind.DeserializationFeature; diff --git a/src/main/java/com/epam/reportportal/utils/properties/SystemAttributesExtractor.java b/src/main/java/com/epam/reportportal/utils/properties/SystemAttributesExtractor.java index 99ea2236..4ab0d6dc 100644 --- a/src/main/java/com/epam/reportportal/utils/properties/SystemAttributesExtractor.java +++ b/src/main/java/com/epam/reportportal/utils/properties/SystemAttributesExtractor.java @@ -16,7 +16,7 @@ package com.epam.reportportal.utils.properties; -import com.epam.ta.reportportal.ws.reporting.ItemAttributesRQ; +import com.epam.ta.reportportal.ws.model.attribute.ItemAttributesRQ; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/test/java/com/epam/reportportal/aspect/StepAspectCommon.java b/src/test/java/com/epam/reportportal/aspect/StepAspectCommon.java index 2692f8b6..b4d0d160 100644 --- a/src/test/java/com/epam/reportportal/aspect/StepAspectCommon.java +++ b/src/test/java/com/epam/reportportal/aspect/StepAspectCommon.java @@ -21,7 +21,8 @@ import com.epam.reportportal.annotations.attribute.Attributes; import com.epam.reportportal.service.ReportPortalClient; import com.epam.reportportal.test.TestUtils; -import com.epam.ta.reportportal.ws.reporting.*; +import com.epam.ta.reportportal.ws.model.*; +import com.epam.ta.reportportal.ws.model.item.ItemCreatedRS; import io.reactivex.Maybe; import org.aspectj.lang.JoinPoint; import org.aspectj.lang.Signature; diff --git a/src/test/java/com/epam/reportportal/aspect/StepAspectFinishTest.java b/src/test/java/com/epam/reportportal/aspect/StepAspectFinishTest.java index 1480a16c..b8d60ecb 100644 --- a/src/test/java/com/epam/reportportal/aspect/StepAspectFinishTest.java +++ b/src/test/java/com/epam/reportportal/aspect/StepAspectFinishTest.java @@ -23,7 +23,7 @@ import com.epam.reportportal.service.ReportPortal; import com.epam.reportportal.service.ReportPortalClient; import com.epam.reportportal.test.TestUtils; -import com.epam.ta.reportportal.ws.reporting.FinishTestItemRQ; +import com.epam.ta.reportportal.ws.model.FinishTestItemRQ; import io.reactivex.Maybe; import org.aspectj.lang.reflect.MethodSignature; import org.junit.jupiter.api.BeforeEach; diff --git a/src/test/java/com/epam/reportportal/aspect/StepAspectStartTest.java b/src/test/java/com/epam/reportportal/aspect/StepAspectStartTest.java index aea0a506..88528c88 100644 --- a/src/test/java/com/epam/reportportal/aspect/StepAspectStartTest.java +++ b/src/test/java/com/epam/reportportal/aspect/StepAspectStartTest.java @@ -23,7 +23,7 @@ import com.epam.reportportal.service.ReportPortalClient; import com.epam.reportportal.test.TestUtils; import com.epam.reportportal.util.test.CommonUtils; -import com.epam.ta.reportportal.ws.reporting.StartTestItemRQ; +import com.epam.ta.reportportal.ws.model.StartTestItemRQ; import io.reactivex.Maybe; import org.aspectj.lang.reflect.MethodSignature; import org.junit.jupiter.api.AfterEach; diff --git a/src/test/java/com/epam/reportportal/listeners/ListenerParametersTest.java b/src/test/java/com/epam/reportportal/listeners/ListenerParametersTest.java index 7785f650..3397ec43 100644 --- a/src/test/java/com/epam/reportportal/listeners/ListenerParametersTest.java +++ b/src/test/java/com/epam/reportportal/listeners/ListenerParametersTest.java @@ -26,8 +26,8 @@ import java.time.Duration; import java.util.Arrays; -import static com.epam.ta.reportportal.ws.reporting.Mode.DEBUG; -import static com.epam.ta.reportportal.ws.reporting.Mode.DEFAULT; +import static com.epam.ta.reportportal.ws.model.launch.Mode.DEBUG; +import static com.epam.ta.reportportal.ws.model.launch.Mode.DEFAULT; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.*; import static org.junit.jupiter.api.Assertions.*; diff --git a/src/test/java/com/epam/reportportal/service/ItemLoggingContextMultiThreadTest.java b/src/test/java/com/epam/reportportal/service/ItemLoggingContextMultiThreadTest.java index 957dd8a0..24315372 100644 --- a/src/test/java/com/epam/reportportal/service/ItemLoggingContextMultiThreadTest.java +++ b/src/test/java/com/epam/reportportal/service/ItemLoggingContextMultiThreadTest.java @@ -19,7 +19,7 @@ import com.epam.reportportal.listeners.ListenerParameters; import com.epam.reportportal.test.TestUtils; import com.epam.reportportal.util.test.CommonUtils; -import com.epam.ta.reportportal.ws.reporting.StartTestItemRQ; +import com.epam.ta.reportportal.ws.model.StartTestItemRQ; import io.reactivex.Maybe; import okhttp3.MultipartBody; import org.awaitility.Awaitility; diff --git a/src/test/java/com/epam/reportportal/service/LaunchNullCheckTest.java b/src/test/java/com/epam/reportportal/service/LaunchNullCheckTest.java index 2cfaba58..809f6dbd 100644 --- a/src/test/java/com/epam/reportportal/service/LaunchNullCheckTest.java +++ b/src/test/java/com/epam/reportportal/service/LaunchNullCheckTest.java @@ -17,7 +17,7 @@ package com.epam.reportportal.service; import com.epam.reportportal.service.statistics.StatisticsService; -import com.epam.ta.reportportal.ws.reporting.OperationCompletionRS; +import com.epam.ta.reportportal.ws.model.OperationCompletionRS; import io.reactivex.Maybe; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.Assertions; diff --git a/src/test/java/com/epam/reportportal/service/LaunchTest.java b/src/test/java/com/epam/reportportal/service/LaunchTest.java index e960641a..955813de 100644 --- a/src/test/java/com/epam/reportportal/service/LaunchTest.java +++ b/src/test/java/com/epam/reportportal/service/LaunchTest.java @@ -19,8 +19,6 @@ import com.epam.reportportal.annotations.Step; import com.epam.reportportal.aspect.StepAspect; import com.epam.reportportal.aspect.StepAspectCommon; -import com.epam.reportportal.exception.ErrorRS; -import com.epam.reportportal.exception.ErrorType; import com.epam.reportportal.exception.ReportPortalException; import com.epam.reportportal.listeners.ItemStatus; import com.epam.reportportal.listeners.ListenerParameters; @@ -29,12 +27,10 @@ import com.epam.reportportal.utils.ObjectUtils; import com.epam.reportportal.utils.StaticStructuresUtils; import com.epam.reportportal.utils.properties.DefaultProperties; -import com.epam.ta.reportportal.ws.reporting.FinishExecutionRQ; -import com.epam.ta.reportportal.ws.reporting.FinishTestItemRQ; -import com.epam.ta.reportportal.ws.reporting.ItemAttributesRQ; -import com.epam.ta.reportportal.ws.reporting.OperationCompletionRS; -import com.epam.ta.reportportal.ws.reporting.StartLaunchRQ; -import com.epam.ta.reportportal.ws.reporting.StartTestItemRQ; +import com.epam.ta.reportportal.ws.model.*; +import com.epam.ta.reportportal.ws.model.attribute.ItemAttributesRQ; +import com.epam.ta.reportportal.ws.model.issue.Issue; +import com.epam.ta.reportportal.ws.model.launch.StartLaunchRQ; import io.reactivex.Maybe; import org.apache.commons.lang3.RandomStringUtils; import org.aspectj.lang.reflect.MethodSignature; diff --git a/src/test/java/com/epam/reportportal/service/LoggingContextTest.java b/src/test/java/com/epam/reportportal/service/LoggingContextTest.java index e2e2baff..ef0431bd 100644 --- a/src/test/java/com/epam/reportportal/service/LoggingContextTest.java +++ b/src/test/java/com/epam/reportportal/service/LoggingContextTest.java @@ -19,8 +19,8 @@ import com.epam.reportportal.listeners.ListenerParameters; import com.epam.reportportal.listeners.LogLevel; import com.epam.reportportal.test.TestUtils; -import com.epam.ta.reportportal.ws.reporting.BatchSaveOperatingRS; -import com.epam.ta.reportportal.ws.reporting.SaveLogRQ; +import com.epam.ta.reportportal.ws.model.BatchSaveOperatingRS; +import com.epam.ta.reportportal.ws.model.log.SaveLogRQ; import io.reactivex.FlowableSubscriber; import io.reactivex.Maybe; import io.reactivex.Scheduler; diff --git a/src/test/java/com/epam/reportportal/service/ReportPortalClientJoinTest.java b/src/test/java/com/epam/reportportal/service/ReportPortalClientJoinTest.java index 1e6af937..b5caa945 100644 --- a/src/test/java/com/epam/reportportal/service/ReportPortalClientJoinTest.java +++ b/src/test/java/com/epam/reportportal/service/ReportPortalClientJoinTest.java @@ -15,19 +15,19 @@ */ package com.epam.reportportal.service; -import com.epam.reportportal.exception.ErrorRS; import com.epam.reportportal.exception.ReportPortalException; import com.epam.reportportal.listeners.ItemStatus; import com.epam.reportportal.listeners.ListenerParameters; import com.epam.reportportal.service.launch.PrimaryLaunch; import com.epam.reportportal.service.launch.SecondaryLaunch; import com.epam.reportportal.test.TestUtils; -import com.epam.ta.reportportal.ws.reporting.FinishExecutionRQ; -import com.epam.ta.reportportal.ws.reporting.ItemCreatedRS; -import com.epam.ta.reportportal.ws.reporting.LaunchResource; -import com.epam.ta.reportportal.ws.reporting.OperationCompletionRS; -import com.epam.ta.reportportal.ws.reporting.StartLaunchRQ; -import com.epam.ta.reportportal.ws.reporting.StartTestItemRQ; +import com.epam.ta.reportportal.ws.model.ErrorRS; +import com.epam.ta.reportportal.ws.model.FinishExecutionRQ; +import com.epam.ta.reportportal.ws.model.OperationCompletionRS; +import com.epam.ta.reportportal.ws.model.StartTestItemRQ; +import com.epam.ta.reportportal.ws.model.item.ItemCreatedRS; +import com.epam.ta.reportportal.ws.model.launch.LaunchResource; +import com.epam.ta.reportportal.ws.model.launch.StartLaunchRQ; import io.reactivex.Maybe; import io.reactivex.Scheduler; import io.reactivex.disposables.Disposable; diff --git a/src/test/java/com/epam/reportportal/service/ReportPortalTest.java b/src/test/java/com/epam/reportportal/service/ReportPortalTest.java index 5d969d02..e232eda0 100644 --- a/src/test/java/com/epam/reportportal/service/ReportPortalTest.java +++ b/src/test/java/com/epam/reportportal/service/ReportPortalTest.java @@ -23,10 +23,10 @@ import com.epam.reportportal.test.TestUtils; import com.epam.reportportal.util.test.CommonUtils; import com.epam.reportportal.util.test.SocketUtils; -import com.epam.ta.reportportal.ws.reporting.FinishExecutionRQ; -import com.epam.ta.reportportal.ws.reporting.StartTestItemRQ; -import com.epam.ta.reportportal.ws.reporting.StartLaunchRQ; -import com.epam.ta.reportportal.ws.reporting.StartLaunchRS; +import com.epam.ta.reportportal.ws.model.FinishExecutionRQ; +import com.epam.ta.reportportal.ws.model.StartTestItemRQ; +import com.epam.ta.reportportal.ws.model.launch.StartLaunchRQ; +import com.epam.ta.reportportal.ws.model.launch.StartLaunchRS; import io.reactivex.Maybe; import okhttp3.OkHttpClient; import okhttp3.Request; diff --git a/src/test/java/com/epam/reportportal/service/statistics/StatisticsServiceTest.java b/src/test/java/com/epam/reportportal/service/statistics/StatisticsServiceTest.java index af9bcbc6..1acb8c32 100644 --- a/src/test/java/com/epam/reportportal/service/statistics/StatisticsServiceTest.java +++ b/src/test/java/com/epam/reportportal/service/statistics/StatisticsServiceTest.java @@ -23,8 +23,8 @@ import com.epam.reportportal.util.test.CommonUtils; import com.epam.reportportal.util.test.ProcessUtils; import com.epam.reportportal.utils.files.Utils; -import com.epam.ta.reportportal.ws.reporting.ItemAttributesRQ; -import com.epam.ta.reportportal.ws.reporting.StartLaunchRQ; +import com.epam.ta.reportportal.ws.model.attribute.ItemAttributesRQ; +import com.epam.ta.reportportal.ws.model.launch.StartLaunchRQ; import io.reactivex.Maybe; import okhttp3.MediaType; import okhttp3.ResponseBody; diff --git a/src/test/java/com/epam/reportportal/service/step/FileLocatorTest.java b/src/test/java/com/epam/reportportal/service/step/FileLocatorTest.java index 6c19eff7..4476dd59 100644 --- a/src/test/java/com/epam/reportportal/service/step/FileLocatorTest.java +++ b/src/test/java/com/epam/reportportal/service/step/FileLocatorTest.java @@ -21,9 +21,9 @@ import com.epam.reportportal.service.ReportPortalClient; import com.epam.reportportal.test.TestUtils; import com.epam.reportportal.utils.files.Utils; -import com.epam.ta.reportportal.ws.reporting.BatchSaveOperatingRS; -import com.epam.ta.reportportal.ws.reporting.ItemCreatedRS; -import com.epam.ta.reportportal.ws.reporting.SaveLogRQ; +import com.epam.ta.reportportal.ws.model.BatchSaveOperatingRS; +import com.epam.ta.reportportal.ws.model.item.ItemCreatedRS; +import com.epam.ta.reportportal.ws.model.log.SaveLogRQ; import io.reactivex.Maybe; import okhttp3.MultipartBody; import okio.Buffer; diff --git a/src/test/java/com/epam/reportportal/service/step/ManualNestedStepTest.java b/src/test/java/com/epam/reportportal/service/step/ManualNestedStepTest.java index 4d4ea6bb..3911a0f2 100644 --- a/src/test/java/com/epam/reportportal/service/step/ManualNestedStepTest.java +++ b/src/test/java/com/epam/reportportal/service/step/ManualNestedStepTest.java @@ -23,8 +23,8 @@ import com.epam.reportportal.service.ReportPortalClient; import com.epam.reportportal.test.TestUtils; import com.epam.reportportal.util.test.CommonUtils; -import com.epam.ta.reportportal.ws.reporting.FinishTestItemRQ; -import com.epam.ta.reportportal.ws.reporting.StartTestItemRQ; +import com.epam.ta.reportportal.ws.model.FinishTestItemRQ; +import com.epam.ta.reportportal.ws.model.StartTestItemRQ; import io.reactivex.Maybe; import okhttp3.MultipartBody; import org.apache.commons.lang3.tuple.Pair; diff --git a/src/test/java/com/epam/reportportal/service/step/MultiThreadingStepReporterTest.java b/src/test/java/com/epam/reportportal/service/step/MultiThreadingStepReporterTest.java index cda3f6b5..7276e5e9 100644 --- a/src/test/java/com/epam/reportportal/service/step/MultiThreadingStepReporterTest.java +++ b/src/test/java/com/epam/reportportal/service/step/MultiThreadingStepReporterTest.java @@ -21,7 +21,7 @@ import com.epam.reportportal.service.Launch; import com.epam.reportportal.service.ReportPortal; import com.epam.reportportal.service.ReportPortalClient; -import com.epam.ta.reportportal.ws.reporting.StartTestItemRQ; +import com.epam.ta.reportportal.ws.model.StartTestItemRQ; import io.reactivex.Maybe; import org.apache.commons.lang3.tuple.Pair; import org.awaitility.Awaitility; diff --git a/src/test/java/com/epam/reportportal/service/step/StepOrderTest.java b/src/test/java/com/epam/reportportal/service/step/StepOrderTest.java index 16db4272..e89f9232 100644 --- a/src/test/java/com/epam/reportportal/service/step/StepOrderTest.java +++ b/src/test/java/com/epam/reportportal/service/step/StepOrderTest.java @@ -20,10 +20,10 @@ import com.epam.reportportal.service.ReportPortal; import com.epam.reportportal.service.ReportPortalClient; import com.epam.reportportal.test.TestUtils; -import com.epam.ta.reportportal.ws.reporting.FinishTestItemRQ; -import com.epam.ta.reportportal.ws.reporting.OperationCompletionRS; -import com.epam.ta.reportportal.ws.reporting.StartTestItemRQ; -import com.epam.ta.reportportal.ws.reporting.ItemCreatedRS; +import com.epam.ta.reportportal.ws.model.FinishTestItemRQ; +import com.epam.ta.reportportal.ws.model.OperationCompletionRS; +import com.epam.ta.reportportal.ws.model.StartTestItemRQ; +import com.epam.ta.reportportal.ws.model.item.ItemCreatedRS; import io.reactivex.Maybe; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/src/test/java/com/epam/reportportal/test/TestUtils.java b/src/test/java/com/epam/reportportal/test/TestUtils.java index 382d4e71..e0d97683 100644 --- a/src/test/java/com/epam/reportportal/test/TestUtils.java +++ b/src/test/java/com/epam/reportportal/test/TestUtils.java @@ -19,10 +19,11 @@ import com.epam.reportportal.listeners.ListenerParameters; import com.epam.reportportal.service.ReportPortalClient; import com.epam.reportportal.utils.http.HttpRequestUtils; -import com.epam.ta.reportportal.ws.reporting.*; -import com.epam.ta.reportportal.ws.reporting.StartLaunchRQ; -import com.epam.ta.reportportal.ws.reporting.StartLaunchRS; -import com.epam.ta.reportportal.ws.reporting.SaveLogRQ; +import com.epam.ta.reportportal.ws.model.*; +import com.epam.ta.reportportal.ws.model.item.ItemCreatedRS; +import com.epam.ta.reportportal.ws.model.launch.StartLaunchRQ; +import com.epam.ta.reportportal.ws.model.launch.StartLaunchRS; +import com.epam.ta.reportportal.ws.model.log.SaveLogRQ; import com.fasterxml.jackson.core.type.TypeReference; import io.reactivex.Maybe; import okhttp3.MultipartBody; diff --git a/src/test/java/com/epam/reportportal/utils/AnnotationAttributeParserTest.java b/src/test/java/com/epam/reportportal/utils/AnnotationAttributeParserTest.java index fc91c31a..ecc0532a 100644 --- a/src/test/java/com/epam/reportportal/utils/AnnotationAttributeParserTest.java +++ b/src/test/java/com/epam/reportportal/utils/AnnotationAttributeParserTest.java @@ -1,7 +1,7 @@ package com.epam.reportportal.utils; import com.epam.reportportal.annotations.attribute.*; -import com.epam.ta.reportportal.ws.reporting.ItemAttributesRQ; +import com.epam.ta.reportportal.ws.model.attribute.ItemAttributesRQ; import org.hamcrest.Matcher; import org.junit.jupiter.api.Test; diff --git a/src/test/java/com/epam/reportportal/utils/ParameterUtilsTest.java b/src/test/java/com/epam/reportportal/utils/ParameterUtilsTest.java index 3f417d16..ef1523f2 100644 --- a/src/test/java/com/epam/reportportal/utils/ParameterUtilsTest.java +++ b/src/test/java/com/epam/reportportal/utils/ParameterUtilsTest.java @@ -19,7 +19,7 @@ import com.epam.reportportal.annotations.ParameterKey; import com.epam.reportportal.service.item.TestCaseIdEntry; import com.epam.reportportal.utils.markdown.MarkdownUtilsTest; -import com.epam.ta.reportportal.ws.reporting.ParameterResource; +import com.epam.ta.reportportal.ws.model.ParameterResource; import org.apache.commons.lang3.tuple.Pair; import org.junit.jupiter.api.Test; import org.junit.jupiter.params.ParameterizedTest; diff --git a/src/test/java/com/epam/reportportal/utils/StringAttributeParserTest.java b/src/test/java/com/epam/reportportal/utils/StringAttributeParserTest.java index 219ffa90..ff9afd67 100644 --- a/src/test/java/com/epam/reportportal/utils/StringAttributeParserTest.java +++ b/src/test/java/com/epam/reportportal/utils/StringAttributeParserTest.java @@ -15,7 +15,7 @@ */ package com.epam.reportportal.utils; -import com.epam.ta.reportportal.ws.reporting.ItemAttributesRQ; +import com.epam.ta.reportportal.ws.model.attribute.ItemAttributesRQ; import org.hamcrest.Matchers; import org.junit.jupiter.api.Test; diff --git a/src/test/java/com/epam/reportportal/utils/properties/SystemAttributesExtractorTest.java b/src/test/java/com/epam/reportportal/utils/properties/SystemAttributesExtractorTest.java index 371b9189..cefc3b0f 100644 --- a/src/test/java/com/epam/reportportal/utils/properties/SystemAttributesExtractorTest.java +++ b/src/test/java/com/epam/reportportal/utils/properties/SystemAttributesExtractorTest.java @@ -16,7 +16,7 @@ package com.epam.reportportal.utils.properties; -import com.epam.ta.reportportal.ws.reporting.ItemAttributesRQ; +import com.epam.ta.reportportal.ws.model.attribute.ItemAttributesRQ; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test;