diff --git a/CHANGELOG.md b/CHANGELOG.md index efe50709..2309372e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -297,7 +297,7 @@ ### Added - A method to emit a log entry for a certain item: com.epam.reportportal.service.ReportPortal.emitLog(io.reactivex.Maybe, -java.util.function.Function) +java.util.function.Function) ### Changed - Apache Tika was updated on version 1.20 diff --git a/build.gradle b/build.gradle index b22d0694..59de177d 100644 --- a/build.gradle +++ b/build.gradle @@ -37,10 +37,11 @@ compileTestJava.options.encoding = 'UTF-8' repositories { mavenCentral() + maven { url 'https://jitpack.io' } } dependencies { - api ('com.epam.reportportal:commons-model:5.0.0') { + api ('com.github.reportportal:commons-reporting:5c74bb2') { exclude module: 'jackson-databind' } api 'com.fasterxml.jackson.core:jackson-databind:2.12.7.1' // Access is needed by HTTP loggers to format JSON @@ -50,6 +51,7 @@ 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/gradle.properties b/gradle.properties index ef62cd19..4853b6b5 100644 --- a/gradle.properties +++ b/gradle.properties @@ -10,3 +10,4 @@ scripts_branch=develop excludeTests= aspectj_version=1.9.19 slf4j_version=2.0.7 +lang3_version=3.14.0 diff --git a/src/main/java/com/epam/reportportal/annotations/Step.java b/src/main/java/com/epam/reportportal/annotations/Step.java index ad03a4a9..00e95dd8 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.model.StartTestItemRQ; +import com.epam.ta.reportportal.ws.reporting.StartTestItemRQ; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/src/main/java/com/epam/reportportal/annotations/attribute/Attribute.java b/src/main/java/com/epam/reportportal/annotations/attribute/Attribute.java index cdc7a099..59f83424 100644 --- a/src/main/java/com/epam/reportportal/annotations/attribute/Attribute.java +++ b/src/main/java/com/epam/reportportal/annotations/attribute/Attribute.java @@ -21,7 +21,7 @@ import java.lang.annotation.Target; /** - * Annotation used in {@link Attributes} as field, to provide {@link com.epam.ta.reportportal.ws.model.attribute.ItemAttributesRQ} + * Annotation used in {@link Attributes} as field, to provide {@link com.epam.ta.reportportal.ws.reporting.ItemAttributesRQ} * with both 'key' and 'value' fields specified * * @author Ivan Budayeu diff --git a/src/main/java/com/epam/reportportal/annotations/attribute/AttributeValue.java b/src/main/java/com/epam/reportportal/annotations/attribute/AttributeValue.java index 21b319a4..1e8b24b3 100644 --- a/src/main/java/com/epam/reportportal/annotations/attribute/AttributeValue.java +++ b/src/main/java/com/epam/reportportal/annotations/attribute/AttributeValue.java @@ -21,7 +21,7 @@ import java.lang.annotation.Target; /** - * Annotation used in {@link Attributes} as field, to provide {@link com.epam.ta.reportportal.ws.model.attribute.ItemAttributesRQ} + * Annotation used in {@link Attributes} as field, to provide {@link com.epam.ta.reportportal.ws.reporting.ItemAttributesRQ} * with only 'value' field specified ('key' in the resulted entity will be NULL) * * @author Ivan Budayeu diff --git a/src/main/java/com/epam/reportportal/annotations/attribute/Attributes.java b/src/main/java/com/epam/reportportal/annotations/attribute/Attributes.java index 5e509e38..a8913cc0 100644 --- a/src/main/java/com/epam/reportportal/annotations/attribute/Attributes.java +++ b/src/main/java/com/epam/reportportal/annotations/attribute/Attributes.java @@ -19,7 +19,7 @@ import java.lang.annotation.*; /** - * Annotation for test methods and classes to attach {@link com.epam.ta.reportportal.ws.model.attribute.ItemAttributesRQ} to the test items + * Annotation for test methods and classes to attach {@link com.epam.ta.reportportal.ws.reporting.ItemAttributesRQ} to the test items * * @author Ivan Budayeu * @see Attribute diff --git a/src/main/java/com/epam/reportportal/annotations/attribute/MultiKeyAttribute.java b/src/main/java/com/epam/reportportal/annotations/attribute/MultiKeyAttribute.java index c48c8cad..58800abe 100644 --- a/src/main/java/com/epam/reportportal/annotations/attribute/MultiKeyAttribute.java +++ b/src/main/java/com/epam/reportportal/annotations/attribute/MultiKeyAttribute.java @@ -21,7 +21,7 @@ import java.lang.annotation.Target; /** - * Annotation used in {@link Attributes} as field, to provide multiple {@link com.epam.ta.reportportal.ws.model.attribute.ItemAttributesRQ} + * Annotation used in {@link Attributes} as field, to provide multiple {@link com.epam.ta.reportportal.ws.reporting.ItemAttributesRQ} * with both 'key' and 'value' fields specified. * Used to prevent duplication of {@link Attribute} annotation with the same value and different keys * diff --git a/src/main/java/com/epam/reportportal/annotations/attribute/MultiValueAttribute.java b/src/main/java/com/epam/reportportal/annotations/attribute/MultiValueAttribute.java index 39186326..4ba4576d 100644 --- a/src/main/java/com/epam/reportportal/annotations/attribute/MultiValueAttribute.java +++ b/src/main/java/com/epam/reportportal/annotations/attribute/MultiValueAttribute.java @@ -21,7 +21,7 @@ import java.lang.annotation.Target; /** - * Annotation used in {@link Attributes} as field, to provide multiple {@link com.epam.ta.reportportal.ws.model.attribute.ItemAttributesRQ} + * Annotation used in {@link Attributes} as field, to provide multiple {@link com.epam.ta.reportportal.ws.reporting.ItemAttributesRQ} * with both 'key' (optional) and 'value' fields specified. * Used to prevent duplication of {@link Attribute} annotation with the same key and different values * diff --git a/src/main/java/com/epam/reportportal/aspect/StepAspect.java b/src/main/java/com/epam/reportportal/aspect/StepAspect.java index e0b1a8a2..52857957 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.model.StartTestItemRQ; +import com.epam.ta.reportportal.ws.reporting.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 cd6f5d18..767aa238 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.model.StartTestItemRQ; -import com.epam.ta.reportportal.ws.model.attribute.ItemAttributesRQ; +import com.epam.ta.reportportal.ws.reporting.ItemAttributesRQ; +import com.epam.ta.reportportal.ws.reporting.StartTestItemRQ; import org.aspectj.lang.JoinPoint; import org.aspectj.lang.reflect.MethodSignature; diff --git a/src/main/java/com/epam/reportportal/exception/ErrorRS.java b/src/main/java/com/epam/reportportal/exception/ErrorRS.java new file mode 100644 index 00000000..5b50d189 --- /dev/null +++ b/src/main/java/com/epam/reportportal/exception/ErrorRS.java @@ -0,0 +1,145 @@ +/* + * Copyright 2019 EPAM Systems + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.epam.reportportal.exception; + +import com.fasterxml.jackson.annotation.JsonInclude; +import com.fasterxml.jackson.annotation.JsonInclude.Include; +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.annotation.JsonPropertyOrder; +import com.fasterxml.jackson.core.JsonGenerator; +import com.fasterxml.jackson.core.JsonParser; +import com.fasterxml.jackson.core.ObjectCodec; +import com.fasterxml.jackson.databind.DeserializationContext; +import com.fasterxml.jackson.databind.JsonDeserializer; +import com.fasterxml.jackson.databind.JsonNode; +import com.fasterxml.jackson.databind.JsonSerializer; +import com.fasterxml.jackson.databind.SerializerProvider; +import com.fasterxml.jackson.databind.annotation.JsonDeserialize; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; +import java.io.IOException; +import java.io.Serializable; + +/** + * Base Error response body for all Report Portal exceptions + * + * @author Andrei Varabyeu + * + */ +@JsonPropertyOrder({ "errorCode", "message", "stackTrace" }) +@JsonInclude(Include.NON_NULL) +public class ErrorRS implements Serializable { + /** + * Generated SVUID + */ + private static final long serialVersionUID = -3717290684860161862L; + + @JsonSerialize(using = ErrorTypeSerializer.class) + @JsonDeserialize(using = ErrorTypeDeserializer.class) + @JsonProperty("errorCode") + private ErrorType errorType; + + @JsonProperty("stackTrace") + private String stackTrace; + + @JsonProperty("message") + private String message; + + public ErrorType getErrorType() { + return errorType; + } + + public void setErrorType(ErrorType errorType) { + this.errorType = errorType; + } + + public String getStackTrace() { + return stackTrace; + } + + public void setStackTrace(String stackTrace) { + this.stackTrace = stackTrace; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + @Override + public int hashCode() { + final int prime = 31; + int result = 1; + result = prime * result + ((errorType == null) ? 0 : errorType.hashCode()); + result = prime * result + ((message == null) ? 0 : message.hashCode()); + result = prime * result + ((stackTrace == null) ? 0 : stackTrace.hashCode()); + return result; + } + + @Override + public boolean equals(Object obj) { + if (this == obj) + return true; + if (obj == null) + return false; + if (getClass() != obj.getClass()) + return false; + ErrorRS other = (ErrorRS) obj; + if (errorType != other.errorType) + return false; + if (message == null) { + if (other.message != null) + return false; + } else if (!message.equals(other.message)) + return false; + if (stackTrace == null) { + return other.stackTrace == null; + } else + return stackTrace.equals(other.stackTrace); + } + + private static class ErrorTypeDeserializer extends JsonDeserializer { + + @Override + public ErrorType deserialize(JsonParser parser, DeserializationContext context) throws IOException { + ObjectCodec oc = parser.getCodec(); + JsonNode node = oc.readTree(parser); + return ErrorType.getByCode(node.asInt()); + + } + + } + + private static class ErrorTypeSerializer extends JsonSerializer { + + @Override + public void serialize(ErrorType error, JsonGenerator jsonGenerator, SerializerProvider serializerProvider) throws IOException { + jsonGenerator.writeNumber(error.getCode()); + } + + } + + @Override + public String toString() { + return "ErrorRS{" + "errorType=" + errorType + + ", stackTrace='" + stackTrace + '\'' + + ", message='" + message + '\'' + + '}'; + } +} \ No newline at end of file diff --git a/src/main/java/com/epam/reportportal/exception/ErrorType.java b/src/main/java/com/epam/reportportal/exception/ErrorType.java new file mode 100644 index 00000000..8434ce20 --- /dev/null +++ b/src/main/java/com/epam/reportportal/exception/ErrorType.java @@ -0,0 +1,525 @@ +/* + * Copyright 2019 EPAM Systems + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.epam.reportportal.exception; + +/** + * Report Portal's exception list + * + * @author Andrei Varabyeu + */ +public enum ErrorType { + + /** + * Incorrect Report Portal WS Request + */ + INCORRECT_REQUEST(4001, "Incorrect Request. {}"), + + /** + * Incorrect Report Portal WS Request + */ + BINARY_DATA_CANNOT_BE_SAVED(4002, "Binary data cannot be saved. {}"), + + /** + * Access Denied + */ + ACCESS_DENIED(4003, "You do not have enough permissions. {}"), + + /** + * Access Denied + */ + ADDRESS_LOCKED(4004, "Address is locked due to several incorrect login attempts"), + + /** + * If specified by id Project or by ProjectName not found + */ + PROJECT_NOT_FOUND(4040, "Project '{}' not found. Did you use correct project name?"), + + /** + * If specified by id Launch not found + */ + LAUNCH_NOT_FOUND(4041, "Launch '{}' not found. Did you use correct Launch ID?"), + + /** + * If specified by id TestSuite not found + */ + TEST_SUITE_NOT_FOUND(4042, "TestSuite Not Found. Did you use correct TestSuite ID?"), + + /** + * If specified by id Test not found + */ + TEST_ITEM_NOT_FOUND(4043, "Test Item '{}' not found. Did you use correct Test Item ID?"), + + /** + * If specified by id Log not found + */ + LOG_NOT_FOUND(4044, "Log '{}' not found. Did you use correct Log ID?"), + + /** + * If specified by id role not found + */ + ROLE_NOT_FOUND(4045, "Project role '{}' not found. Did you use correct Role Name?"), + + /** + * If specified by login User not found + */ + USER_NOT_FOUND(4046, "User '{}' not found. {}"), + + /** + * If specified by id Widget not found + */ + WIDGET_NOT_FOUND(4047, "Widget with ID '{}' not found. Did you use correct Widget ID?"), + + /** + * If specified by id Widget not found + */ + WIDGET_NOT_FOUND_IN_DASHBOARD(4048, + "Widget with ID '{}' not found in dashboard '{}'. Did you use correct Widget ID?"), + + /** + * If specified by id Dashboard not found + */ + DASHBOARD_NOT_FOUND(4049, "Dashboard with ID '{}' not found. Did you use correct Dashboard ID?"), + + /** + * If specified by id UserFilter not found + */ + USER_FILTER_NOT_FOUND(40410, + "User filter with ID '{}' is not found on project '{}' for user '{}'. Did you use correct User Filter ID?" + ), + + /** + * If specified by id Activity not found + */ + ACTIVITY_NOT_FOUND(40411, "Activity '{}' not found. Did you use correct Activity ID?"), + + /** + * Unable to create widget based on favorite link + */ + UNABLE_TO_CREATE_WIDGET(40412, "Unable to create or update widget. {}"), + + /** + * Integration not found + */ + INTEGRATION_NOT_FOUND(40413, "Integration with ID '{}' not found. Did you use correct ID?"), + + /** + * If project not configured + */ + PROJECT_NOT_CONFIGURED(40414, "Project '{}' not configured."), + + /** + * If server settings for specified profile not found + */ + SERVER_SETTINGS_NOT_FOUND(40415, "Server Settings with '{}' profile not found."), + + /** + * If issue type not found (including custom project specific sub-types) + */ + ISSUE_TYPE_NOT_FOUND(40416, "Issue Type '{}' not found."), + + /** + * If project settings for specified project not found + */ + PROJECT_SETTINGS_NOT_FOUND(40417, "Project Settings for project '{}' not found."), + + /** + * Ticket not found + */ + TICKET_NOT_FOUND(40418, "Ticket with ID '{}' not found. Did you use correct Ticket ID?"), + + /** + * If specified Authentication extension isn't found + */ + AUTH_INTEGRATION_NOT_FOUND(40419, "Auth integration '{}' not found. Did you use correct name?"), + + /** + * If specified by id Widget not found + */ + WIDGET_NOT_FOUND_IN_PROJECT(40420, + "Widget with ID '{}' not found on project '{}'. Did you use correct Widget ID?"), + + /** + * If specified by id UserFilter not found + */ + USER_FILTER_NOT_FOUND_IN_PROJECT(40421, + "User filter with ID '{}' not found on project '{}'. Did you use correct User Filter ID?"), + + /** + * If specified by id Dashboard not found + */ + DASHBOARD_NOT_FOUND_IN_PROJECT(40422, + "Dashboard with ID '{}' not found on project '{}'. Did you use correct Dashboard ID?"), + + /** + * If pattern template with provided id is not found + */ + PATTERN_TEMPLATE_NOT_FOUND_IN_PROJECT(40423, + "Pattern template with ID '{}' not found on project '{}'. Did you use correct Pattern template ID?" + ), + + TEST_ITEM_OR_LAUNCH_NOT_FOUND(40424, + "Test Item or Launch '{}' not found. Did you use correct ID?"), + + /** + * If analyzer with provided name is not found + */ + ANALYZER_NOT_FOUND(40425, "Analyzer '{}' not found."), + + /** + * If attachment with provided id not found + */ + ATTACHMENT_NOT_FOUND(40426, "Attachment '{}' not found"), + + /** + * If binary data not found + */ + UNABLE_TO_LOAD_BINARY_DATA(40427, "Unable to load binary data by id '{}'"), + + /** + * If cluster with provided id not found + */ + CLUSTER_NOT_FOUND(40428, "Cluster '{}' not found"), + + /** + * Common error in case if object not found + */ + NOT_FOUND(40430, "'{}' not found. Did you use correct ID?"), + + /** + * If provided filtering parameters are incorrect + */ + INCORRECT_FILTER_PARAMETERS(40011, "Incorrect filtering parameters. {}"), + + /** + * If specified by id Log not found + */ + INCORRECT_SORTING_PARAMETERS(40012, "Sorting parameter {} is not defined"), + + /** + * If it's impossible to use specified integration + */ + INCORRECT_INTEGRATION_NAME(40013, "Incorrect integration name. {}"), + + /** + * Unable modify sharable resource + */ + UNABLE_MODIFY_SHARABLE_RESOURCE(40014, "Unable modify sharable resource. {}"), + + /** + * Unable to recognize provided authentication type + */ + INCORRECT_AUTHENTICATION_TYPE(40015, "Incorrect authentication type: {}"), + + /** + * Impossible post ticket to BTS + */ + UNABLE_POST_TICKET(40301, "Impossible post ticket. {}"), + + /** + * Impossible to interact with integration + */ + UNABLE_INTERACT_WITH_INTEGRATION(40302, "Impossible interact with integration. {}"), + + /** + * "Unable assign/unassign user to/from project + */ + UNABLE_ASSIGN_UNASSIGN_USER_TO_PROJECT(40304, "Unable assign/unassign user to/from project. {}"), + + /** + * Impossible operation on server side + */ + EMAIL_CONFIGURATION_IS_INCORRECT(40305, + "Email server is not configured or configuration is incorrect. {}"), + + /** + * Project update not allowed. This restriction is applied to Personal projects and internal + * EPAM's project type + */ + PROJECT_UPDATE_NOT_ALLOWED(4007, "Update/Delete of project with type {} is not allowed"), + + /** + * Unable to update yourself role + */ + UNABLE_TO_UPDATE_YOURSELF_ROLE(4008, "Unable to update yourself role."), + + /** + * Impossible operation on server side + */ + FORBIDDEN_OPERATION(40010, "Forbidden operation. {}"), + + /** + * If resource with specified settings already exists and should be unique + */ + RESOURCE_ALREADY_EXISTS(4091, "Resource '{}' already exists. You couldn't create the duplicate."), + + /** + * If Role with specified settings already exists and should be unique + */ + ROLE_ALREADY_EXISTS_ERROR(4093, + "Role with specified settings already exists. You couldn't create the duplicate."), + + /** + * If User with specified login already exists and should be unique + */ + USER_ALREADY_EXISTS(4094, "User with '{}' already exists. You couldn't create the duplicate."), + + /** + * If User filter with specified name already exists and should be unique + */ + USER_FILTER_ALREADY_EXISTS(4098, + "User filter with name '{}' already exists for user '{}' under the project '{}'. You couldn't create the duplicate." + ), + + /** + * If Project with specified settings already exists and should be unique + */ + PROJECT_ALREADY_EXISTS(4095, "Project '{}' already exists. You couldn't create the duplicate."), + + /** + * If Dashboard update request contains invalid data + */ + DASHBOARD_UPDATE_ERROR(4096, "Dashboard update request contains invalid data. {}"), + + /** + * If widget content can't be loaded because some of properties are incorrect + */ + UNABLE_LOAD_WIDGET_CONTENT(4097, + "Unable to load widget content. Widget properties contain errors: {}"), + + /** + * Unable add resource to favorites + */ + UNABLE_ADD_TO_FAVORITE(4099, "Unable add resource to favorites. {}"), + + /** + * Unable create duplicate of integration + */ + INTEGRATION_ALREADY_EXISTS(40910, + "Integration '{}' already exists. You couldn't create the duplicate."), + + /** + * Unable create the duplication of server settings with one profile name + */ + SERVER_SETTINGS_ALREADY_EXISTS(40911, + "Server settings with '{}' profile already exists. You couldn't create the duplicate."), + + /** + * Unable remove resource from favorites + */ + UNABLE_REMOVE_FROM_FAVORITE(4100, "Unable remove resource from favorites. {}"), + + /** + * If specified by login User not found + */ + LAUNCH_IS_NOT_FINISHED(4063, "Unable to perform operation for non-finished launch. {}"), + + /** + * Unable to finish with incorrect status + */ + TEST_ITEM_IS_NOT_FINISHED(4064, "Unable to perform operation for non-finished test item. {}"), + + /** + * Unable to finish with incorrect status + */ + INCORRECT_FINISH_STATUS(4065, "{}. Did you provide correct status in request?"), + + /** + * Base Error If Request sent with incorrect parameters + */ + BAD_REQUEST_ERROR(40016, "Error in handled Request. Please, check specified parameters: '{}'"), + /** + * If SaveLogRQ sent with incorrect parameters + */ + BAD_SAVE_LOG_REQUEST(40017, "Error in Save Log Request. {}"), + /** + * If Test, TestStep, Launch already finished and writing is disabled + */ + REPORTING_ITEM_ALREADY_FINISHED(40018, + "Reporting for item {} already finished. Please, check item status."), + + /** + * Occurs when status is not provided and cannot be calculated or provided status does not + * corresponds to calculated from statistics. + */ + AMBIGUOUS_TEST_ITEM_STATUS(40019, "Test item status is ambiguous. {}"), + + /** + * Incorrect test item description + */ + FAILED_TEST_ITEM_ISSUE_TYPE_DEFINITION(40020, "Test items issue type cannot be resolved. {}"), + + /** + * Finish Time Earlier than start time + */ + FINISH_TIME_EARLIER_THAN_START_TIME(40021, + "Finish time '{}' is earlier than start time '{}' for resource with ID '{}'"), + + /** + * Is not allowed to finish item + */ + FINISH_ITEM_NOT_ALLOWED(40022, "Finish test item is not allowed. {}"), + + /** + * Unable to finish in current status + */ + FINISH_LAUNCH_NOT_ALLOWED(40023, "Finish launch is not allowed. {}"), + + /** + * Unable to finish in current status + */ + START_ITEM_NOT_ALLOWED(40024, "Start test item is not allowed. {}"), + + /** + * Finish Time Earlier than start time + */ + CHILD_START_TIME_EARLIER_THAN_PARENT(40025, + "Start time of child ['{}'] item should be same or later than start time ['{}'] of the parent item/launch '{}'" + ), + + /** + * Unsupported test item type + */ + UNSUPPORTED_TEST_ITEM_TYPE(40026, "Test Item type {} is unsupported"), + + /** + * Unsupported test item type + */ + LOGGING_IS_NOT_ALLOWED(40027, "Logging is not allowed. {}"), + + /** + * Incorrect create widget request + */ + BAD_SAVE_WIDGET_REQUEST(40028, "Incorrect create widget request. {}"), + + /** + * Incorrect update widget request + */ + BAD_UPDATE_WIDGET_REQUEST(40029, "Incorrect update widget request. {}"), + + /** + * Unable to load history test item's history. + */ + UNABLE_LOAD_TEST_ITEM_HISTORY(40030, "Unable to load test item history. {}"), + + /** + * Bad save user filter request + */ + BAD_SAVE_USER_FILTER_REQUEST(40031, "Bad save user filter request. {}"), + + /** + * Error while processing retries + */ + RETRIES_HANDLER_ERROR(40036, "Incorrect retries processing. {}"), + + /** + * Bad format of importing file + */ + IMPORT_FILE_ERROR(40035, "Error while importing the file. '{}'"), + + /** + * Error during the xml file parsing + */ + PARSING_XML_ERROR(40037, "Error during parsing the xml file: '{}'"), + + /** + * Error during the object retrieving + */ + OBJECT_RETRIEVAL_ERROR(40038, "Error during object retrieving: '{}'"), + + /** + * Error during the plugin uploading + */ + PLUGIN_UPLOAD_ERROR(40039, "Error during plugin uploading: '{}'"), + + /** + * Error during the plugin removing + */ + PLUGIN_REMOVE_ERROR(40040, "Error during plugin removing: '{}'"), + + /** + * Unable to save child item for a retry + */ + UNABLE_TO_SAVE_CHILD_ITEM_FOR_THE_RETRY(40041, + "Item with id = '{}' is a retry and can not have children"), + + /** + * Pattern analysis error + */ + PATTERN_ANALYSIS_ERROR(40042, "Pattern analysis error. {}"), + + /** + * Bad save user filter request + */ + PROJECT_DOESNT_CONTAIN_USER(4220, "Project '{}' doesn't contain user '{}'"), + + /** + * Base ReportPortal Exception. Try to avoid this type and create more custom + */ + UNCLASSIFIED_REPORT_PORTAL_ERROR(5001, "Unclassified Report Portal Error"), + + /** + * Incorrect update preference request + */ + BAD_UPDATE_PREFERENCE_REQUEST(40032, "Incorrect update widget request {}"), + + /** + * Unsupported merge strategy type + */ + UNSUPPORTED_MERGE_STRATEGY_TYPE(40033, "Merge Strategy type {} is unsupported"), + + /** + * Unable to recognize provided authentication type + */ + DEMO_DATA_GENERATION_ERROR(40034, "Demo Data Generation error: {}"), + + /** + * Use it If there are no any other exceptions. There should by no such exception + */ + UNCLASSIFIED_ERROR(5000, "Unclassified error"); + + private final int code; + + private final String description; + + ErrorType(int code, String description) { + this.code = code; + this.description = description; + } + + public int getCode() { + return code; + } + + public String getDescription() { + return description; + } + + /** + * Get instance by code + * + * @param code Error Code + * @return ErrorType + */ + public static ErrorType getByCode(int code) { + for (ErrorType error : values()) { + if (error.getCode() == code) { + return error; + } + } + throw new IllegalArgumentException("Unable to find Error with code '" + code + "'"); + } +} diff --git a/src/main/java/com/epam/reportportal/exception/ReportPortalException.java b/src/main/java/com/epam/reportportal/exception/ReportPortalException.java index ac73875e..38c32b99 100644 --- a/src/main/java/com/epam/reportportal/exception/ReportPortalException.java +++ b/src/main/java/com/epam/reportportal/exception/ReportPortalException.java @@ -15,8 +15,6 @@ */ 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 6ff5266f..f6d69b77 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.model.attribute.ItemAttributesRQ; -import com.epam.ta.reportportal.ws.model.launch.Mode; +import com.epam.ta.reportportal.ws.reporting.ItemAttributesRQ; +import com.epam.ta.reportportal.ws.reporting.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 aefd51a6..d0bc084d 100644 --- a/src/main/java/com/epam/reportportal/service/Launch.java +++ b/src/main/java/com/epam/reportportal/service/Launch.java @@ -18,11 +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.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 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 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 600713b4..a93720f9 100644 --- a/src/main/java/com/epam/reportportal/service/LaunchImpl.java +++ b/src/main/java/com/epam/reportportal/service/LaunchImpl.java @@ -22,11 +22,7 @@ import com.epam.reportportal.service.statistics.StatisticsService; import com.epam.reportportal.utils.RetryWithDelay; import com.epam.reportportal.utils.properties.DefaultProperties; -import com.epam.ta.reportportal.ws.model.*; -import com.epam.ta.reportportal.ws.model.attribute.ItemAttributesRQ; -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.reporting.*; 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 a3d09856..a69c0331 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.model.BatchSaveOperatingRS; -import com.epam.ta.reportportal.ws.model.log.SaveLogRQ; +import com.epam.ta.reportportal.ws.reporting.BatchSaveOperatingRS; +import com.epam.ta.reportportal.ws.reporting.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 7d5854a6..d0a49508 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.model.BatchSaveOperatingRS; -import com.epam.ta.reportportal.ws.model.log.SaveLogRQ; +import com.epam.ta.reportportal.ws.reporting.BatchSaveOperatingRS; +import com.epam.ta.reportportal.ws.reporting.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 684d736e..b9fef716 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.model.launch.StartLaunchRQ; -import com.epam.ta.reportportal.ws.model.log.SaveLogRQ; +import com.epam.ta.reportportal.ws.reporting.StartLaunchRQ; +import com.epam.ta.reportportal.ws.reporting.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 69c8d3bf..12f67d6c 100644 --- a/src/main/java/com/epam/reportportal/service/ReportPortalClient.java +++ b/src/main/java/com/epam/reportportal/service/ReportPortalClient.java @@ -15,11 +15,7 @@ */ package com.epam.reportportal.service; -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 com.epam.ta.reportportal.ws.reporting.*; 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 c7d260f3..4129772b 100644 --- a/src/main/java/com/epam/reportportal/service/ReportPortalClientV2.java +++ b/src/main/java/com/epam/reportportal/service/ReportPortalClientV2.java @@ -15,18 +15,27 @@ */ package com.epam.reportportal.service; -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 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 io.reactivex.Maybe; -import okhttp3.MultipartBody; -import retrofit2.http.*; - 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; 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 e8dad718..438e2439 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.model.launch.StartLaunchRQ; +import com.epam.ta.reportportal.ws.reporting.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 b6f535b1..6054e80f 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.model.FinishExecutionRQ; -import com.epam.ta.reportportal.ws.model.launch.StartLaunchRQ; +import com.epam.ta.reportportal.ws.reporting.FinishExecutionRQ; +import com.epam.ta.reportportal.ws.reporting.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 ea213e9f..05112057 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.model.FinishExecutionRQ; -import com.epam.ta.reportportal.ws.model.launch.LaunchResource; +import com.epam.ta.reportportal.ws.reporting.FinishExecutionRQ; +import com.epam.ta.reportportal.ws.reporting.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 861b7da5..7d659732 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.model.EntryCreatedAsyncRS; -import com.epam.ta.reportportal.ws.model.OperationCompletionRS; +import com.epam.ta.reportportal.ws.reporting.EntryCreatedAsyncRS; +import com.epam.ta.reportportal.ws.reporting.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 969aa54b..992ffae0 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.model.log.SaveLogRQ; +import com.epam.ta.reportportal.ws.reporting.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 5d663643..c0f3d1a1 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.model.BatchSaveOperatingRS; +import com.epam.ta.reportportal.ws.reporting.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 40d49387..7c82a5d7 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.model.attribute.ItemAttributeResource; -import com.epam.ta.reportportal.ws.model.launch.StartLaunchRQ; +import com.epam.ta.reportportal.ws.reporting.ItemAttributeResource; +import com.epam.ta.reportportal.ws.reporting.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 d9cba68e..12d2ba73 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.model.FinishTestItemRQ; -import com.epam.ta.reportportal.ws.model.StartTestItemRQ; -import com.epam.ta.reportportal.ws.model.log.SaveLogRQ; +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 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 b1e4ef0d..98f5292c 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.model.FinishTestItemRQ; -import com.epam.ta.reportportal.ws.model.StartTestItemRQ; +import com.epam.ta.reportportal.ws.reporting.FinishTestItemRQ; +import com.epam.ta.reportportal.ws.reporting.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 e4fa25ae..5bb5203d 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.model.FinishTestItemRQ; -import com.epam.ta.reportportal.ws.model.StartTestItemRQ; +import com.epam.ta.reportportal.ws.reporting.FinishTestItemRQ; +import com.epam.ta.reportportal.ws.reporting.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 774da6e1..877b8e77 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.model.*; -import com.epam.ta.reportportal.ws.model.log.SaveLogRQ; +import com.epam.ta.reportportal.ws.reporting.*; +import com.epam.ta.reportportal.ws.reporting.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 25fbcda3..ffbf3f3a 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.model.OperationCompletionRS; +import com.epam.ta.reportportal.ws.reporting.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 cb0e0637..b342de10 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.model.attribute.ItemAttributesRQ; +import com.epam.ta.reportportal.ws.reporting.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 544f9dd3..205cb7d9 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.model.ParameterResource; +import com.epam.ta.reportportal.ws.reporting.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 069f9f61..9172b27b 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.model.Constants; -import com.epam.ta.reportportal.ws.model.log.SaveLogRQ; +import com.epam.ta.reportportal.ws.reporting.Constants; +import com.epam.ta.reportportal.ws.reporting.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/PropertyHolder.java b/src/main/java/com/epam/reportportal/utils/properties/PropertyHolder.java index 719268bb..e8b5b8f9 100644 --- a/src/main/java/com/epam/reportportal/utils/properties/PropertyHolder.java +++ b/src/main/java/com/epam/reportportal/utils/properties/PropertyHolder.java @@ -18,7 +18,7 @@ /** * Interface for containers with meta information that should be sent to the ReportPortal instance via - * {@link com.epam.ta.reportportal.ws.model.attribute.ItemAttributesRQ} using {@link SystemAttributesExtractor} + * {@link com.epam.ta.reportportal.ws.reporting.ItemAttributesRQ} using {@link SystemAttributesExtractor} * * @author Ivan Budayeu */ 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 4ab0d6dc..99ea2236 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.model.attribute.ItemAttributesRQ; +import com.epam.ta.reportportal.ws.reporting.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 b4d0d160..2692f8b6 100644 --- a/src/test/java/com/epam/reportportal/aspect/StepAspectCommon.java +++ b/src/test/java/com/epam/reportportal/aspect/StepAspectCommon.java @@ -21,8 +21,7 @@ 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.model.*; -import com.epam.ta.reportportal.ws.model.item.ItemCreatedRS; +import com.epam.ta.reportportal.ws.reporting.*; 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 b8d60ecb..1480a16c 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.model.FinishTestItemRQ; +import com.epam.ta.reportportal.ws.reporting.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 88528c88..aea0a506 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.model.StartTestItemRQ; +import com.epam.ta.reportportal.ws.reporting.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 b9896313..51294fbd 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.model.launch.Mode.DEBUG; -import static com.epam.ta.reportportal.ws.model.launch.Mode.DEFAULT; +import static com.epam.ta.reportportal.ws.reporting.Mode.DEBUG; +import static com.epam.ta.reportportal.ws.reporting.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 24315372..957dd8a0 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.model.StartTestItemRQ; +import com.epam.ta.reportportal.ws.reporting.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 809f6dbd..2cfaba58 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.model.OperationCompletionRS; +import com.epam.ta.reportportal.ws.reporting.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 b20641d5..fc08b53a 100644 --- a/src/test/java/com/epam/reportportal/service/LaunchTest.java +++ b/src/test/java/com/epam/reportportal/service/LaunchTest.java @@ -19,6 +19,8 @@ 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; @@ -26,9 +28,12 @@ import com.epam.reportportal.service.step.StepReporter; import com.epam.reportportal.utils.ObjectUtils; import com.epam.reportportal.utils.properties.DefaultProperties; -import com.epam.ta.reportportal.ws.model.*; -import com.epam.ta.reportportal.ws.model.attribute.ItemAttributesRQ; -import com.epam.ta.reportportal.ws.model.launch.StartLaunchRQ; +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 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 ef0431bd..e2e2baff 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.model.BatchSaveOperatingRS; -import com.epam.ta.reportportal.ws.model.log.SaveLogRQ; +import com.epam.ta.reportportal.ws.reporting.BatchSaveOperatingRS; +import com.epam.ta.reportportal.ws.reporting.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 e3e7d3e9..60895cd5 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.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 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 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 e232eda0..5d969d02 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.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 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 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 1acb8c32..af9bcbc6 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.model.attribute.ItemAttributesRQ; -import com.epam.ta.reportportal.ws.model.launch.StartLaunchRQ; +import com.epam.ta.reportportal.ws.reporting.ItemAttributesRQ; +import com.epam.ta.reportportal.ws.reporting.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 4476dd59..6c19eff7 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.model.BatchSaveOperatingRS; -import com.epam.ta.reportportal.ws.model.item.ItemCreatedRS; -import com.epam.ta.reportportal.ws.model.log.SaveLogRQ; +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 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 3911a0f2..4d4ea6bb 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.model.FinishTestItemRQ; -import com.epam.ta.reportportal.ws.model.StartTestItemRQ; +import com.epam.ta.reportportal.ws.reporting.FinishTestItemRQ; +import com.epam.ta.reportportal.ws.reporting.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 7276e5e9..cda3f6b5 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.model.StartTestItemRQ; +import com.epam.ta.reportportal.ws.reporting.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 e89f9232..16db4272 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.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 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 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 e0d97683..382d4e71 100644 --- a/src/test/java/com/epam/reportportal/test/TestUtils.java +++ b/src/test/java/com/epam/reportportal/test/TestUtils.java @@ -19,11 +19,10 @@ 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.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.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.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 ecc0532a..fc91c31a 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.model.attribute.ItemAttributesRQ; +import com.epam.ta.reportportal.ws.reporting.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 ef1523f2..3f417d16 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.model.ParameterResource; +import com.epam.ta.reportportal.ws.reporting.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 ff9afd67..219ffa90 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.model.attribute.ItemAttributesRQ; +import com.epam.ta.reportportal.ws.reporting.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 cefc3b0f..371b9189 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.model.attribute.ItemAttributesRQ; +import com.epam.ta.reportportal.ws.reporting.ItemAttributesRQ; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test;