From 154c9f1afa20954fc8a906fbefc17aa8fbb5d6dc Mon Sep 17 00:00:00 2001
From: Ivan Kustau <86599591+IvanKustau@users.noreply.github.com>
Date: Mon, 18 Dec 2023 11:13:11 +0300
Subject: [PATCH 01/24] EPMRPP-86916 || Remove default user photo creation
 (#1900)

---
 .../AttachDefaultPhotoEventHandler.java        |   2 --
 src/main/resources/image/defaultUserPhoto.jpg  | Bin 245005 -> 0 bytes
 2 files changed, 2 deletions(-)
 delete mode 100644 src/main/resources/image/defaultUserPhoto.jpg

diff --git a/src/main/java/com/epam/ta/reportportal/core/events/handler/AttachDefaultPhotoEventHandler.java b/src/main/java/com/epam/ta/reportportal/core/events/handler/AttachDefaultPhotoEventHandler.java
index d771363a12..b9bfd0e0a2 100644
--- a/src/main/java/com/epam/ta/reportportal/core/events/handler/AttachDefaultPhotoEventHandler.java
+++ b/src/main/java/com/epam/ta/reportportal/core/events/handler/AttachDefaultPhotoEventHandler.java
@@ -58,8 +58,6 @@ public AttachDefaultPhotoEventHandler(UserRepository userRepository,
   public void handleContextRefresh(ContextRefreshedEvent event) {
     userRepository.findByLogin("superadmin")
         .ifPresent(it -> attachPhoto(it, "image/superAdminPhoto.jpg"));
-    userRepository.findByLogin("default")
-        .ifPresent(it -> attachPhoto(it, "image/defaultUserPhoto.jpg"));
   }
 
   private void attachPhoto(User user, String photoPath) {
diff --git a/src/main/resources/image/defaultUserPhoto.jpg b/src/main/resources/image/defaultUserPhoto.jpg
deleted file mode 100644
index eae64e3087d09445ad0af91ef5bbc780d9abfe07..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 245005
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%0Am;=u+0!I!&
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
UqHXPRd;kCd07*qoM6N<$f(5kcN&o-=


From e7a6e4e5b98712c3f1af5ae307428b73a8522d5c Mon Sep 17 00:00:00 2001
From: Ivan_Kustau <Ivan_Kustau@epam.com>
Date: Thu, 21 Dec 2023 16:52:33 +0300
Subject: [PATCH 02/24] EPMRPP-88831 || Add support of timestamp attribute in
 test cases and update logic for counting start and end time of step

---
 .../imprt/impl/junit/XunitImportHandler.java  | 484 +++++++++---------
 .../impl/junit/XunitImportHandlerTest.java    |   1 +
 2 files changed, 249 insertions(+), 236 deletions(-)

diff --git a/src/main/java/com/epam/ta/reportportal/core/imprt/impl/junit/XunitImportHandler.java b/src/main/java/com/epam/ta/reportportal/core/imprt/impl/junit/XunitImportHandler.java
index 935263f9bd..441878fd08 100644
--- a/src/main/java/com/epam/ta/reportportal/core/imprt/impl/junit/XunitImportHandler.java
+++ b/src/main/java/com/epam/ta/reportportal/core/imprt/impl/junit/XunitImportHandler.java
@@ -13,6 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package com.epam.ta.reportportal.core.imprt.impl.junit;
 
 import static com.epam.ta.reportportal.core.imprt.impl.DateUtils.toMillis;
@@ -57,168 +58,166 @@
 @Scope(ConfigurableBeanFactory.SCOPE_PROTOTYPE)
 public class XunitImportHandler extends DefaultHandler {
 
-	private static final Logger LOGGER = LoggerFactory.getLogger(XunitImportHandler.class);
-
-	private final StartTestItemHandler startTestItemHandler;
-
-	private final FinishTestItemHandler finishTestItemHandler;
-
-	private final CreateLogHandler createLogHandler;
-
-	private static final int MAX_LAUNCH_NAME_LENGTH = 256;
-
-	@Autowired
-	public XunitImportHandler(StartTestItemHandler startTestItemHandler, FinishTestItemHandler finishTestItemHandler,
-			CreateLogHandler createLogHandler) {
-		this.startTestItemHandler = startTestItemHandler;
-		this.finishTestItemHandler = finishTestItemHandler;
-		this.createLogHandler = createLogHandler;
-	}
-
-	//initial info
-	private ReportPortalUser.ProjectDetails projectDetails;
-	private ReportPortalUser user;
-	private String launchUuid;
-	private boolean isSkippedNotIssue = false;
-
-	//need to know item's id to attach System.out/System.err logs
-	private String currentItemUuid;
-
-	private LocalDateTime startSuiteTime;
-
-	private long commonDuration;
-	private long currentDuration;
-
-	//items structure ids
-	private Deque<String> itemUuids;
-	private StatusEnum status;
-	private StringBuilder message;
-	private LocalDateTime startItemTime;
-
-	@Override
-	public void startDocument() {
-		itemUuids = new ArrayDeque<>();
-		message = new StringBuilder();
-		startSuiteTime = LocalDateTime.now();
-	}
-
-	@Override
-	public void endDocument() {
-	}
-
-	@Override
-	public void startElement(String uri, String localName, String qName, Attributes attributes) {
-		switch (XunitReportTag.fromString(qName)) {
-			case TESTSUITE:
-				if (itemUuids.isEmpty()) {
-					startRootItem(attributes.getValue(XunitReportTag.ATTR_NAME.getValue()),
-							attributes.getValue(XunitReportTag.TIMESTAMP.getValue())
-					);
-				} else {
-					startTestItem(attributes.getValue(XunitReportTag.ATTR_NAME.getValue()));
-				}
-				break;
-			case TESTCASE:
-				startStepItem(attributes.getValue(XunitReportTag.ATTR_NAME.getValue()),
-						attributes.getValue(XunitReportTag.START_TIME.getValue()),
-						attributes.getValue(XunitReportTag.ATTR_TIME.getValue())
-				);
-				break;
-			case ERROR:
-			case FAILURE:
-				message = new StringBuilder();
-				status = StatusEnum.FAILED;
-				break;
-			case SKIPPED:
-				message = new StringBuilder();
-				status = StatusEnum.SKIPPED;
-				break;
-			case SYSTEM_OUT:
-			case SYSTEM_ERR:
-			case WARNING:
-				message = new StringBuilder();
-				break;
-			case UNKNOWN:
-			default:
-				LOGGER.warn("Unknown tag: {}", qName);
-				break;
-		}
-	}
-
-	@Override
-	public void endElement(String uri, String localName, String qName) {
-		switch (XunitReportTag.fromString(qName)) {
-			case TESTSUITE:
-				finishRootItem();
-				break;
-			case TESTCASE:
-				finishTestItem();
-				break;
-			case SKIPPED:
-			case ERROR:
-			case FAILURE:
-			case SYSTEM_ERR:
-				attachLog(LogLevel.ERROR);
-				break;
-			case SYSTEM_OUT:
-				attachLog(LogLevel.INFO);
-				break;
-			case WARNING:
-				attachLog(LogLevel.WARN);
-				break;
-			case UNKNOWN:
-			default:
-				LOGGER.warn("Unknown tag: {}", qName);
-				break;
-		}
-	}
-
-	@Override
-	public void characters(char[] ch, int start, int length) {
-		String msg = new String(ch, start, length);
-		if (!msg.isEmpty()) {
-			message.append(msg);
-		}
-	}
-
-	private void startRootItem(String name, String timestamp) {
-		if (null != timestamp) {
-			startItemTime = parseTimeStamp(timestamp);
-			if (startSuiteTime.isAfter(startItemTime)) {
-				startSuiteTime = LocalDateTime.of(startItemTime.toLocalDate(), startItemTime.toLocalTime());
-			}
-		} else {
-			startItemTime = LocalDateTime.now();
-		}
-		StartTestItemRQ rq = buildStartTestRq(name);
-		String id = startTestItemHandler.startRootItem(user, projectDetails, rq).getId();
-		itemUuids.push(id);
-	}
+  private static final Logger LOGGER = LoggerFactory.getLogger(XunitImportHandler.class);
+
+  private final StartTestItemHandler startTestItemHandler;
+
+  private final FinishTestItemHandler finishTestItemHandler;
+
+  private final CreateLogHandler createLogHandler;
+
+  private static final int MAX_LAUNCH_NAME_LENGTH = 256;
+
+  @Autowired
+  public XunitImportHandler(StartTestItemHandler startTestItemHandler,
+      FinishTestItemHandler finishTestItemHandler, CreateLogHandler createLogHandler) {
+    this.startTestItemHandler = startTestItemHandler;
+    this.finishTestItemHandler = finishTestItemHandler;
+    this.createLogHandler = createLogHandler;
+  }
+
+  //initial info
+  private ReportPortalUser.ProjectDetails projectDetails;
+  private ReportPortalUser user;
+  private String launchUuid;
+  private boolean isSkippedNotIssue = false;
+
+  //need to know item's id to attach System.out/System.err logs
+  private String currentItemUuid;
+
+  private LocalDateTime startSuiteTime;
+
+  private long commonDuration;
+  private long currentDuration;
+
+  private long currentSuiteDuration;
+
+  //items structure ids
+  private Deque<String> itemUuids;
+  private StatusEnum status;
+  private StringBuilder message;
+  private LocalDateTime startItemTime;
+
+  @Override
+  public void startDocument() {
+    itemUuids = new ArrayDeque<>();
+    message = new StringBuilder();
+    startSuiteTime = LocalDateTime.now();
+  }
+
+  @Override
+  public void endDocument() {
+  }
+
+  @Override
+  public void startElement(String uri, String localName, String qName, Attributes attributes) {
+    switch (XunitReportTag.fromString(qName)) {
+      case TESTSUITE:
+        if (itemUuids.isEmpty()) {
+          startRootItem(attributes.getValue(XunitReportTag.ATTR_NAME.getValue()),
+              attributes.getValue(XunitReportTag.TIMESTAMP.getValue()),
+              attributes.getValue(XunitReportTag.ATTR_TIME.getValue())
+          );
+        } else {
+          startTestItem(attributes.getValue(XunitReportTag.ATTR_NAME.getValue()));
+        }
+        break;
+      case TESTCASE:
+        startStepItem(attributes.getValue(XunitReportTag.ATTR_NAME.getValue()),
+            attributes.getValue(XunitReportTag.START_TIME.getValue()),
+            attributes.getValue(XunitReportTag.TIMESTAMP.getValue()),
+            attributes.getValue(XunitReportTag.ATTR_TIME.getValue())
+        );
+        break;
+      case ERROR:
+      case FAILURE:
+        message = new StringBuilder();
+        status = StatusEnum.FAILED;
+        break;
+      case SKIPPED:
+        message = new StringBuilder();
+        status = StatusEnum.SKIPPED;
+        break;
+      case SYSTEM_OUT:
+      case SYSTEM_ERR:
+      case WARNING:
+        message = new StringBuilder();
+        break;
+      case UNKNOWN:
+      default:
+        LOGGER.warn("Unknown tag: {}", qName);
+        break;
+    }
+  }
+
+  @Override
+  public void endElement(String uri, String localName, String qName) {
+    switch (XunitReportTag.fromString(qName)) {
+      case TESTSUITE:
+        finishRootItem();
+        break;
+      case TESTCASE:
+        finishTestItem();
+        break;
+      case SKIPPED:
+      case ERROR:
+      case FAILURE:
+      case SYSTEM_ERR:
+        attachLog(LogLevel.ERROR);
+        break;
+      case SYSTEM_OUT:
+        attachLog(LogLevel.INFO);
+        break;
+      case WARNING:
+        attachLog(LogLevel.WARN);
+        break;
+      case UNKNOWN:
+      default:
+        LOGGER.warn("Unknown tag: {}", qName);
+        break;
+    }
+  }
+
+  @Override
+  public void characters(char[] ch, int start, int length) {
+    String msg = new String(ch, start, length);
+    if (!msg.isEmpty()) {
+      message.append(msg);
+    }
+  }
+
+  private void startRootItem(String name, String timestamp, String duration) {
+    if (null != timestamp) {
+      startItemTime = parseTimeStamp(timestamp);
+      if (startSuiteTime.isAfter(startItemTime)) {
+        startSuiteTime = LocalDateTime.of(startItemTime.toLocalDate(), startItemTime.toLocalTime());
+      }
+    } else {
+      startItemTime = LocalDateTime.now();
+      startSuiteTime = LocalDateTime.now();
+    }
+    currentSuiteDuration = toMillis(duration);
+    StartTestItemRQ rq = buildStartTestRq(name);
+    String id = startTestItemHandler.startRootItem(user, projectDetails, rq).getId();
+    itemUuids.push(id);
+  }
 
   private LocalDateTime parseTimeStamp(String timestamp) {
     // try to parse datetime as Long, otherwise parse as timestamp
     try {
-      return LocalDateTime.ofInstant(Instant.ofEpochMilli(Long.parseLong(timestamp)), ZoneOffset.UTC);
+      return LocalDateTime.ofInstant(
+          Instant.ofEpochMilli(Long.parseLong(timestamp)), ZoneOffset.UTC);
     } catch (NumberFormatException ignored) {
-      DateTimeFormatter formatter = new DateTimeFormatterBuilder()
-          .appendOptional(DateTimeFormatter.RFC_1123_DATE_TIME)
-          .appendOptional(DateTimeFormatter.ISO_OFFSET_DATE_TIME)
-          .appendOptional(DateTimeFormatter.ISO_LOCAL_DATE_TIME)
-          .optionalStart()
-            .appendOffsetId()
-            .appendZoneId()
-          .optionalEnd()
-          .optionalStart()
-            .appendLiteral(' ')
-            .parseCaseSensitive()
-            .appendZoneId()
-          .optionalEnd()
-          .toFormatter();
+      DateTimeFormatter formatter =
+          new DateTimeFormatterBuilder().appendOptional(DateTimeFormatter.RFC_1123_DATE_TIME)
+              .appendOptional(DateTimeFormatter.ISO_OFFSET_DATE_TIME)
+              .appendOptional(DateTimeFormatter.ISO_LOCAL_DATE_TIME).optionalStart()
+              .appendOffsetId().appendZoneId().optionalEnd().optionalStart().appendLiteral(' ')
+              .parseCaseSensitive().appendZoneId().optionalEnd().toFormatter();
 
       TemporalAccessor temporalAccessor = formatter.parse(timestamp);
       if (isParsedTimeStampHasOffset(temporalAccessor)) {
-        return ZonedDateTime.from(temporalAccessor)
-            .withZoneSameInstant(ZoneOffset.UTC)
+        return ZonedDateTime.from(temporalAccessor).withZoneSameInstant(ZoneOffset.UTC)
             .toLocalDateTime();
       } else {
         return LocalDateTime.from(temporalAccessor);
@@ -227,88 +226,101 @@ private LocalDateTime parseTimeStamp(String timestamp) {
 
   }
 
-	private void startTestItem(String name) {
-		StartTestItemRQ rq = buildStartTestRq(name);
-		String id = startTestItemHandler.startChildItem(user, projectDetails, rq, itemUuids.peek()).getId();
-		itemUuids.push(id);
-	}
-
-	private void startStepItem(String name, String startTime, String duration) {
-		StartTestItemRQ rq = new StartTestItemRQ();
-		rq.setLaunchUuid(launchUuid);
-		rq.setStartTime(EntityUtils.TO_DATE.apply(startTime != null ? parseTimeStamp(startTime) : startItemTime));
-		rq.setType(TestItemTypeEnum.STEP.name());
-		rq.setName(StringUtils.abbreviate(name, MAX_LAUNCH_NAME_LENGTH));
-		String id = startTestItemHandler.startChildItem(user, projectDetails, rq, itemUuids.peek()).getId();
-		currentDuration = toMillis(duration);
-		currentItemUuid = id;
-		itemUuids.push(id);
-	}
-
-	private void finishRootItem() {
-		FinishTestItemRQ rq = new FinishTestItemRQ();
-		markAsNotIssue(rq);
-		rq.setEndTime(EntityUtils.TO_DATE.apply(startItemTime));
-		finishTestItemHandler.finishTestItem(user, projectDetails, itemUuids.poll(), rq);
-		status = null;
-	}
-
-	private void finishTestItem() {
-		FinishTestItemRQ rq = new FinishTestItemRQ();
-		markAsNotIssue(rq);
-		startItemTime = startItemTime.plus(currentDuration, ChronoUnit.MILLIS);
-		commonDuration += currentDuration;
-		rq.setEndTime(EntityUtils.TO_DATE.apply(startItemTime));
-		rq.setStatus(Optional.ofNullable(status).orElse(StatusEnum.PASSED).name());
-		currentItemUuid = itemUuids.poll();
-		finishTestItemHandler.finishTestItem(user, projectDetails, currentItemUuid, rq);
-		status = null;
-	}
-
-	private void markAsNotIssue(FinishTestItemRQ rq) {
-		if (StatusEnum.SKIPPED.equals(status) && isSkippedNotIssue) {
-			Issue issue = new Issue();
-			issue.setIssueType(NOT_ISSUE_FLAG.getValue());
-			rq.setIssue(issue);
-		}
-	}
-
-	private void attachLog(LogLevel logLevel) {
-		if (null != message && message.length() != 0) {
-			SaveLogRQ saveLogRQ = new SaveLogRQ();
-			saveLogRQ.setLevel(logLevel.name());
-			saveLogRQ.setLogTime(EntityUtils.TO_DATE.apply(startItemTime));
-			saveLogRQ.setMessage(message.toString().trim());
-			saveLogRQ.setItemUuid(currentItemUuid);
-			createLogHandler.createLog(saveLogRQ, null, projectDetails);
-		}
-	}
-
-	XunitImportHandler withParameters(ReportPortalUser.ProjectDetails projectDetails, String launchId,
-			ReportPortalUser user, boolean isSkippedNotIssue) {
-		this.projectDetails = projectDetails;
-		this.launchUuid = launchId;
-		this.user = user;
-		this.isSkippedNotIssue = isSkippedNotIssue;
-		return this;
-	}
-
-	private StartTestItemRQ buildStartTestRq(String name) {
-		StartTestItemRQ rq = new StartTestItemRQ();
-		rq.setLaunchUuid(launchUuid);
-		rq.setStartTime(EntityUtils.TO_DATE.apply(startItemTime));
-		rq.setType(TestItemTypeEnum.TEST.name());
-		rq.setName(Strings.isNullOrEmpty(name) ? "no_name" : name);
-		return rq;
-	}
-
-	LocalDateTime getStartSuiteTime() {
-		return startSuiteTime;
-	}
-
-	long getCommonDuration() {
-		return commonDuration;
-	}
+  private void startTestItem(String name) {
+    StartTestItemRQ rq = buildStartTestRq(name);
+    String id =
+        startTestItemHandler.startChildItem(user, projectDetails, rq, itemUuids.peek()).getId();
+    itemUuids.push(id);
+  }
+
+  private void startStepItem(String name, String startTime, String timestamp, String duration) {
+    StartTestItemRQ rq = new StartTestItemRQ();
+    rq.setLaunchUuid(launchUuid);
+    rq.setType(TestItemTypeEnum.STEP.name());
+    rq.setName(StringUtils.abbreviate(name, MAX_LAUNCH_NAME_LENGTH));
+
+    if (null != timestamp) {
+      startItemTime = parseTimeStamp(timestamp);
+    } else if (null != startTime) {
+      startItemTime = parseTimeStamp(startTime);
+    } else {
+      startItemTime = startSuiteTime;
+    }
+
+    rq.setStartTime(EntityUtils.TO_DATE.apply(startItemTime));
+
+    String id =
+        startTestItemHandler.startChildItem(user, projectDetails, rq, itemUuids.peek()).getId();
+    currentDuration = toMillis(duration);
+    currentItemUuid = id;
+    itemUuids.push(id);
+  }
+
+  private void finishRootItem() {
+    FinishTestItemRQ rq = new FinishTestItemRQ();
+    markAsNotIssue(rq);
+    rq.setEndTime(
+        EntityUtils.TO_DATE.apply(startSuiteTime.plus(currentSuiteDuration, ChronoUnit.MILLIS)));
+    finishTestItemHandler.finishTestItem(user, projectDetails, itemUuids.poll(), rq);
+    status = null;
+  }
+
+  private void finishTestItem() {
+    FinishTestItemRQ rq = new FinishTestItemRQ();
+    markAsNotIssue(rq);
+    LocalDateTime endTime = startItemTime.plus(currentDuration, ChronoUnit.MILLIS);
+    commonDuration += currentDuration;
+    rq.setEndTime(EntityUtils.TO_DATE.apply(endTime));
+    rq.setStatus(Optional.ofNullable(status).orElse(StatusEnum.PASSED).name());
+    currentItemUuid = itemUuids.poll();
+    finishTestItemHandler.finishTestItem(user, projectDetails, currentItemUuid, rq);
+    status = null;
+  }
+
+  private void markAsNotIssue(FinishTestItemRQ rq) {
+    if (StatusEnum.SKIPPED.equals(status) && isSkippedNotIssue) {
+      Issue issue = new Issue();
+      issue.setIssueType(NOT_ISSUE_FLAG.getValue());
+      rq.setIssue(issue);
+    }
+  }
+
+  private void attachLog(LogLevel logLevel) {
+    if (null != message && message.length() != 0) {
+      SaveLogRQ saveLogRQ = new SaveLogRQ();
+      saveLogRQ.setLevel(logLevel.name());
+      saveLogRQ.setLogTime(EntityUtils.TO_DATE.apply(startItemTime));
+      saveLogRQ.setMessage(message.toString().trim());
+      saveLogRQ.setItemUuid(currentItemUuid);
+      createLogHandler.createLog(saveLogRQ, null, projectDetails);
+    }
+  }
+
+  XunitImportHandler withParameters(ReportPortalUser.ProjectDetails projectDetails, String launchId,
+      ReportPortalUser user, boolean isSkippedNotIssue) {
+    this.projectDetails = projectDetails;
+    this.launchUuid = launchId;
+    this.user = user;
+    this.isSkippedNotIssue = isSkippedNotIssue;
+    return this;
+  }
+
+  private StartTestItemRQ buildStartTestRq(String name) {
+    StartTestItemRQ rq = new StartTestItemRQ();
+    rq.setLaunchUuid(launchUuid);
+    rq.setStartTime(EntityUtils.TO_DATE.apply(startItemTime));
+    rq.setType(TestItemTypeEnum.TEST.name());
+    rq.setName(Strings.isNullOrEmpty(name) ? "no_name" : name);
+    return rq;
+  }
+
+  LocalDateTime getStartSuiteTime() {
+    return startSuiteTime;
+  }
+
+  long getCommonDuration() {
+    return commonDuration;
+  }
 
   private boolean isParsedTimeStampHasOffset(TemporalAccessor temporalAccessor) {
     return temporalAccessor.query(TemporalQueries.offset()) != null;
diff --git a/src/test/java/com/epam/ta/reportportal/core/imprt/impl/junit/XunitImportHandlerTest.java b/src/test/java/com/epam/ta/reportportal/core/imprt/impl/junit/XunitImportHandlerTest.java
index 8434eef739..522fc7eefd 100644
--- a/src/test/java/com/epam/ta/reportportal/core/imprt/impl/junit/XunitImportHandlerTest.java
+++ b/src/test/java/com/epam/ta/reportportal/core/imprt/impl/junit/XunitImportHandlerTest.java
@@ -212,6 +212,7 @@ public void whenStartElement_andQnameIsTestCase_thenStartStepItem() {
     Attributes attributes = mock(Attributes.class);
     when(attributes.getValue(XunitReportTag.ATTR_NAME.getValue())).thenReturn(ATTR_NAME);
     when(attributes.getValue(XunitReportTag.START_TIME.getValue())).thenReturn(TIMESTAMP);
+    when(attributes.getValue(XunitReportTag.TIMESTAMP.getValue())).thenReturn(TIMESTAMP);
     when(attributes.getValue(XunitReportTag.ATTR_TIME.getValue())).thenReturn(DURATION);
 
     LocalDateTime startItemTime =

From 8ef46a4befb3f53508483aa5a2fb6a0a5ca7f7fb Mon Sep 17 00:00:00 2001
From: Andrei Piankouski <andrei_piankouski@epam.com>
Date: Fri, 22 Dec 2023 16:04:35 +0300
Subject: [PATCH 03/24] EPMRPP-88838 || Some items of launch are not analyzed
 by AA

---
 build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.gradle b/build.gradle
index 1c5c6f0f4d..8b46d1f44e 100644
--- a/build.gradle
+++ b/build.gradle
@@ -73,7 +73,7 @@ dependencies {
         implementation 'com.epam.reportportal:plugin-api'
     } else {
         implementation 'com.github.reportportal:commons-events:e337f8b7be'
-        implementation 'com.github.reportportal:commons-dao:516ace3'
+        implementation 'com.github.reportportal:commons-dao:9941604'
         implementation 'com.github.reportportal:commons-rules:01ec4d17'
         implementation 'com.github.reportportal:commons-model:3251388'
         implementation 'com.github.reportportal:commons:07566b8e'

From 98f75e2cb7e57a54b0113a99d6fdb4809a39d36c Mon Sep 17 00:00:00 2001
From: APiankouski <109206864+APiankouski@users.noreply.github.com>
Date: Wed, 27 Dec 2023 16:14:52 +0300
Subject: [PATCH 04/24] EPMRPP-88915 || Pattern Analysis of REGEX type doesn't
 work (#1906)

---
 .../core/log/ElasticLogService.java           | 19 +++++++------------
 1 file changed, 7 insertions(+), 12 deletions(-)

diff --git a/src/main/java/com/epam/ta/reportportal/core/log/ElasticLogService.java b/src/main/java/com/epam/ta/reportportal/core/log/ElasticLogService.java
index 734428e776..c836c6d521 100644
--- a/src/main/java/com/epam/ta/reportportal/core/log/ElasticLogService.java
+++ b/src/main/java/com/epam/ta/reportportal/core/log/ElasticLogService.java
@@ -217,32 +217,27 @@ public Optional<LogFull> findByUuid(String uuid) {
 
   @Override
   public List<Long> selectTestItemIdsByStringLogMessage(Collection<Long> itemIds, Integer logLevel,
-      String string) {
-    Long projectId = getProjectId(itemIds);
-    List<Long> logIdsPg = testItemRepository.selectLogIdsWithLogLevelCondition(itemIds, logLevel);
-
-    return elasticSearchClient.searchTestItemIdsByLogIdsAndString(projectId, logIdsPg, string);
+      String pattern) {
+    return testItemRepository.selectIdsByStringLogMessage(itemIds, logLevel, pattern);
   }
 
   @Override
   public List<Long> selectTestItemIdsUnderByStringLogMessage(Long launchId,
-      Collection<Long> itemIds, Integer logLevel, String string) {
-    return selectTestItemIdsUnderByLogMessage(launchId, itemIds, logLevel, string, false);
+      Collection<Long> itemIds, Integer logLevel, String pattern) {
+    return testItemRepository.selectIdsUnderByStringLogMessage(launchId, itemIds, logLevel,
+        pattern);
   }
 
   @Override
   public List<Long> selectTestItemIdsByRegexLogMessage(Collection<Long> itemIds, Integer logLevel,
       String pattern) {
-    Long projectId = getProjectId(itemIds);
-    List<Long> logIdsPg = testItemRepository.selectLogIdsWithLogLevelCondition(itemIds, logLevel);
-
-    return elasticSearchClient.searchTestItemIdsByLogIdsAndRegexp(projectId, logIdsPg, pattern);
+    return testItemRepository.selectIdsByRegexLogMessage(itemIds, logLevel, pattern);
   }
 
   @Override
   public List<Long> selectTestItemIdsUnderByRegexLogMessage(Long launchId, Collection<Long> itemIds,
       Integer logLevel, String pattern) {
-    return selectTestItemIdsUnderByLogMessage(launchId, itemIds, logLevel, pattern, true);
+    return testItemRepository.selectIdsUnderByRegexLogMessage(launchId, itemIds, logLevel, pattern);
   }
 
   // TODO : refactoring pattern analyzer and add projectId as parameter

From 01a10144d3d5af320783016194a04c19d099f7c9 Mon Sep 17 00:00:00 2001
From: APiankouski <109206864+APiankouski@users.noreply.github.com>
Date: Mon, 8 Jan 2024 13:46:02 +0300
Subject: [PATCH 05/24] EPMRPP-88977 || Update dao (#1909)

---
 build.gradle | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/build.gradle b/build.gradle
index 8b46d1f44e..e588aae805 100644
--- a/build.gradle
+++ b/build.gradle
@@ -73,8 +73,8 @@ dependencies {
         implementation 'com.epam.reportportal:plugin-api'
     } else {
         implementation 'com.github.reportportal:commons-events:e337f8b7be'
-        implementation 'com.github.reportportal:commons-dao:9941604'
-        implementation 'com.github.reportportal:commons-rules:01ec4d17'
+        implementation 'com.github.reportportal:commons-dao:e453860'
+        implementation 'com.github.reportportal:commons-rules:837ccf2'
         implementation 'com.github.reportportal:commons-model:3251388'
         implementation 'com.github.reportportal:commons:07566b8e'
         implementation 'com.github.reportportal:commons-fonts:d6e62dd'

From f5424fc6f0fa1e680c0b98fbd0e220f53aa9f48a Mon Sep 17 00:00:00 2001
From: Siarhei Hrabko <45555481+grabsefx@users.noreply.github.com>
Date: Mon, 15 Jan 2024 12:03:59 +0300
Subject: [PATCH 06/24] EPMRPP-82209 || filter skipped tests in
 HealthCheckTableView widget (#1911)

* EPMRPP-82209 exclude skipped tests from HealthCheckTableView
---
 build.gradle                                                  | 2 +-
 .../materialized/HealthCheckTableReadyContentLoader.java      | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/build.gradle b/build.gradle
index e588aae805..5b36efa062 100644
--- a/build.gradle
+++ b/build.gradle
@@ -73,7 +73,7 @@ dependencies {
         implementation 'com.epam.reportportal:plugin-api'
     } else {
         implementation 'com.github.reportportal:commons-events:e337f8b7be'
-        implementation 'com.github.reportportal:commons-dao:e453860'
+        implementation 'com.github.reportportal:commons-dao:cf4f3465d'
         implementation 'com.github.reportportal:commons-rules:837ccf2'
         implementation 'com.github.reportportal:commons-model:3251388'
         implementation 'com.github.reportportal:commons:07566b8e'
diff --git a/src/main/java/com/epam/ta/reportportal/core/widget/content/loader/materialized/HealthCheckTableReadyContentLoader.java b/src/main/java/com/epam/ta/reportportal/core/widget/content/loader/materialized/HealthCheckTableReadyContentLoader.java
index 8e68f5a94d..c33dec703a 100644
--- a/src/main/java/com/epam/ta/reportportal/core/widget/content/loader/materialized/HealthCheckTableReadyContentLoader.java
+++ b/src/main/java/com/epam/ta/reportportal/core/widget/content/loader/materialized/HealthCheckTableReadyContentLoader.java
@@ -47,6 +47,7 @@ public class HealthCheckTableReadyContentLoader implements MaterializedWidgetCon
 
   public static final String SORT = "sort";
   public static final String CUSTOM_COLUMN = "customColumn";
+  public static final String EXCLUDE_SKIPPED = "excludeSkipped";
 
   public static final String TOTAL = "total";
   public static final String STATISTICS = "statistics";
@@ -112,7 +113,8 @@ private HealthCheckTableGetParams getParams(WidgetOptions widgetOptions,
         currentLevelKey,
         resolveSort(widgetOptions),
         includeCustomColumn,
-        getLevelEntries(attributeKeys, attributeValues)
+        getLevelEntries(attributeKeys, attributeValues),
+        WidgetOptionUtil.getBooleanByKey(EXCLUDE_SKIPPED, widgetOptions)
     );
 
   }

From 334f41ca4eaa6bac50d636b3b64f1ed7faf4e995 Mon Sep 17 00:00:00 2001
From: Ivan Kustau <86599591+IvanKustau@users.noreply.github.com>
Date: Fri, 19 Jan 2024 11:54:49 +0300
Subject: [PATCH 07/24] EPMRPP-86916 || Update default user avatar (#1913)

* EPMRPP-86916 || Update default user avatar

* EPMRPP-86916 || Update bom definition

* EPMRPP-86916 || Update dao version

* EPMRPP-86916 || Update dao version

* EPMRPP-86916 || Update rules version

* EPMRPP-86916 || Update plugin api version

* EPMRPP-86916 || Add release mode check

* EPMRPP-86916 || Add libraries version

* EPMRPP-86916 || Add libraries version
---
 build.gradle                               |   8 ++++----
 src/main/resources/image/defaultAvatar.png | Bin 2573 -> 24932 bytes
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/build.gradle b/build.gradle
index 5b36efa062..ac101b5271 100644
--- a/build.gradle
+++ b/build.gradle
@@ -58,7 +58,7 @@ ext['spring-boot.version'] = '2.5.15'
 
 dependencyManagement {
     imports {
-        mavenBom(releaseMode ? 'com.epam.reportportal:commons-bom:' + '5.10.0' : 'com.github.reportportal:commons-bom:6aa55fc0')
+        mavenBom(releaseMode ? 'com.epam.reportportal:commons-bom:5.10.0' : 'com.epam.reportportal:commons-bom:5.10.0')
         mavenBom('io.zonky.test.postgres:embedded-postgres-binaries-bom:12.9.0')
     }
 }
@@ -73,12 +73,12 @@ dependencies {
         implementation 'com.epam.reportportal:plugin-api'
     } else {
         implementation 'com.github.reportportal:commons-events:e337f8b7be'
-        implementation 'com.github.reportportal:commons-dao:cf4f3465d'
-        implementation 'com.github.reportportal:commons-rules:837ccf2'
+        implementation 'com.github.reportportal:commons-dao:0a2a4276f9'
+        implementation 'com.github.reportportal:commons-rules:42d4dd5634'
         implementation 'com.github.reportportal:commons-model:3251388'
         implementation 'com.github.reportportal:commons:07566b8e'
         implementation 'com.github.reportportal:commons-fonts:d6e62dd'
-        implementation 'com.github.reportportal:plugin-api:55bf2f26'
+        implementation 'com.github.reportportal:plugin-api:0ccfed880c'
     }
 
     implementation 'org.springframework.boot:spring-boot-starter-aop'
diff --git a/src/main/resources/image/defaultAvatar.png b/src/main/resources/image/defaultAvatar.png
index b40402d891ff0619380d70d3ffc3b424d0ea4127..58ccf2b47c84da0f5dcd528cd368aabcb9bcd0fb 100644
GIT binary patch
literal 24932
zcmV)3K+C_0P)<h;3K|Lk000e1NJLTq008g+008g^1^@s6K2_<G003btNkl<ZcwX&&
ziFO?~k}UuK8{bTK+m>yu)J83~OuY+aMr1?+MakoZYPxU^PGQN6+=0566m|7K|N7zf
zfB*f%?f?Am_n*gjJpW&g$8+xeYs_mM^UFA&(Fbkknd_tzddLyX?OgPWdEnG|$|KJX
z>wnWOj#Ce{(`}g;NeAq{A8V?|T#LEt611?3_N{$jL6`FN#7I3%mgy2cPI}s7^01b3
zkt6n}F9q9V%G}0+TTk^X{iM19L-sVrd!Lo;$g}Js%Vn=Po=;7`<n8{ix$Py-%yIR5
zteZ~7U-gl?&>uxZ*@?k8p{E{KB!*JC8Huh6g(71eV02(t+#M(D+C>(P;2wFZ;M~Yu
z7vo7EwCd#2Lu~4@j`U2L)U_O#`j?z3YfYS(4}HZJvA1k0o>-$Txi{y6Pg$l%$@K1t
zL%mo8fdR}YWZ>@bM3?3pCfmQXFr?E4kG;pb@TPvkqlMS?(L#%7*@`ZH==MomY@Pd3
za63BY#Lz<yRXn99A8nzH4L|5DuY_h6um?6aP{1RQII+ePV*rZ+!tX|fA+ff10QuXx
z?pH!1=_;Ws_+BW*tNJ9yMvm$@>2b5go+eHPO0m0slh*y?vKl{mx~!p-VZ^#7|KQaE
zXnSd|)68|OF{Yx6t*MS!uRIY<Ss(fGi2LeG=921THkbZu&J=y%)0TKzZ2MSqgn9+W
zU9rmE{g-|31K6Ip8H0sR?Hx9VP3a%(la4xEfk}<5c>=BqW>@2MEyi$Eb5^52#7ds7
zbPuSl8z!86aY*P=NwbmrLl59ahK~)4#kfz1useN{d@UIkA9r1Kj<^6<*3;%A-b_L!
zRVGX6ztK(XfbQd9cl}$}ILg{Ay0BGqW5%ZV!4okv->8o~UWHft^gBOhkuUS%(IzLX
zQ`h9ruJ*|RJM1$Zil)YgbhFQxYz~vOf%EYk1x%y#H0y*Dcp43ZJpqmqNBb}`oaPA-
ziou}5^}tndB#9VcJBd9g&`)gOTC*d^F4uUmR(;S#LdZIAmz}IV)()qV-TcrGs+3i8
zjpK6QRkFo6^b?<|p1_-all_d})TiizX6_4i&Vg@ocRgjTdURQS(=rF@seW1gfOT}Y
zU1e)r@~|m88hwwk<0Nmcmrm1W>Sya4%+h<_z>R>L#|G0mwiktCuQWAwqwVHUXDFTW
z0$=3=qst_o;J|6BgJCykmrQl!(#4rgXW?D>Bf)h(X>hQW-h<!#oc=kKyU>bV?O>x%
zxQF#crXL8l7lpINI@V__y6;qn4W8_$Zj6<`E_1!hHhkB$p1T}B_GjR(7aV-r_l|v8
zPtq{gyneczjz2K?3SA)OfK@;ghda5H!WhCD4b}q3co`^rl6NLUmr*#O&!gH?-b~Dp
zuZ2^^EOgD0b<?QMqQ`cv=5p9<Xgg2HS6}2!#=@(Fz5{Dn+wHNq8a?La*Oq`qr}0!?
zt}A9Gpx@3%b_AakY#UdO>H4OSN>9ye<V4W4{k5<Sk1;7-47dD}*c*(}S>`*Lz$0ej
z{!gw)0c&z(!UKFORF$4i$V6`mf-%<wfAA+yBsU8XiB)=Z9c3+?CUUuM`nk^0{np!J
zYjPw;?wRe%r!w1G^5DdF-mY_u?TulBGjF~FIoo8gr{h{77~jGpeo$KHtHZDJ7w=kx
zpk3)leyj&Q{9w5G1a|r}>D@0OdzZhi%k*_%H=FC=U%Ta)<V=6|JlN$~=#fv#yYj$z
z0>Sv&kAz7_uw!2pfOEMnz0rqErBgjfmzY==*%`#!f8`T;%AR633@s?JA;*bPd`ct5
zf-&}#kFo_*yV|DmRj*Y?=MmZT-Sh|W!q(tZd*B0+P5kDET&FH7Yd%H3=p%gomNfKJ
zy{SX%&`0sWBXZfDev>z{Ui@h<d*oBs4|<ng4NH7RTERBG)o;mjI2Zd%-$%DsQ?UjV
z1SsGPIG8t1>IO1UCb&NjlwD*+;MM5T3uDJA{*>iwH5U59<_Qitj-~RT$4*|8WBQR_
z)=GZyw?K~`3E_b?KG0AW^rwtLFEJGxFb8kSHr)#sc2D^&*_&*^FWgE0FBY{Nc1JuZ
z*RVmaa%HStZ7(^I=bRTU=)2zTo6xm<A~^sYv#Dff+%$(OmV#$C)_RPuis=!PqYKl7
z5N9wD#S=IjQ}Mpn6fHV;80bol%;(;m|LZ>$fU-dn;4&UGSWlZuFOx6))LH#<R}b0>
zQ0X|IZfnEsa!I>6gw*Gi$dV}KGp?sU7Fytmud{1DO#cbL%FbJ6&KqvXEuT{c=$yX$
zBV;mmX$N8lzf?{p&!Cw+CHsG?V1PgMv3$vK_t&B$W%;`JU-WJKsjKRT`U>5G7Y8Ev
zV1veFtc@Gkz+qrH#P-5@08VAp*i@ntLGeq$P(JrF0lGtKtVVaes4L`oaG?+Q#mVAG
z#T5HW7uU`AH#(_5*2KxNyz+D3i#+WvjKFq#lUK*0OC^VN`X%s6=G14b2R~#d|A;-4
z9&43|EsptYvXed!(B@bAhCXtfe_6Z?x66^WCd0eud5?Y0>7VLaNNK;=E#skc&P`T~
zHEv@)cwsBX<Q1NrO9AUGRXrSC4Bp)cH>xYX>*BatI|%L%FiPo$!L}dsqS@?=qhnp|
zE*lzec0U+8&!(&GLw`%)4gI?AHU`ZMbdT3Q;MsFN<U$9*8qY7_uQuv_C1=F$vKO-4
zpD~U&27dET(*g6M>vlCgidSh<PR&;g$WtDpjd{jx@xAE_UxP+;uAJ@u1|8)YkNHt_
z9Iwy<1V&e6f~Ybh0E+>J0bxR83Nx^2P`f397Ba>&94Ai7J`%<8D>0IX&sqa^C389{
z_EMje%U*Is2PTH@uePjX;TN3pYyU{odtsFie7^FhuMe?yx;nkaZJz^^k3LO*t-i}-
zbsabU30c^m`fFYQUt<*X-InO06Jj2^0#kGyIF3my_etoX`BONa*CHcz>V8Q2y>A6C
z^CfR!8l(z!W0S7H%Gdy-GfYw2OFUN+g<@DNTId%TW?15i-Xf=rb-Vh!WQ=uBjsshb
zx9LvW#1$RrSCb3-%0|^G@!hT_XD=W8j^E`vhWP@An9%q6vPV6@-`BY(&neGn+Pr+Y
z;B=W|j&AGC)-k87<{Q{p`0&l@>!cfdA)|7v9s1!1=m0t0H&rXeS3R+z--Y)o4TB;C
zNAF4zWE%HlIzpU<B&D&1hdmmQ4qA*zCDRG2iy9xisbA6>PVp8`=`;D;o;t7DF0_tq
z^5~!R0muF<{T&N3(tq&566i7i5y`d1KhQ_w0-Fx`wtGs0UUWh0{JN*QhWzrets7?e
zC$VjB%;ATogRH^7z*%C+Sh$X9AL*d8@)n-WH~J^P;1|utuFhxiFP-xhTAkQ?5*wW;
zXU=yT>_HfeFXcQqs;J_2oE)1jH5NyTUaq%4k#KHf%F7@s)}oUX{jwK&E;^`8(C>97
z4hy;4f<4Z?sO)B_{qnhYU8j8_>qp^rU#QO2jSfBajYI{;+#49>^YDM!KW)H%VVBNo
zTj}2S;Ai#iuuF85eYY$9lDf&f<WSerE$zv<>z+1tc{vW91jl4vl>xE9E)H|05HL}o
zFkI;aWl~`}jRwMrf(u2dwCXAQ#3at*B&ScCWv)7k9fe=MfZoanOtC5TF<b1$C>mQ6
zxv;}^jIruR?3|bEz;xM#TlSO=YH!LcTE)-qx`Nl~pfmW@PQ#sap(k;ub0u!sp!10n
zxh!_VF2#VJE_Y{7(Zg3shcRizPVo)wRNX6g=+_*l{+XM_1HO(u3s?<JL(t72F_J<H
zy!gu)CZ3H&4#&1n%v3ma632t~vnFlV)9B5fo-nnJK*7Ox>H$pR@FNA~3%}^_qxs7V
zFO#BtoB<o_q+4R9`j(EXPm7*9RXniYeEn}LC{4)b$K;1D>ib34wm15aV|Ey3_(FY4
zS~-}2nRdXx#Gqe9hQ`<Y7Q7LUl-umlwdtRTEsK(R?YrbfVn9dLPYw;*1pc~#LA)wf
zM%Esct2HKGIkOZ?<%}PSGBIO*P>}!5L`q$-$Dk*6IiLzb^xP&8a8vim3yjhcSS-HM
zQEU-iRy%+p^RcIXQ9Rib|ES;WnX)QQ;hRX3O5WNFzLDH97CnN`^sK_=y!<7+b;xAl
zi0ylQG@gr{)S(W&@udDmUqwwGndjK`7Mlwvv3{V8hIvPxOR+m%$i-S;&oShhyrhNR
zX5)XxD>Q`}P$-z|reqrfOpRxsYdpQ1LV}}w#H$l5_rWs~qtUSdi77>?GH53pYJAz(
zf?iH{bV;Iy*Yp8@!>$8j!v|ff*eYRgaOnZI3p{y5w#vlV>}xcpCzCo8y!bL!OJS`(
zDf)T>N4wJgd(l5-RKk~zk8ZWV1&_HzeAS`sH9qk_aTa{qUu#33=$RYiK*QW}IIye8
zS#y;uNmIJUO&<k3nUf$vsqjTmD!Uq~4k_b`#&AR#HME?exRCA6+3-{Eu20bdYw{I+
zyB$(r!-EalMZcl9C9%-_`@1T-*`beM^n%(X#m)|{%VAJ`&L!cbSCJ-0_dy>=*I3nB
z$d}~nG!;`REVoNKY~Rva+;(}Q{>eURGJjV3DoW@F`YjH+#HVD2FCyN)FLZOi>!CKe
z+!Y73j&Xa{gAGTOz#l77EAU;Q0B@2)XhzV7;MrqdSUVo+sY7<qhrDoL)2ka@I@YU5
z&Xq=;t%r-~4taqYw2<u%w=TX3yeis#Z?;-stGm3=PqASOd<1&(745Kb^1=sA)}+H4
z_tXYC)Do}qX6_eG`ft)S%yuxNm(QDRC2QgFKIG})+U4jx#zNz<I?!?P*@{ygy3psg
z-)!x?m-X=(m_>9~GSvx_wBMCL;~N53Cs3eZvVe2lFuE=}N1(>j*6DyM6tm47*n;hP
zFSgPCq=OEWz4x6J2Jppqwbw9WEIiG3&GvZqV7q_IKVs|Zm&T*TCH7RGx-YhOeMR2l
zyV+HT7!UjDqp#}S-teJ}fm=LWPu`MUdrBkwvBy}#CSZgftG`_Kg;#a2y@4xvOg_<X
z^jW|SROasN1Z@tfVoEx9&~mCY<*+76tVXwS(i{J99&|DNRA1*8J)}^lGsRg!|D&JS
z!p}aO-)O`R%!$c81S139>AIZBOF5MwOoFD9$O}JWZ4;BWzTMySE#@J<>wH^D&wU$H
z?+s?3N3VE7UZ)}6X3y5OXt1})l(&`IpLR7{oNvKS+9=|QA$FUL+yibD@Lfhv<}WBf
z!0%WzzMl!EIG_W5j!iD*3%}A~-1H}YIA)JqG%gE!)m>ilH5#+EFr<jGNDb#-{jf9L
zBZ#@C<4qzp9n{8MJUvF!zv6=}R`M*l&~+L7LYHzZCd-Yla=ZMyWHmn1t<R0N;(n(*
z$0<39L7xPz=#hIJYuE3x8+q1jw6&`)sLzjj8oxRzlTT>w#MNY?@eOm=jc<$(@O!6I
z>`=*rK%592x-OG0blhS?57Vt<Xac1jO4IaM<+QafQ|T7jWtYno|Lx?HPyD{)-Sw2!
z)``35BDi1FrO|KKdxt#3jvQLCAhY7Mjaha(9J|ds{ax3}AIuy6()kK4${E2lRE$vr
zNTY_k!Tw64<7PzLv#xZYQQ45M4uX!VD`mOv(8F<yr_(LZ9o}xQca=?llnuV#<Pu-I
z@amKF>5uJR^2@%<Z8q-oF*yfzr%j7aV|^oM;otQ;?OoTZ5F<~D_8?xQ5u1~j{9NyT
zZ2sBlB$%dWry+mJ9pftn{Es<uBS80S?&}k8RhEWfuF8thLU%iGRG!LJV~A7xM>^PC
z<@a&OcUyti=nM<I9gmo4-<DSCnw%Uje(W?lr@i2@^+va`k7M=W&fey~i5)zPk9=Hf
z)H8J+>yMwlFd0b$I>Y|YcR#t!!q;`9OesF0DSgUj&2Q?+HRxS5zD}7UNAP!R9i!7>
ze8r>>h0-b2i%CF($JSDqIVBCX<ih%JxGJaebq=F+F4(0Dbg!rAPJWl)vGUpVsXfDI
zaDZR(%pVADx20q?KPWHoC`V!?SnkW*`{B{!&p-V5<aRv2ALD#pY^My+LwAwQdG8B7
zpU%_$qHAhjV$SE#@A~DN&%gcl+vWM1eu909Ngv31&r{M}I$};f(0@1bA$?f7)u9ly
zcA(YzY7^|jSl59K-tH&vDXsbm^tm=a0~=^M5(EGq9Y(^ia7YQI0G$gilsS6R7<WKD
z#bFFa8CwB>ypn6{(+=H(ZiRK6ASnm7(y`887^ZXSAqN=gu_u0*yzuk%`S(A4e)QAR
z&rhFSe|~vM^tW%{eZG13{`1F=zkL4n*H1I?e@`3qgYW(OkDuRv_&D)K;k<b9>hn*J
zpIu}<`TX5Qrr8D^C2n|o6F;T@#6Rl0^!dPka=B?=y?#4wKpSJoLafVwlK5CF|BK&C
z2bJ%8&8D)g^vpGl3urJd`?(%-!47_nZRxBug1y*Ay|a%3hH*)d%nHuE8fy@=V;u=P
zPWw(HbQ;VHZ9J1NpEft6H*2ML8Je`kCp}N)3KV$cv?g918W{+|B97R@o@*L(K2?V7
z4ZLCdD4-YDuRg!I6xJxT`)Z@mM}d#SVieo+OM#C=<mV^PZ&B!veteR*e%$syJbE&3
z)Up5g$&1g=p1quW!<K<_bl40#2S5EH-STewyJA2eGM-fkT6`5t#cKGFnfu7KinFbw
zQ(or1##nMk=eY(wCZ^=hcYav1r+j_}R%Of36qW)9Fit_9I3h@t*&hI;(fN=O3QDoo
zyz8gW-CpX7`Q^q^=epcnZ>MLhyY7Wo0V@oZ+x4V8d2$T9^B}tLfA{^*GtozqA0_xh
zZ{tQb|4D-9Ax~d29u;?uH*&T15-V=ac}Ow_%s2AwiyZWnk+{@tj3e)g7qU@Pu76@{
z{&`WaSiv)2p_?)!RE4InRVnXlauPe7A^R>zacjKN;%4GLah0ygY52OXn4~!<`n;_R
zQ<8}%F0dws2Vv1u<y>yE&+qQImHsJhyuM35Ru004TwnZag<<Qh*MS|F{ZO!C<a)}I
z0^H`_SeH8STn)LID<v<+GZ!X33SDV>?xc_66}mY>l~19&0*h1XdrAIgcqrq7YtIh@
z8tsJ#S~@#>1)+K!L{en_wAXo@vNZ>9@fSS<Si15#i&pGOjNLkQx$ut9f6p(k#~(lb
z+Vl7y*<Qc7@tj~n*Sz-PAXk6>J7bzOE%r;k5GVI_O?4>xjNimM%CUCI<vR1A6?crA
z&eCy6^>y~EQ0ONL>I9>A<E5amzwmJHdtxtpyRL;yXYJ^6FFV)rDPt*6DNGzZlP-&`
z%WxZafzF%O)<{=@Y6buO4?o|&d==lco-JB_X=QyJa4)W3-(FvQ)nefnNBBE(ZLGIF
z#A6nHeIdtqY2Fx~<V25i?>h|JZ*q+%YGmO7P1i;CE(M%MV*yV&F&ficUkc}dZtH}S
zH*YAX*(hqbP1jsov70{sjsR}-t3uDj$bFZmz1gHm<9an2<MZuVxNDnVTKzbFycK@?
z`SG*)MH&3`?D_RJ?i!!z`xZNm1M;=v?FFa#s&SiL^3`$kP{4OKGY8_r0*>Md-@sb(
zgmcMV#qWK{;kVE*Fabi5<{VAt+^0aHp^_%dv8>>+*093in*!=R98!Tv{Br!JC>2+D
zIX9hzM=_Ll*NJoK<D2BOaMy<7y}Xr7AB}Iid*e6K8-H6IGp{rUWW8c1d{V3`gX=YK
z`(9*|9x|+UGM_;!c!O5+$uTF^Hiz?2h)eS-ghL5ec2OFgiqcW#q!6rziXm8+wZO8X
z1IAe2>H(R7<?Bj^adW2IDm+PNwD#<Fb}W&Vd*e3QCFR-TM^n$9zqH%7x8b|t`xbxB
zZ9RNmNuTjRjQ@jtYDJZCCC&z$G3T1(RATrXIa+zL=CbQ4wCpi&xd@%dbG$-RfHV6X
z%5_77KayLOqLSc4qC=i4o8#|nFAQ1?6<pg3hZ$zmVeY|r#W6j~S<WwOyJsJd&$+MO
zyzTjTHfcvit1VxjTf8C<>GSN2SI>otpXE-)H`ZtVWsX};<bLM?y{{L(<a6k})|kj>
z7;2lyQ2sF=Ut+n!v-@0?R)OlIxi7|Z{#_WN%1pl9Q)D7Yz{#f;sOyoA9#86vbzrM*
zt1Qxj7kZ2Cx-W8Fw;z9cdau89@sQf1pPon&#8Y!?iKFewe69&k#f@>@%F!<QWBJwT
zB^Snc$z5P|okZVb8;$>Veu)JErtm7zi{*QsKs5eH(Y-Rwxily+#y5~-%u`J8K(jc}
z>0GZax6zb-;TQ?V?7f)rv{Ux`@vZ5ro`YxmKeqAXHO5Ke!JD#TIQPf8<x7hV*8OJW
zzRB3(=a@Kc9I|z-;|V5ff^x^6^2%IwOTMTNd<M=5ge;2WcrrCbOgSjD(m0(ell{Bz
zfA(VfzD~4$Pzc__GuK3ClQ*3FL&#yUC%woceeq4*a&I|UQit&+%=qo8v;BE(d^ScL
z!ru~K<}G7yIaaY{?8%E<t2{3pD{jT_a)9gjrWddprsuNtS{r$mopupN`tk~`iCG4U
zg2!uh`fc|69<c4X<At(0HzP>X_6pPNN?C9Sin(+z8N?8Nwa0WD-=dzsjPd8UpPxKi
zb3h9>*BD35iKJ<HHh)z$o`~<J*eR>c3p3<)nz>hpy~tg1rs=lmz12bW$c~=_mqG`9
zI;kt>b1jlp@s6iXRQfawHzj+Mt@2eS*0*|yQ&irh+u4V8;Wynb^GBEBJwNaM`E7i`
zg{1v1ef{KVeW5kiT3p8(`hPUPG;SJW%w>&unkzrdqW8Rz{1e%$%*Mn0>Pvo6hs`r>
zBkxr*%x>UmgfgTuE;xWo!HZL%IQe#tDg${lf|vW@IMPVRKJ`s`W&_5m7v+myU0-pQ
z(~r40`O!~LZ_ncWYufnn5#l_2J$?b^`HPo59u`Z+OADdmSh<jKY`h+4JX-<vK6xwW
zE1!^CnxmI|mbvF#$TOQ4xtsAQV83N#E{2$(ZcHk_taV<aL6Ni~B%kWkofl5p(l>c#
z7uUPJjfdD87_8;~_~&!KemaZyuWF-U5vMU8ZTxe^>3=CW#yty3<30*z7h{d3tXUqC
zrpf9!9aEpXp7|3wmieXpO{WFV>g6(?uh1gc!4{{~jXag;3MBmw&*T*5Wz2$E_)-TL
zw#Q5zRL_RB@aQ^aWw48P92)i-MBb4|=gs@qw#QGNPoJZBKjbfT^jJvz_|$mYSPEKs
z`gljLGJ(6u+PrF$)_MCr@v*0Km8<llUzOpNsAL{%mDr0=duE~Kntg^194pF=tSZ#W
zuX}J->eviH!Ise~OLQ^p7I5gKHuW+3NT##>wQc+%02J?N<HvKBQxUVJ@G1u~t}SQB
zFWB__i+r%0DZC$urMQ)^8~NDR^{sxDm(0aZN6f56p`Cm4GjKYhE1(I!0=6-Dj4ye^
zX@+U^RIUvADml6a-G;0kz1gBq$kzklj;={{w!fy$zlYU+o<2UZ%sh&?Epg8^=JMD}
z`j(S*fLm-^?(I6|Ca<oMX0C}0=uos)tX&6;i7f{K*M;_K7FGvJ!o^`pt3{$uQK*~)
zd>jznaiF=ZQ(nW-b;_wA+Nrg1p6Ks^r<_SEyc?`R|NO;EORBT|HLZU<nZMA{V%GCd
z<DI!1@ym6~&B{r}d*s;QiQHP{NKUwH$Yl;m4o3k}C*z5^6|vwg_HOI+LN{KaLy#=m
zGspJoQ8cAM3Z~Om3>N5gZan=){yu((nEXdwaFagP;IOXO_s!Xk<qmJ_&~<)kb$;%>
zm-hP2+lr6Gi$yB&)XPPa-Yy5pMWe&ou2^E7JO>47v`g{d(OVwtA+sJ_Ka@T3Ep!mB
ziG5eXyF;J^$1F@yBpqIB!82u;Lrq?z?fZRCbmn1z!ju9Xx}Z44rlxb@zr8ts%j&+`
z{6ed8EDw2qUA7$1xyOGk(4IGfhg>L`EssKvb)Ga`AL=VIsU!4K`QK|^8wTs;N`(OI
z`$wW!S0d;jtn+S_SZShnr`Q}l*5O3gsdy_0{^b4^+vF5IWhL+UCxK_XzqZ7v=NQ&n
z%$0`mOd6ddH<lc(dDTGfO<K&cSJ=q&Nt5|x^fgy`yjY~5sY~fBGV>K0MVVtQ;A9wU
zsn~o<4+XKGz&oYs5MMJVVh!`q3;T_a>!lauQxDOr%jmjtKWzu!`RaUs?Zd~97VDW0
zmLncZi+klUbI0>3a-KOPc~NpaZ-T$_q~?{Ai%z05^EdMjGHeYxr5%tXIwPOuGcXm{
zby3O<UldG(s7wfzJsN^>8Dh>6x>y(av1bmCJ>#LC)zeYb%MOa7pN@Mx@y{==?zhD+
zbRcd>XixH`GoCd^T(O5dWxh&|W|yMW91B`tkiX}m%PKu}&2v=puw=PDuIuRen^-KK
zNL~uaL{^~7oPerq;iMonSe>Q@&M_66*b$)48+yqe<jb3ZIJq2!b<(G8u+L>dr}D@7
z*EH_8jlU5cd1r^NCo~G<(ULbF|60=mZu!RC5xym_m?xI=QcIPqEf>+Hm_6qjf9N3f
z@{{EGyn#JoA=KyPG&jihu#dIon4<0Y!Y}JtoOxiB%#z(@>0H*RN9m{fr^9kD4y^FW
z_+JNlLY?jJZS((glAN3Iv!u?LwIZ!}T269~H5NtXfvkDnjbAPSjmQGF$qBtuk1R&;
zXzp!ukomi@Ip-K>0T+`BvD>#hqSlN)jYQ!M<x?0=mRwJs;8TUCqn6^An_qQJ`lU#l
z4B%RT#g2Nb0MB@y-#p)M8$bWmTUBDi_#wU(%iNp)kz318%hj2ix>xHqmp9Jb@4D!^
z_bR|2G=E1;RBg=~0iDuNw>kC$2IKK9G#5)TD{4Ng2!~KQsDyJarv(gVA@^s=?cD;i
znOCspJmth|_;8re&jTg*7ag|!g7Gzfv*~PqU3>TL17e|Zi5Mf+Eso45DbO9w67T3$
z{K;d5mpyVT=phgI*dt%*kU5z+qFc)4VIym_XX>nlp7`@iEGQNX0WJ!ZQ*ysKfI`<(
zh6TpcDGRLlF%E~9^P8M}l~O*+Qm5$2cHpeF>wd}^KYKje{kB)H-yrskX^XcNkLPH_
zRbyP^%q6*0MxXhsbjcU{e$gP;Qx4ayHu7Q-Ji~^Lhq>8wQCoBWasww(D1TRR`TKvY
zi@}?dYV7GrRL%%&EqE#>H@jitK)9?GrpXLldH}K;Pj{^72)di|_4(f0(`PT2I3iY+
zFEi$zLv3t%81smK%UP$1eAkPt?{WPomxJH(wCgzd<bVP`=_fzeXOCLUJeODK$><=J
z?B2CVa)09>u4Au1O_t(HP|`Vt2_wLl{rD7{|J5aRNIQk!bwvN=m-A2L+;@BY__^f+
z4*pEwHP$~!!slT=<0`Z$nxwfa7Y}7XzUO?^PU$Im9BZrGg9|4ySueD!^(!+_lernL
z`&iF$87x9`O~?JoA|fVEtA;Q8_G(|)qDS8=8jcrdgtJ4Z%ifPaJvqO9{s!9kch`(f
z#pyWVcO5w!<4w-xdgkBA4a*PZZ@4<Qx=|X<<%Y57C2Q1Aak?*lkQ+D^SD-RRm`l-B
z5nv?Gq?5TBv#ba9LZ=Etj?Kwmn1RE2IRv~NJMcIkKYKje{kL7L<GH+%?c%x3)t*m3
z{OEb{rQFE;s=V9rc}I~RchgIAc&&+UL)^d(K#8$G4HconXGLE^3&$KH7^)DRjWy9}
z;&E+%IwBCjAs)KOCSKD8dcJ)5y64i_{^s`EZ?_gN<d&>O@$vTbJ<XrP-g)GS+jy=?
z?q^;lAM-usS>YLv%cCupvze>0C;4c$)ZW}5Ut*as%#|6$0Kne-PpRU$?B#f?1o`)Y
z$#FY*K>s5g7-Q%+pHjroMe)@JlO?=kKK>r@+3vS}`t+%C1u;ep{kg_-jFFp?1K_DH
z`KLLi>yFX$X}Q=8BXc$R>!NYmnhzaB58W5NOow=dHU+XcM7haOz}<nk?Q$)jN-yKC
z5adF}=Cs=dDrhpWvkzy5!>EJtb8pp2u;%#u2KxTn_=ABJrz)z9spTePm~piHK|V=*
zH|s{Pc-Z6qP8WGHr<xwrPkYb7(nsa9VC6}9S5~9~J_+&!Y0O(%-BX(JeDvcJb++-7
zE*&>|Q}U=UbT|MyEoF&4<n>c>K5uT`_k23r-`wyD&A9l%?t85OdVD4R%1eITgRFcK
z8+)6v<(tWNY|Fi^4v(T%8jj1A{2pubGw_Zf*Uf3x2N1eAxzi0^C?&YAl*kes$Ap7Z
zraB_|f=77Uemq^rMb4l(3;5e;5+_Sw%SV|DjpjsuGR|{cg{$k!v&+?e?ZnDF)PlT2
z&ZH&AnxhLp^ce-bRYJh1bQaG95x|vB9HVrbo{G{*9S2xYI*n7^3}5MhNrOq}4w_wT
zKX2e~q%qDdPMe~bw2x3^9`ne>9`iQWyhr{JUvj?dGw~N(<C|;9t<)Vnv}21M^>)`A
z#OLt}T{mPEk16H*t3x43F~-mECJy$RQ+BV_!~pK`TEEp7T9F%0D`z^-M#lLq^!>N-
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

literal 2573
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
SJ^}wbki#VxyUL&Z@B9fo=m2T}


From 632744e3dc7ffe0dd3ebce5a593050275bc6092a Mon Sep 17 00:00:00 2001
From: Siarhei Hrabko <45555481+grabsefx@users.noreply.github.com>
Date: Fri, 19 Jan 2024 17:04:35 +0300
Subject: [PATCH 08/24] EPMRPP-82209 exclude skipped tests option is mandatory
 (#1914)

* EPMRPP-82209 exclude skipped tests option is mandatory
---
 .../content/constant/ContentLoaderConstants.java       |  2 ++
 .../HealthCheckTableReadyContentLoader.java            |  3 +--
 .../ComponentHealthCheckContentValidator.java          |  9 ++++++++-
 .../core/widget/util/WidgetOptionUtil.java             | 10 ++++++++++
 4 files changed, 21 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/epam/ta/reportportal/core/widget/content/constant/ContentLoaderConstants.java b/src/main/java/com/epam/ta/reportportal/core/widget/content/constant/ContentLoaderConstants.java
index 571dccd381..def2d45c94 100644
--- a/src/main/java/com/epam/ta/reportportal/core/widget/content/constant/ContentLoaderConstants.java
+++ b/src/main/java/com/epam/ta/reportportal/core/widget/content/constant/ContentLoaderConstants.java
@@ -39,6 +39,8 @@ public final class ContentLoaderConstants {
   public static final String TIMELINE = "timeline";
   public static final String ATTRIBUTE_KEYS = "attributeKeys";
   public static final String MIN_PASSING_RATE = "minPassingRate";
+  public static final String EXCLUDE_SKIPPED = "excludeSkipped";
+
 
   private ContentLoaderConstants() {
     //static only
diff --git a/src/main/java/com/epam/ta/reportportal/core/widget/content/loader/materialized/HealthCheckTableReadyContentLoader.java b/src/main/java/com/epam/ta/reportportal/core/widget/content/loader/materialized/HealthCheckTableReadyContentLoader.java
index c33dec703a..8fea9e7148 100644
--- a/src/main/java/com/epam/ta/reportportal/core/widget/content/loader/materialized/HealthCheckTableReadyContentLoader.java
+++ b/src/main/java/com/epam/ta/reportportal/core/widget/content/loader/materialized/HealthCheckTableReadyContentLoader.java
@@ -2,6 +2,7 @@
 
 import static com.epam.ta.reportportal.core.widget.content.constant.ContentLoaderConstants.ATTRIBUTES;
 import static com.epam.ta.reportportal.core.widget.content.constant.ContentLoaderConstants.ATTRIBUTE_KEYS;
+import static com.epam.ta.reportportal.core.widget.content.constant.ContentLoaderConstants.EXCLUDE_SKIPPED;
 import static com.epam.ta.reportportal.core.widget.content.constant.ContentLoaderConstants.RESULT;
 import static com.epam.ta.reportportal.core.widget.content.loader.materialized.handler.MaterializedWidgetStateHandler.VIEW_NAME;
 import static com.epam.ta.reportportal.dao.constant.WidgetContentRepositoryConstants.EXECUTIONS_PASSED;
@@ -47,8 +48,6 @@ public class HealthCheckTableReadyContentLoader implements MaterializedWidgetCon
 
   public static final String SORT = "sort";
   public static final String CUSTOM_COLUMN = "customColumn";
-  public static final String EXCLUDE_SKIPPED = "excludeSkipped";
-
   public static final String TOTAL = "total";
   public static final String STATISTICS = "statistics";
   public static final String PASSING_RATE = "passingRate";
diff --git a/src/main/java/com/epam/ta/reportportal/core/widget/content/updater/validator/ComponentHealthCheckContentValidator.java b/src/main/java/com/epam/ta/reportportal/core/widget/content/updater/validator/ComponentHealthCheckContentValidator.java
index 4d317b31bf..74a58809d6 100644
--- a/src/main/java/com/epam/ta/reportportal/core/widget/content/updater/validator/ComponentHealthCheckContentValidator.java
+++ b/src/main/java/com/epam/ta/reportportal/core/widget/content/updater/validator/ComponentHealthCheckContentValidator.java
@@ -17,6 +17,7 @@
 package com.epam.ta.reportportal.core.widget.content.updater.validator;
 
 import static com.epam.ta.reportportal.core.widget.content.constant.ContentLoaderConstants.ATTRIBUTE_KEYS;
+import static com.epam.ta.reportportal.core.widget.content.constant.ContentLoaderConstants.EXCLUDE_SKIPPED;
 import static com.epam.ta.reportportal.core.widget.content.constant.ContentLoaderConstants.MIN_PASSING_RATE;
 import static java.util.Optional.ofNullable;
 
@@ -77,6 +78,12 @@ private void validateWidgetOptions(WidgetOptions widgetOptions) {
         .orElseThrow(() -> new ReportPortalException(ErrorType.UNABLE_LOAD_WIDGET_CONTENT,
             "Minimum passing rate option was not specified"
         ));
+
+    BusinessRule.expect(WidgetOptionUtil.isBooleanPresent(EXCLUDE_SKIPPED, widgetOptions),
+            isPresent -> isPresent)
+        .verify(ErrorType.UNABLE_LOAD_WIDGET_CONTENT,
+            "Exclude skipped tests option was not specified");
+
     BusinessRule.expect(passingRate, v -> v >= 0 && v <= 100)
         .verify(ErrorType.UNABLE_LOAD_WIDGET_CONTENT,
             "Minimum passing rate value should be greater or equal to 0 and less or equal to 100"
@@ -87,4 +94,4 @@ private void validateAttributeValues(List<String> attributeValues) {
     attributeValues.forEach(value -> BusinessRule.expect(value, Objects::nonNull)
         .verify(ErrorType.BAD_REQUEST_ERROR, "Attribute value should be not null"));
   }
-}
\ No newline at end of file
+}
diff --git a/src/main/java/com/epam/ta/reportportal/core/widget/util/WidgetOptionUtil.java b/src/main/java/com/epam/ta/reportportal/core/widget/util/WidgetOptionUtil.java
index 39a035942d..4628d3b44d 100644
--- a/src/main/java/com/epam/ta/reportportal/core/widget/util/WidgetOptionUtil.java
+++ b/src/main/java/com/epam/ta/reportportal/core/widget/util/WidgetOptionUtil.java
@@ -75,6 +75,16 @@ public static boolean getBooleanByKey(String key, WidgetOptions widgetOptions) {
         .orElse(false);
   }
 
+  public static boolean isBooleanPresent(String key, WidgetOptions widgetOptions) {
+    return ofNullable(widgetOptions)
+        .map(wo -> MapUtils.isNotEmpty(wo.getOptions()) &&
+            ofNullable(wo.getOptions().get(key))
+                .map(String::valueOf)
+                .map(BooleanUtils::toBooleanObject)
+                .isPresent())
+        .orElse(false);
+  }
+
   public static Optional<Integer> getIntegerByKey(String key, WidgetOptions widgetOptions) {
     return ofNullable(widgetOptions).flatMap(
         wo -> ofNullable(wo.getOptions()).map(options -> options.get(key))).map(value -> {

From 2bf1105998931373cf7618b6607dc7480e6e6ded Mon Sep 17 00:00:00 2001
From: Siarhei Hrabko <45555481+grabsefx@users.noreply.github.com>
Date: Tue, 30 Jan 2024 16:21:20 +0300
Subject: [PATCH 09/24] EPMRPP-87239 exclude skipped tests from statistics
 (#1918)

* EPMRPP-87239 exclude skipped tests from statistics
---
 build.gradle                                                  | 2 +-
 .../content/loader/ComponentHealthCheckContentLoader.java     | 4 +++-
 .../materialized/HealthCheckTableReadyContentLoader.java      | 2 +-
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/build.gradle b/build.gradle
index ac101b5271..5e678f891c 100644
--- a/build.gradle
+++ b/build.gradle
@@ -73,7 +73,7 @@ dependencies {
         implementation 'com.epam.reportportal:plugin-api'
     } else {
         implementation 'com.github.reportportal:commons-events:e337f8b7be'
-        implementation 'com.github.reportportal:commons-dao:0a2a4276f9'
+        implementation 'com.github.reportportal:commons-dao:5ac2052'
         implementation 'com.github.reportportal:commons-rules:42d4dd5634'
         implementation 'com.github.reportportal:commons-model:3251388'
         implementation 'com.github.reportportal:commons:07566b8e'
diff --git a/src/main/java/com/epam/ta/reportportal/core/widget/content/loader/ComponentHealthCheckContentLoader.java b/src/main/java/com/epam/ta/reportportal/core/widget/content/loader/ComponentHealthCheckContentLoader.java
index 574804d49b..b9d963a6d2 100644
--- a/src/main/java/com/epam/ta/reportportal/core/widget/content/loader/ComponentHealthCheckContentLoader.java
+++ b/src/main/java/com/epam/ta/reportportal/core/widget/content/loader/ComponentHealthCheckContentLoader.java
@@ -24,6 +24,7 @@
 import static com.epam.ta.reportportal.commons.querygen.constant.TestItemCriteriaConstant.CRITERIA_STATUS;
 import static com.epam.ta.reportportal.commons.querygen.constant.TestItemCriteriaConstant.CRITERIA_TYPE;
 import static com.epam.ta.reportportal.core.widget.content.constant.ContentLoaderConstants.ATTRIBUTE_KEYS;
+import static com.epam.ta.reportportal.core.widget.content.constant.ContentLoaderConstants.EXCLUDE_SKIPPED;
 import static com.epam.ta.reportportal.core.widget.content.constant.ContentLoaderConstants.LATEST_OPTION;
 import static com.epam.ta.reportportal.core.widget.content.constant.ContentLoaderConstants.RESULT;
 import static com.epam.ta.reportportal.core.widget.util.WidgetFilterUtil.GROUP_FILTERS;
@@ -105,7 +106,8 @@ public Map<String, Object> loadContent(List<String> contentFields,
         latestMode,
         limit,
         testItemFilter,
-        currentLevelKey
+        currentLevelKey,
+        WidgetOptionUtil.getBooleanByKey(EXCLUDE_SKIPPED, widgetOptions)
     );
 
     return CollectionUtils.isNotEmpty(content) ? Collections.singletonMap(RESULT, content)
diff --git a/src/main/java/com/epam/ta/reportportal/core/widget/content/loader/materialized/HealthCheckTableReadyContentLoader.java b/src/main/java/com/epam/ta/reportportal/core/widget/content/loader/materialized/HealthCheckTableReadyContentLoader.java
index 8fea9e7148..53c981e08d 100644
--- a/src/main/java/com/epam/ta/reportportal/core/widget/content/loader/materialized/HealthCheckTableReadyContentLoader.java
+++ b/src/main/java/com/epam/ta/reportportal/core/widget/content/loader/materialized/HealthCheckTableReadyContentLoader.java
@@ -147,7 +147,7 @@ private double calculatePassingRate(Map<String, Integer> totalStatistics) {
     double passingRate =
         100.0 * totalStatistics.getOrDefault(EXECUTIONS_PASSED, 0) / totalStatistics.getOrDefault(
             EXECUTIONS_TOTAL, 1);
-    return new BigDecimal(passingRate).setScale(2, RoundingMode.HALF_UP).doubleValue();
+    return BigDecimal.valueOf(passingRate).setScale(2, RoundingMode.HALF_UP).doubleValue();
   }
 
 }

From b0ae9ce3c51a179b7f195fec8eea8003d3884658 Mon Sep 17 00:00:00 2001
From: Andrei Piankouski <andrei_piankouski@epam.com>
Date: Wed, 31 Jan 2024 18:07:33 +0300
Subject: [PATCH 10/24] EPMRPP-84831 || Update Gradle build script

---
 Dockerfile                               |   2 +-
 Jenkinsfile                              |  44 -----------------
 Jenkinsfile-candidate                    |  57 -----------------------
 Jenkinsfile-release                      |  42 -----------------
 build.gradle                             |   3 +-
 gradle/wrapper/gradle-wrapper.jar        | Bin 0 -> 63721 bytes
 gradle/wrapper/gradle-wrapper.properties |   4 +-
 project-properties.gradle                |   4 +-
 8 files changed, 7 insertions(+), 149 deletions(-)
 delete mode 100644 Jenkinsfile
 delete mode 100644 Jenkinsfile-candidate
 delete mode 100644 Jenkinsfile-release

diff --git a/Dockerfile b/Dockerfile
index 317d3448be..d36e7b7dba 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-FROM --platform=$BUILDPLATFORM gradle:8.4.0-jdk21 AS build
+FROM --platform=$BUILDPLATFORM gradle:8.5.0-jdk21 AS build
 ARG RELEASE_MODE
 ARG APP_VERSION
 WORKDIR /usr/app
diff --git a/Jenkinsfile b/Jenkinsfile
deleted file mode 100644
index 74087836ed..0000000000
--- a/Jenkinsfile
+++ /dev/null
@@ -1,44 +0,0 @@
-#!groovy
-
-node {
-
-    load "$JENKINS_HOME/jobvars.env"
-
-    env.JAVA_HOME = "${tool 'openjdk-11'}"
-    env.PATH = "${env.JAVA_HOME}/bin:${env.PATH}"
-
-    stage('Checkout') {
-        checkout scm
-    }
-    stage('Assemble') {
-        sh "./gradlew clean assemble -P buildNumber=${env.BUILD_NUMBER}"
-    }
-    stage('Test') {
-        sh './gradlew test --full-stacktrace'
-    }
-    stage('Build') {
-        sh './gradlew build'
-    }
-    stage('Docker image') {
-        sh "./gradlew buildDocker"
-    }
-    stage('Push to registries') {
-        withEnv(["AWS_URI=${AWS_URI}", "AWS_REGION=${AWS_REGION}"]) {
-            sh 'docker tag reportportal-dev/service-api ${AWS_URI}/service-api:SNAPSHOT-${BUILD_NUMBER}'
-            def image = env.AWS_URI + '/service-api' + ':SNAPSHOT-' + env.BUILD_NUMBER
-            def url = 'https://' + env.AWS_URI
-            def credentials = 'ecr:' + env.AWS_REGION + ':aws_credentials'
-            echo image
-            docker.withRegistry(url, credentials) {
-                docker.image(image).push()
-            }
-        }
-    }
-    stage('Cleanup') {
-        withEnv(["AWS_URI=${AWS_URI}"]) {
-            sh 'docker rmi ${AWS_URI}/service-api:SNAPSHOT-${BUILD_NUMBER}'
-            sh 'docker rmi reportportal-dev/service-api:latest'
-            sh './gradlew removeScripts'
-        }
-    }
-}
diff --git a/Jenkinsfile-candidate b/Jenkinsfile-candidate
deleted file mode 100644
index 162dfed587..0000000000
--- a/Jenkinsfile-candidate
+++ /dev/null
@@ -1,57 +0,0 @@
-#!groovy
-properties([
-        parameters ([
-                string(
-                        name: "VERSION",
-                        defaultValue: "",
-                        description: "Release candidate version tag"
-                ),
-                string(
-                        name: "BRANCH",
-                        defaultValue: "",
-                        description: "Specify the GitHub branch from which the image will be built"
-                )
-        ])
-])
-
-node {
-
-    load "$JENKINS_HOME/jobvars.env"
-
-    env.JAVA_HOME = "${tool 'openjdk-11'}"
-    env.PATH = "${env.JAVA_HOME}/bin:${env.PATH}"
-
-    stage('Checkout') {
-        checkout scm
-    }
-
-    stage('Assemble') {
-        sh "./gradlew clean assemble -P buildNumber=${env.BUILD_NUMBER}"
-    }
-
-    stage('Test') {
-        sh './gradlew test --full-stacktrace'
-    }
-
-    stage('Build') {
-        sh './gradlew build -x test'
-    }
-
-    stage('Push to ECR') {
-        withEnv(["AWS_URI=${AWS_URI}", "AWS_REGION=${AWS_REGION}", "TAG=${VERSION}"]) {
-            def image = env.AWS_URI + '/service-api:' + env.TAG + '-RC-' + env.BUILD_NUMBER
-            def url = 'https://' + env.AWS_URI
-            def credentials = 'ecr:' + env.AWS_REGION + ':aws_credentials'
-            sh './gradlew buildDocker -P dockerTag=$AWS_URI/service-api:$VERSION-RC-$BUILD_NUMBER'
-            docker.withRegistry(url, credentials) {
-                docker.image(image).push()
-            }
-        }
-    }
-
-    stage('Cleanup') {
-        withEnv(["AWS_URI=${AWS_URI}"]) {
-            sh 'docker rmi $AWS_URI/service-api:$VERSION-RC-$BUILD_NUMBER'
-        }
-    }
-}
diff --git a/Jenkinsfile-release b/Jenkinsfile-release
deleted file mode 100644
index cd1bc94e47..0000000000
--- a/Jenkinsfile-release
+++ /dev/null
@@ -1,42 +0,0 @@
-pipeline {
-  agent any
-
-  environment {
-    JAVA_HOME = "${tool 'openjdk-11'}"
-    PATH = "${env.JAVA_HOME}/bin:${env.PATH}"
-    DOCKERHUB = credentials('dockerhub')
-    GITHUB = credentials('github_token')
-  }
-
-  stages {
-    stage('Assemble') {
-      steps {
-        sh './gradlew clean assemble -P buildNumber=$VERSION'
-      }
-    }
-
-    stage('Test') {
-      steps {
-          sh './gradlew test --full-stacktrace'
-      }
-    }
-
-    stage('Build Artifact'){
-      steps{
-        sh './gradlew build -PreleaseMode=true -PgithubUserName=$GITHUB_USR -PgithubToken=$GITHUB_PSW'
-      }
-    }
-
-    stage('Build Docker Image'){
-      steps{
-        sh './gradlew buildDocker -P dockerTag=reportportal/service-api:$VERSION'
-      }
-    }
-
-    stage('Push to DockerHub') {
-      steps {
-        sh 'echo $DOCKERHUB_PSW | docker login -u $DOCKERHUB_USR --password-stdin && docker push reportportal/service-api:$VERSION'
-      }
-    }
-  }
-}
\ No newline at end of file
diff --git a/build.gradle b/build.gradle
index 5e678f891c..cbbc837730 100644
--- a/build.gradle
+++ b/build.gradle
@@ -18,13 +18,12 @@ plugins {
     id "io.spring.dependency-management" version "1.1.4"
     id 'org.springframework.boot' version '2.5.15'
     id 'java'
-    id "org.owasp.dependencycheck" version "8.2.1"
+    id "org.owasp.dependencycheck" version "9.0.9"
 }
 
 import org.owasp.dependencycheck.reporting.ReportGenerator
 
 apply from: 'project-properties.gradle'
-apply from: "$scriptsUrl/build-docker.gradle"
 apply from: "$scriptsUrl/build-commons.gradle"
 apply from: "$scriptsUrl/build-info.gradle"
 apply from: "$scriptsUrl/release-service.gradle"
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..7f93135c49b765f8051ef9d0a6055ff8e46073d8 100644
GIT binary patch
literal 63721
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

literal 0
HcmV?d00001

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index e411586a54..1af9e0930b 100755
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,7 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
+networkTimeout=10000
+validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/project-properties.gradle b/project-properties.gradle
index feec486eed..2533e06459 100755
--- a/project-properties.gradle
+++ b/project-properties.gradle
@@ -16,7 +16,7 @@ project.ext {
     isDebugMode = System.getProperty("DEBUG", "false") == "true"
     releaseMode = project.hasProperty("releaseMode")
     scriptsUrl = commonScriptsUrl + (releaseMode ? '5.10.0' : 'develop')
-    migrationsUrl = migrationsScriptsUrl + (releaseMode ? '5.10.0' : 'feature/settings')
+    migrationsUrl = migrationsScriptsUrl + (releaseMode ? '5.10.0' : 'develop')
     //TODO refactor with archive download
     testScriptsSrc = [
             (migrationsUrl + '/migrations/0_extensions.up.sql')                        : 'V001__extensions.sql',
@@ -82,5 +82,5 @@ project.ext {
 }
 
 wrapper {
-    gradleVersion = '8.4'
+    gradleVersion = '8.5'
 }

From e91aec6ccd1a45d1e42f080bac26356dcb5cd0b3 Mon Sep 17 00:00:00 2001
From: Ivan Kustau <86599591+IvanKustau@users.noreply.github.com>
Date: Wed, 31 Jan 2024 18:10:04 +0300
Subject: [PATCH 11/24] EPMRPP-89102 || Move model classes to api (#1916)

---
 build.gradle                                  |    7 +-
 project-properties.gradle                     |    3 +-
 .../core/activity/ActivityHandler.java        |   45 +-
 .../activity/impl/ActivityHandlerImpl.java    |    2 +-
 .../activityevent/ActivityEventHandler.java   |    5 +-
 .../impl/ActivityEventHandlerImpl.java        |   18 +-
 .../core/admin/ServerAdminHandler.java        |    4 +-
 .../core/admin/ServerAdminHandlerImpl.java    |   19 +-
 .../core/analyzer/auto/SearchLogService.java  |    4 +-
 .../auto/client/AnalyzerServiceClient.java    |    6 +-
 .../impl/AnalyzerServiceClientImpl.java       |   62 +-
 .../client/impl/IndexerServiceClientImpl.java |   97 +-
 .../auto/impl/AnalyzerServiceImpl.java        |    6 +-
 .../analyzer/auto/impl/AnalyzerUtils.java     |    4 +-
 .../auto/impl/SearchLogServiceImpl.java       |    8 +-
 .../analyzer/auto/impl/SuggestedItem.java     |    5 +-
 .../auto/indexer/BatchLogIndexer.java         |    2 +-
 .../impl/ItemsPatternAnalyzerImpl.java        |    2 +-
 .../service/CreatePatternTemplateHandler.java |    2 +-
 .../CreatePatternTemplateHandlerImpl.java     |   17 +-
 .../CreateRegexPatternTemplateHandler.java    |    5 +-
 .../strategy/LaunchAnalysisStrategy.java      |    2 +-
 .../strategy/LaunchAutoAnalysisStrategy.java  |   22 +-
 .../LaunchPatternAnalysisStrategy.java        |   15 +-
 .../handler/impl/CreateTicketHandlerImpl.java |   42 +-
 .../dashboard/CreateDashboardHandler.java     |    4 +-
 .../core/dashboard/GetDashboardHandler.java   |    2 +-
 .../dashboard/UpdateDashboardHandler.java     |    5 +-
 .../impl/CreateDashboardHandlerImpl.java      |   67 +-
 .../impl/GetDashboardHandlerImpl.java         |    2 +-
 .../impl/UpdateDashboardHandlerImpl.java      |    6 +-
 .../core/events/activity/AssignUserEvent.java |   18 +-
 .../core/events/activity/ChangeRoleEvent.java |   22 +-
 .../activity/DashboardCreatedEvent.java       |    2 +-
 .../activity/DashboardDeletedEvent.java       |    2 +-
 .../activity/DashboardUpdatedEvent.java       |    2 +-
 .../activity/DefectTypeCreatedEvent.java      |   18 +-
 .../activity/DefectTypeDeletedEvent.java      |   25 +-
 .../activity/DefectTypeUpdatedEvent.java      |   18 +-
 .../events/activity/FilterCreatedEvent.java   |   19 +-
 .../events/activity/FilterDeletedEvent.java   |   23 +-
 .../events/activity/FilterUpdatedEvent.java   |   29 +-
 .../activity/IntegrationCreatedEvent.java     |    2 +-
 .../activity/IntegrationDeletedEvent.java     |    2 +-
 .../activity/IntegrationUpdatedEvent.java     |    2 +-
 .../activity/ItemIssueTypeDefinedEvent.java   |    4 +-
 .../events/activity/LaunchDeletedEvent.java   |    2 +-
 .../events/activity/LaunchStartedEvent.java   |    2 +-
 .../core/events/activity/LinkTicketEvent.java |    2 +-
 .../NotificationsConfigUpdatedEvent.java      |    6 +-
 .../events/activity/PatternCreatedEvent.java  |    2 +-
 .../events/activity/PatternDeletedEvent.java  |    2 +-
 .../events/activity/PatternMatchedEvent.java  |    2 +-
 .../events/activity/PatternUpdatedEvent.java  |    2 +-
 .../events/activity/PluginDeletedEvent.java   |    2 +-
 .../events/activity/PluginUpdatedEvent.java   |    2 +-
 .../events/activity/PluginUploadedEvent.java  |   13 +-
 .../activity/ProjectAnalyzerConfigEvent.java  |   41 +-
 .../ProjectPatternAnalyzerUpdateEvent.java    |   33 +-
 .../events/activity/ProjectUpdatedEvent.java  |   46 +-
 .../events/activity/TicketPostedEvent.java    |   27 +-
 .../events/activity/UnassignUserEvent.java    |   18 +-
 .../events/activity/UserCreatedEvent.java     |    2 +-
 .../events/activity/UserDeletedEvent.java     |    2 +-
 .../events/activity/UsersDeletedEvent.java    |    2 +-
 .../events/activity/WidgetCreatedEvent.java   |   19 +-
 .../events/activity/WidgetDeletedEvent.java   |    2 +-
 .../events/activity/WidgetUpdatedEvent.java   |   30 +-
 .../item/TestItemStatusChangedEvent.java      |    2 +-
 .../IntegrationActivityPriorityResolver.java  |    2 +-
 .../events/annotations/WidgetLimitRange.java  |   21 +
 .../WidgetLimitRangeValidator.java            |   41 +
 .../TestItemUniqueErrorAnalysisRunner.java    |   14 +-
 .../core/filter/GetUserFilterHandler.java     |   89 +-
 .../core/filter/SearchCriteriaService.java    |    6 +-
 .../core/filter/UpdateUserFilterHandler.java  |   28 +-
 .../filter/impl/GetUserFilterHandlerImpl.java |   61 +-
 .../impl/SearchCriteriaServiceImpl.java       |   35 +-
 .../impl/UpdateUserFilterHandlerImpl.java     |  272 ++-
 .../core/imprt/ImportLaunchHandler.java       |    6 +-
 .../core/imprt/ImportLaunchHandlerImpl.java   |   42 +-
 .../imprt/impl/AbstractImportStrategy.java    |   16 +-
 .../core/imprt/impl/ImportStrategy.java       |    2 +-
 .../core/imprt/impl/XmlImportStrategy.java    |    9 +-
 .../core/imprt/impl/ZipImportStrategy.java    |   13 +-
 .../integration/CreateIntegrationHandler.java |    4 +-
 .../integration/GetIntegrationHandler.java    |    2 +-
 .../impl/CreateIntegrationHandlerImpl.java    |  125 +-
 .../impl/GetIntegrationHandlerImpl.java       |  154 +-
 .../plugin/CreatePluginHandler.java           |   18 +-
 .../integration/plugin/GetPluginHandler.java  |    2 +-
 .../plugin/UpdatePluginHandler.java           |    2 +-
 .../plugin/impl/CreatePluginHandlerImpl.java  |    4 +-
 .../plugin/impl/DeletePluginHandlerImpl.java  |    2 +-
 .../plugin/impl/GetPluginHandlerImpl.java     |   14 +-
 .../plugin/impl/UpdatePluginHandlerImpl.java  |    4 +-
 .../util/BasicIntegrationServiceImpl.java     |   45 +-
 .../integration/util/IntegrationService.java  |    2 +-
 .../core/item/ExternalTicketHandler.java      |    2 +-
 .../core/item/GetTestItemHandler.java         |   14 +-
 .../core/item/UpdateTestItemHandler.java      |   12 +-
 .../history/ITestItemsHistoryService.java     |    2 +-
 .../item/history/TestItemsHistoryHandler.java |    6 +-
 .../item/impl/ExternalTicketHandlerImpl.java  |   16 +-
 .../item/impl/FinishTestItemHandlerImpl.java  |    2 +-
 .../item/impl/GetTestItemHandlerImpl.java     |  530 +++---
 .../item/impl/UpdateTestItemHandlerImpl.java  |   14 +-
 .../history/TestItemsHistoryHandlerImpl.java  |   90 +-
 .../strategy/AbstractLaunchMergeStrategy.java |   84 +-
 .../strategy/BasicLaunchMergeStrategy.java    |   13 +-
 .../strategy/DeepLaunchMergeStrategy.java     |    8 +-
 .../AbstractStatusChangingStrategy.java       |    2 +-
 .../impl/status/ChangeStatusHandlerImpl.java  |   34 +-
 .../core/item/merge/LaunchMergeStrategy.java  |    5 +-
 .../core/launch/DeleteLaunchHandler.java      |    4 +-
 .../core/launch/FinishLaunchHandler.java      |    5 +-
 .../core/launch/MergeLaunchHandler.java       |    2 +-
 .../core/launch/StopLaunchHandler.java        |    8 +-
 .../core/launch/UpdateLaunchHandler.java      |    8 +-
 .../launch/cluster/GetClusterHandlerImpl.java |    8 +-
 .../cluster/UniqueErrorAnalysisStarter.java   |    2 +-
 .../launch/impl/DeleteLaunchHandlerImpl.java  |   31 +-
 .../impl/FinishLaunchHandlerAsyncImpl.java    |    8 +-
 .../launch/impl/FinishLaunchHandlerImpl.java  |   43 +-
 .../launch/impl/GetLaunchHandlerImpl.java     |  122 +-
 .../launch/impl/MergeLaunchHandlerImpl.java   |   32 +-
 .../launch/impl/StopLaunchHandlerImpl.java    |   94 +-
 .../launch/impl/UpdateLaunchHandlerImpl.java  |   64 +-
 .../reportportal/core/log/GetLogHandler.java  |   17 +-
 .../core/log/impl/GetLogHandlerImpl.java      |  186 +-
 .../core/log/impl/PagedLogResource.java       |    2 +-
 .../core/preference/GetPreferenceHandler.java |    2 +-
 .../impl/GetPreferenceHandlerImpl.java        |   13 +-
 .../core/project/CreateProjectHandler.java    |    4 +-
 .../core/project/DeleteProjectHandler.java    |    6 +-
 .../core/project/GetProjectHandler.java       |    6 +-
 .../core/project/GetProjectInfoHandler.java   |    6 +-
 .../core/project/UpdateProjectHandler.java    |    8 +-
 .../impl/CreateProjectHandlerImpl.java        |   18 +-
 .../impl/DeleteProjectHandlerImpl.java        |    2 +-
 .../project/impl/GetProjectHandlerImpl.java   |  316 ++--
 .../impl/GetProjectInfoHandlerImpl.java       |  393 ++--
 .../impl/ProjectInfoWidgetDataConverter.java  |   54 +-
 .../project/impl/ProjectUserHandlerImpl.java  |   13 +-
 .../impl/UpdateProjectHandlerImpl.java        |  197 +-
 .../CreateProjectSettingsHandler.java         |    8 +-
 .../settings/GetProjectSettingsHandler.java   |    2 +-
 .../UpdateProjectSettingsHandler.java         |    7 +-
 .../CreateProjectSettingsHandlerImpl.java     |   67 +-
 .../DeleteProjectSettingsHandlerImpl.java     |    2 +-
 .../impl/GetProjectSettingsHandlerImpl.java   |    2 +-
 .../UpdateProjectSettingsHandlerImpl.java     |   84 +-
 .../CreateProjectNotificationHandler.java     |    4 +-
 .../CreateProjectNotificationHandlerImpl.java |   25 +-
 .../DeleteProjectNotificationHandlerImpl.java |   32 +-
 .../GetProjectNotificationsHandler.java       |    2 +-
 .../GetProjectNotificationsHandlerImpl.java   |    5 +-
 .../UpdateProjectNotificationHandler.java     |    2 +-
 .../UpdateProjectNotificationHandlerImpl.java |   31 +-
 .../ProjectNotificationValidator.java         |   65 +-
 .../reportportal/core/user/ApiKeyHandler.java |    8 +-
 .../core/user/CreateUserHandler.java          |   16 +-
 .../core/user/DeleteUserHandler.java          |    4 +-
 .../core/user/EditUserHandler.java            |    4 +-
 .../core/user/GetUserHandler.java             |    6 +-
 .../core/user/impl/ApiKeyHandlerImpl.java     |    4 +-
 .../core/user/impl/CreateUserHandlerImpl.java |   18 +-
 .../core/user/impl/DeleteUserHandlerImpl.java |    4 +-
 .../core/user/impl/EditUserHandlerImpl.java   |    5 +-
 .../core/user/impl/GetUserHandlerImpl.java    |    6 +-
 .../core/widget/CreateWidgetHandler.java      |    4 +-
 .../core/widget/GetWidgetHandler.java         |    4 +-
 .../core/widget/UpdateWidgetHandler.java      |   13 +-
 .../HealthCheckTableReadyContentLoader.java   |   69 +-
 .../widget/impl/CreateWidgetHandlerImpl.java  |  144 +-
 .../widget/impl/GetWidgetHandlerImpl.java     |  391 ++--
 .../widget/impl/UpdateWidgetHandlerImpl.java  |  163 +-
 .../service/DemoDashboardsService.java        |  345 ++--
 .../ta/reportportal/job/FlushingDataJob.java  |   36 +-
 .../model/ActivityEventResource.java          |   98 +
 .../epam/ta/reportportal/model/ApiKeyRQ.java  |   50 +
 .../epam/ta/reportportal/model/ApiKeyRS.java  |  112 ++
 .../epam/ta/reportportal/model/ApiKeysRS.java |   49 +
 .../ta/reportportal/model/BaseEntityRQ.java   |   46 +
 .../reportportal/model/BulkInfoUpdateRQ.java  |   91 +
 .../epam/ta/reportportal/model/BulkRQ.java    |   48 +
 .../ta/reportportal/model/CollectionsRQ.java  |   50 +
 .../ta/reportportal/model/DeleteBulkRQ.java   |   51 +
 .../ta/reportportal/model/DeleteBulkRS.java   |   74 +
 .../ta/reportportal/model/EntryCreatedRS.java |   59 +
 .../model/LaunchImportCompletionRS.java       |   42 +
 .../reportportal/model/LaunchImportData.java  |   47 +
 .../ta/reportportal/model/ModelViews.java     |   35 +
 .../model/NestedStepResource.java             |  143 ++
 .../model/OwnedEntityResource.java            |   86 +
 .../com/epam/ta/reportportal/model/Page.java  |  139 ++
 .../ta/reportportal/model/PagedResponse.java  |  118 ++
 .../epam/ta/reportportal/model/Position.java  |   81 +
 .../ta/reportportal/model/SearchCriteria.java |   97 +
 .../reportportal/model/SearchCriteriaRQ.java  |   52 +
 .../com/epam/ta/reportportal/model/Size.java  |   81 +
 .../ta/reportportal/model/SystemInfoRS.java   |   62 +
 .../model/TestItemHistoryElement.java         |   57 +
 .../reportportal/model/TestItemResource.java  |  345 ++++
 .../ta/reportportal/model/TokenCreatedRS.java |   55 +
 .../ta/reportportal/model/WarningAwareRS.java |   40 +
 .../epam/ta/reportportal/model/YesNoRS.java   |   70 +
 .../activity/DashboardActivityResource.java   |   80 +
 .../activity/IntegrationActivityResource.java |   92 +
 .../activity/IssueTypeActivityResource.java   |   56 +
 .../activity/LaunchActivityResource.java      |   68 +
 .../PatternTemplateActivityResource.java      |   74 +
 .../activity/PluginActivityResource.java      |   54 +
 .../ProjectAttributesActivityResource.java    |   72 +
 .../activity/TestItemActivityResource.java    |  140 ++
 .../model/activity/UserActivityResource.java  |   77 +
 .../activity/UserFilterActivityResource.java  |   80 +
 .../activity/WidgetActivityResource.java      |  123 ++
 .../model/analyzer/AnalyzedItemRs.java        |   81 +
 .../model/analyzer/CleanIndexRq.java          |   56 +
 .../reportportal/model/analyzer/IndexRs.java  |   64 +
 .../model/analyzer/IndexRsIndex.java          |  114 ++
 .../model/analyzer/IndexRsItem.java           |   42 +
 .../model/analyzer/RelevantItemInfo.java      |   65 +
 .../reportportal/model/analyzer/SearchRq.java |  106 ++
 .../reportportal/model/analyzer/SearchRs.java |   65 +
 .../model/dashboard/AddWidgetRq.java          |   42 +
 .../model/dashboard/CreateDashboardRQ.java    |   57 +
 .../model/dashboard/DashboardResource.java    |  182 ++
 .../model/dashboard/UpdateDashboardRQ.java    |   66 +
 .../externalsystem/BtsConnectionTestRQ.java   |   52 +
 .../UpdateBugTrackingSystemRQ.java            |   43 +
 .../model/filter/BulkUpdateFilterRQ.java      |   47 +
 .../ta/reportportal/model/filter/Order.java   |   80 +
 .../model/filter/UpdateUserFilterRQ.java      |  112 ++
 .../model/filter/UserFilterCondition.java     |  134 ++
 .../model/filter/UserFilterResource.java      |  126 ++
 .../model/integration/AuthFlowEnum.java       |   28 +
 .../integration/CreateIntegrationRQ.java      |    1 +
 .../model/integration/IntegrationRQ.java      |   61 +
 .../integration/IntegrationResource.java      |  118 ++
 .../integration/IntegrationTypeResource.java  |  108 ++
 .../integration/UpdatePluginStateRQ.java      |   61 +
 .../model/issue/DefineIssueRQ.java            |   56 +
 .../model/issue/IssueDefinition.java          |   66 +
 .../model/item/ExternalIssueRQ.java           |   43 +
 .../model/item/LinkExternalIssueRQ.java       |   56 +
 .../model/item/UnlinkExternalIssueRQ.java     |   55 +
 .../model/item/UpdateTestItemRQ.java          |   68 +
 .../model/launch/AnalyzeLaunchRQ.java         |   86 +
 .../model/launch/FinishLaunchRS.java          |   69 +
 .../model/launch/LaunchImportRQ.java          |   61 +
 .../model/launch/MergeLaunchesRQ.java         |  208 +++
 .../model/launch/UpdateLaunchRQ.java          |   82 +
 .../launch/cluster/CreateClustersRQ.java      |   54 +
 .../model/log/GetLogsUnderRq.java             |   37 +
 .../reportportal/model/log/LogResource.java   |  215 +++
 .../reportportal/model/log/SearchLogRq.java   |   63 +
 .../reportportal/model/log/SearchLogRs.java   |  188 ++
 .../notification/EmailNotificationRQ.java     |   72 +
 .../model/preference/PreferenceResource.java  |   70 +
 .../model/project/AssignUsersRQ.java          |   52 +
 .../model/project/CreateProjectRQ.java        |   77 +
 .../model/project/DeleteProjectRQ.java        |   73 +
 .../model/project/LaunchesPerUser.java        |   61 +
 .../model/project/ProjectConfiguration.java   |   79 +
 .../model/project/ProjectInfoResource.java    |  171 ++
 .../model/project/ProjectResource.java        |  165 ++
 .../model/project/UnassignUsersRQ.java        |   54 +
 .../model/project/UniqueErrorConfig.java      |   36 +
 .../model/project/UpdateProjectRQ.java        |   71 +
 .../project/config/CreateIssueSubTypeRQ.java  |   92 +
 .../project/config/IssueSubTypeCreatedRS.java |   47 +
 .../project/config/IssueSubTypeResource.java  |  109 ++
 .../config/ProjectConfigurationUpdate.java    |   47 +
 .../config/ProjectSettingsResource.java       |   53 +
 .../project/config/UpdateIssueSubTypeRQ.java  |   67 +
 .../config/UpdateOneIssueSubTypeRQ.java       |  105 ++
 .../pattern/CreatePatternTemplateRQ.java      |   90 +
 .../pattern/PatternTemplateResource.java      |   91 +
 .../pattern/UpdatePatternTemplateRQ.java      |   66 +
 .../email/ProjectNotificationConfigDTO.java   |   74 +
 .../model/project/email/SenderCaseDTO.java    |  185 ++
 .../reportportal/model/role/SaveRoleRQ.java   |   65 +
 .../model/settings/AnalyticsResource.java     |   63 +
 .../model/settings/ServerEmailResource.java   |  170 ++
 .../settings/ServerSettingsResource.java      |   82 +
 .../model/user/ChangePasswordRQ.java          |   88 +
 .../model/user/CreateUserBidRS.java           |   58 +
 .../reportportal/model/user/CreateUserRQ.java |   83 +
 .../model/user/CreateUserRQConfirm.java       |  103 +
 .../model/user/CreateUserRQFull.java          |  141 ++
 .../reportportal/model/user/CreateUserRS.java |   60 +
 .../reportportal/model/user/EditUserRQ.java   |   84 +
 .../model/user/ResetPasswordRQ.java           |   92 +
 .../model/user/RestorePasswordRQ.java         |   70 +
 .../model/user/SearchUserResource.java        |   56 +
 .../ta/reportportal/model/user/UserBidRS.java |   63 +
 .../reportportal/model/user/UserResource.java |  181 ++
 .../validation/NotBlankWithSizeValidator.java |   71 +
 .../model/widget/ChartObject.java             |  102 +
 .../model/widget/ContentParameters.java       |   74 +
 .../model/widget/MaterializedWidgetType.java  |   24 +
 .../reportportal/model/widget/SortEntry.java  |   36 +
 .../model/widget/WidgetPreviewRQ.java         |  111 ++
 .../reportportal/model/widget/WidgetRQ.java   |  106 ++
 .../model/widget/WidgetResource.java          |  120 ++
 .../reportportal/util/email/EmailService.java |  102 +-
 .../ws/controller/ActivityController.java     |   83 +-
 .../controller/ActivityEventController.java   |   27 +-
 .../ws/controller/DashboardController.java    |  129 +-
 .../controller/DeprecatedUserController.java  |   36 +-
 .../ws/controller/IntegrationController.java  |   58 +-
 .../ws/controller/LaunchAsyncController.java  |   32 +-
 .../ws/controller/LaunchController.java       |  150 +-
 .../ws/controller/LogController.java          |   84 +-
 .../ws/controller/PluginController.java       |  166 +-
 .../ws/controller/PluginPublicController.java |    7 +-
 .../ws/controller/ProjectController.java      |   97 +-
 .../controller/ProjectSettingsController.java |   46 +-
 .../ws/controller/SettingsController.java     |    4 +-
 .../ws/controller/TestItemController.java     |  228 ++-
 .../ws/controller/UserController.java         |   38 +-
 .../ws/controller/UserFilterController.java   |  225 ++-
 .../ws/controller/WidgetController.java       |  165 +-
 .../ws/converter/LogResourceAssembler.java    |    2 +-
 .../ws/converter/PagedResourcesAssembler.java |   20 +-
 .../converter/TestItemResourceAssembler.java  |    2 +-
 .../converter/builders/DashboardBuilder.java  |  104 +-
 .../builders/PatternTemplateBuilder.java      |    8 +-
 .../ws/converter/builders/UserBuilder.java    |    4 +-
 .../converter/builders/UserFilterBuilder.java |  145 +-
 .../ws/converter/builders/WidgetBuilder.java  |  181 +-
 .../converters/ActivityEventConverter.java    |   22 +-
 .../converter/converters/ApiKeyConverter.java |    2 +-
 .../converters/BaseEntityConverter.java       |   16 +-
 .../converters/DashboardConverter.java        |   52 +-
 .../converters/IntegrationConverter.java      |  101 +-
 .../converters/IntegrationTypeConverter.java  |   25 +-
 .../converters/IssueTypeConverter.java        |   15 +-
 .../converter/converters/LaunchConverter.java |    2 +-
 .../ws/converter/converters/LogConverter.java |    4 +-
 .../NotificationConfigConverter.java          |  140 +-
 .../converters/PatternTemplateConverter.java  |   26 +-
 .../converters/ProjectActivityConverter.java  |   17 +-
 .../converters/ProjectConverter.java          |  148 +-
 .../converters/ProjectSettingsConverter.java  |   57 +-
 .../RestorePasswordBidConverter.java          |    2 +-
 .../converters/TestItemConverter.java         |    6 +-
 .../converter/converters/UserConverter.java   |   94 +-
 .../converters/UserCreationBidConverter.java  |   21 +-
 .../converters/UserFilterConverter.java       |  133 +-
 .../converter/converters/WidgetConverter.java |   12 +-
 .../provider/PathNameUpdaterProvider.java     |   10 +-
 .../item/provider/RetriesUpdaterProvider.java |   14 +-
 .../utils/item/updater/PathNameUpdater.java   |    5 +-
 .../utils/item/updater/RetriesUpdater.java    |    8 +-
 .../ws/rabbit/EmailNotificationConsumer.java  |    2 +-
 .../impl/ActivityEventHandlerTest.java        |    5 +-
 .../auto/impl/AnalyzerServiceServiceTest.java |   25 +-
 .../analyzer/auto/impl/AnalyzerUtilsTest.java |   41 +-
 .../auto/impl/LogIndexerServiceTest.java      |   22 +-
 .../auto/impl/SearchLogServiceImplTest.java   |   26 +-
 .../LaunchAutoAnalysisStrategyTest.java       |   21 +-
 .../LaunchPatternAnalysisStrategyTest.java    |   16 +-
 .../impl/CreateDashboardHandlerImplTest.java  |   11 +-
 .../events/activity/DashboardEventsTest.java  |    2 +-
 .../events/activity/DefectTypeEventsTest.java |    2 +-
 .../events/activity/FilterEventsTest.java     |   28 +-
 .../activity/IntegrationEventsTest.java       |    2 +-
 .../ItemIssueTypeDefinedEventTest.java        |   22 +-
 .../events/activity/LaunchEventsTest.java     |    2 +-
 .../events/activity/LinkTicketEventTest.java  |   13 +-
 .../activity/PatternTemplateEventsTest.java   |    2 +-
 .../activity/ProjectConfigEventTest.java      |  102 +-
 .../TestItemStatusChangedEventTest.java       |   11 +-
 .../activity/TicketPostedEventTest.java       |   14 +-
 .../events/activity/UserCreatedEventTest.java |    2 +-
 .../events/activity/WidgetEventsTest.java     |  115 +-
 .../handler/DefectTypeDeletedHandlerTest.java |   24 +-
 .../impl/SearchCriteriaServiceTest.java       |   50 +-
 .../impl/UpdateUserFilterHandlerTest.java     |  209 ++-
 .../imprt/ImportLaunchHandlerImplTest.java    |    8 +-
 .../core/imprt/XmlImportStrategyTest.java     |   12 +-
 .../impl/GetIntegrationHandlerTest.java       |   44 +-
 .../plugin/impl/CreatePluginHandlerTest.java  |    2 +-
 .../plugin/impl/UpdatePluginHandlerTest.java  |    2 +-
 .../impl/UpdateTestItemHandlerImplTest.java   |    4 +-
 .../impl/FinishLaunchHandlerImplTest.java     |   76 +-
 .../launch/impl/GetLaunchHandlerImplTest.java |   67 +-
 .../impl/UpdateLaunchHandlerImplTest.java     |   23 +-
 .../util/MergeLaunchesSerializerTest.java     |   72 +
 .../impl/CreateProjectHandlerImplTest.java    |   19 +-
 .../impl/GetProjectHandlerImplTest.java       |  187 +-
 .../ProjectInfoWidgetDataConverterTest.java   |  117 +-
 .../CreateProjectSettingsHandlerImplTest.java |   23 +-
 .../UpdateProjectSettingsHandlerImplTest.java |   22 +-
 ...ateProjectNotificationHandlerImplTest.java |   67 +-
 ...etProjectNotificationsHandlerImplTest.java |    6 +-
 ...ateProjectNotificationHandlerImplTest.java |   57 +-
 .../user/impl/CreateUserHandlerImplTest.java  |   92 +-
 .../user/impl/EditUserHandlerImplTest.java    |   91 +-
 .../user/impl/GetUserHandlerImplTest.java     |   10 +-
 ...lthCheckTableReadyContentResolverTest.java |   22 +-
 ...ponentHealthCheckContentValidatorTest.java |    4 +-
 .../BugTrackingSystemControllerTest.java      |    4 +-
 .../controller/DashboardControllerTest.java   |  185 +-
 .../DashboardControllerValidationTest.java    |    2 +-
 .../controller/IntegrationControllerTest.java |    2 +-
 .../controller/LaunchAsyncControllerTest.java |   90 +-
 .../ws/controller/LaunchControllerTest.java   |  148 +-
 .../LaunchControllerValidationTest.java       |    2 +-
 .../ws/controller/LogControllerTest.java      |    2 +-
 .../ws/controller/ProjectControllerTest.java  |   16 +-
 .../ProjectSettingsControllerTest.java        |   85 +-
 .../ws/controller/SettingsControllerTest.java |   10 +-
 .../ws/controller/TestItemControllerTest.java |   10 +-
 .../TestItemControllerValidationTest.java     |    8 +-
 .../ws/controller/UserControllerTest.java     |    6 +-
 .../controller/UserFilterControllerTest.java  |  342 ++--
 .../UserFilterControllerValidationTest.java   |  137 +-
 .../ws/controller/WidgetControllerTest.java   | 1659 +++++++++--------
 .../WidgetControllerValidationTest.java       |  452 ++---
 .../converter/LogResourceAssemblerTest.java   |    2 +-
 .../builders/DashboardBuilderTest.java        |  100 +-
 .../builders/PatternTemplateBuilderTest.java  |    2 +-
 .../converter/builders/UserBuilderTest.java   |    2 +-
 .../builders/UserFilterBuilderTest.java       |   75 +-
 .../converter/builders/WidgetBuilderTest.java |  111 +-
 .../converters/DashboardConverterTest.java    |  115 +-
 .../converters/IntegrationConverterTest.java  |   26 +-
 .../converters/LogConverterTest.java          |    8 +-
 .../NotificationConfigConverterTest.java      |  175 +-
 .../PatternTemplateConverterTest.java         |    8 +-
 .../ProjectActivityConverterTest.java         |   10 +-
 .../RestorePasswordBidConverterTest.java      |    2 +-
 .../converters/TestItemConverterTest.java     |   83 +-
 .../converters/UserConverterTest.java         |  114 +-
 .../UserCreationBidConverterTest.java         |    2 +-
 .../converters/WidgetConverterTest.java       |  273 +--
 ...JaskonRequiredPropertiesValidatorTest.java |    2 +-
 .../reportportal/ws/validation/PageTest.java  |   47 +
 .../ws/validation/TicketsValidationTest.java  |  128 ++
 .../ws/validation/WidgetRqValidatorTest.java  |   76 +
 444 files changed, 18444 insertions(+), 7634 deletions(-)
 create mode 100644 src/main/java/com/epam/ta/reportportal/core/events/annotations/WidgetLimitRange.java
 create mode 100644 src/main/java/com/epam/ta/reportportal/core/events/annotations/WidgetLimitRangeValidator.java
 create mode 100644 src/main/java/com/epam/ta/reportportal/model/ActivityEventResource.java
 create mode 100644 src/main/java/com/epam/ta/reportportal/model/ApiKeyRQ.java
 create mode 100644 src/main/java/com/epam/ta/reportportal/model/ApiKeyRS.java
 create mode 100644 src/main/java/com/epam/ta/reportportal/model/ApiKeysRS.java
 create mode 100644 src/main/java/com/epam/ta/reportportal/model/BaseEntityRQ.java
 create mode 100644 src/main/java/com/epam/ta/reportportal/model/BulkInfoUpdateRQ.java
 create mode 100644 src/main/java/com/epam/ta/reportportal/model/BulkRQ.java
 create mode 100644 src/main/java/com/epam/ta/reportportal/model/CollectionsRQ.java
 create mode 100644 src/main/java/com/epam/ta/reportportal/model/DeleteBulkRQ.java
 create mode 100644 src/main/java/com/epam/ta/reportportal/model/DeleteBulkRS.java
 create mode 100644 src/main/java/com/epam/ta/reportportal/model/EntryCreatedRS.java
 create mode 100644 src/main/java/com/epam/ta/reportportal/model/LaunchImportCompletionRS.java
 create mode 100644 src/main/java/com/epam/ta/reportportal/model/LaunchImportData.java
 create mode 100644 src/main/java/com/epam/ta/reportportal/model/ModelViews.java
 create mode 100644 src/main/java/com/epam/ta/reportportal/model/NestedStepResource.java
 create mode 100644 src/main/java/com/epam/ta/reportportal/model/OwnedEntityResource.java
 create mode 100644 src/main/java/com/epam/ta/reportportal/model/Page.java
 create mode 100644 src/main/java/com/epam/ta/reportportal/model/PagedResponse.java
 create mode 100644 src/main/java/com/epam/ta/reportportal/model/Position.java
 create mode 100644 src/main/java/com/epam/ta/reportportal/model/SearchCriteria.java
 create mode 100644 src/main/java/com/epam/ta/reportportal/model/SearchCriteriaRQ.java
 create mode 100644 src/main/java/com/epam/ta/reportportal/model/Size.java
 create mode 100644 src/main/java/com/epam/ta/reportportal/model/SystemInfoRS.java
 create mode 100644 src/main/java/com/epam/ta/reportportal/model/TestItemHistoryElement.java
 create mode 100644 src/main/java/com/epam/ta/reportportal/model/TestItemResource.java
 create mode 100644 src/main/java/com/epam/ta/reportportal/model/TokenCreatedRS.java
 create mode 100644 src/main/java/com/epam/ta/reportportal/model/WarningAwareRS.java
 create mode 100644 src/main/java/com/epam/ta/reportportal/model/YesNoRS.java
 create mode 100644 src/main/java/com/epam/ta/reportportal/model/activity/DashboardActivityResource.java
 create mode 100644 src/main/java/com/epam/ta/reportportal/model/activity/IntegrationActivityResource.java
 create mode 100644 src/main/java/com/epam/ta/reportportal/model/activity/IssueTypeActivityResource.java
 create mode 100644 src/main/java/com/epam/ta/reportportal/model/activity/LaunchActivityResource.java
 create mode 100644 src/main/java/com/epam/ta/reportportal/model/activity/PatternTemplateActivityResource.java
 create mode 100644 src/main/java/com/epam/ta/reportportal/model/activity/PluginActivityResource.java
 create mode 100644 src/main/java/com/epam/ta/reportportal/model/activity/ProjectAttributesActivityResource.java
 create mode 100644 src/main/java/com/epam/ta/reportportal/model/activity/TestItemActivityResource.java
 create mode 100644 src/main/java/com/epam/ta/reportportal/model/activity/UserActivityResource.java
 create mode 100644 src/main/java/com/epam/ta/reportportal/model/activity/UserFilterActivityResource.java
 create mode 100644 src/main/java/com/epam/ta/reportportal/model/activity/WidgetActivityResource.java
 create mode 100644 src/main/java/com/epam/ta/reportportal/model/analyzer/AnalyzedItemRs.java
 create mode 100644 src/main/java/com/epam/ta/reportportal/model/analyzer/CleanIndexRq.java
 create mode 100644 src/main/java/com/epam/ta/reportportal/model/analyzer/IndexRs.java
 create mode 100644 src/main/java/com/epam/ta/reportportal/model/analyzer/IndexRsIndex.java
 create mode 100644 src/main/java/com/epam/ta/reportportal/model/analyzer/IndexRsItem.java
 create mode 100644 src/main/java/com/epam/ta/reportportal/model/analyzer/RelevantItemInfo.java
 create mode 100644 src/main/java/com/epam/ta/reportportal/model/analyzer/SearchRq.java
 create mode 100644 src/main/java/com/epam/ta/reportportal/model/analyzer/SearchRs.java
 create mode 100644 src/main/java/com/epam/ta/reportportal/model/dashboard/AddWidgetRq.java
 create mode 100644 src/main/java/com/epam/ta/reportportal/model/dashboard/CreateDashboardRQ.java
 create mode 100644 src/main/java/com/epam/ta/reportportal/model/dashboard/DashboardResource.java
 create mode 100644 src/main/java/com/epam/ta/reportportal/model/dashboard/UpdateDashboardRQ.java
 create mode 100644 src/main/java/com/epam/ta/reportportal/model/externalsystem/BtsConnectionTestRQ.java
 create mode 100644 src/main/java/com/epam/ta/reportportal/model/externalsystem/UpdateBugTrackingSystemRQ.java
 create mode 100644 src/main/java/com/epam/ta/reportportal/model/filter/BulkUpdateFilterRQ.java
 create mode 100644 src/main/java/com/epam/ta/reportportal/model/filter/Order.java
 create mode 100644 src/main/java/com/epam/ta/reportportal/model/filter/UpdateUserFilterRQ.java
 create mode 100644 src/main/java/com/epam/ta/reportportal/model/filter/UserFilterCondition.java
 create mode 100644 src/main/java/com/epam/ta/reportportal/model/filter/UserFilterResource.java
 create mode 100644 src/main/java/com/epam/ta/reportportal/model/integration/AuthFlowEnum.java
 create mode 100644 src/main/java/com/epam/ta/reportportal/model/integration/CreateIntegrationRQ.java
 create mode 100644 src/main/java/com/epam/ta/reportportal/model/integration/IntegrationRQ.java
 create mode 100644 src/main/java/com/epam/ta/reportportal/model/integration/IntegrationResource.java
 create mode 100644 src/main/java/com/epam/ta/reportportal/model/integration/IntegrationTypeResource.java
 create mode 100644 src/main/java/com/epam/ta/reportportal/model/integration/UpdatePluginStateRQ.java
 create mode 100644 src/main/java/com/epam/ta/reportportal/model/issue/DefineIssueRQ.java
 create mode 100644 src/main/java/com/epam/ta/reportportal/model/issue/IssueDefinition.java
 create mode 100644 src/main/java/com/epam/ta/reportportal/model/item/ExternalIssueRQ.java
 create mode 100644 src/main/java/com/epam/ta/reportportal/model/item/LinkExternalIssueRQ.java
 create mode 100644 src/main/java/com/epam/ta/reportportal/model/item/UnlinkExternalIssueRQ.java
 create mode 100644 src/main/java/com/epam/ta/reportportal/model/item/UpdateTestItemRQ.java
 create mode 100644 src/main/java/com/epam/ta/reportportal/model/launch/AnalyzeLaunchRQ.java
 create mode 100644 src/main/java/com/epam/ta/reportportal/model/launch/FinishLaunchRS.java
 create mode 100644 src/main/java/com/epam/ta/reportportal/model/launch/LaunchImportRQ.java
 create mode 100644 src/main/java/com/epam/ta/reportportal/model/launch/MergeLaunchesRQ.java
 create mode 100644 src/main/java/com/epam/ta/reportportal/model/launch/UpdateLaunchRQ.java
 create mode 100644 src/main/java/com/epam/ta/reportportal/model/launch/cluster/CreateClustersRQ.java
 create mode 100644 src/main/java/com/epam/ta/reportportal/model/log/GetLogsUnderRq.java
 create mode 100644 src/main/java/com/epam/ta/reportportal/model/log/LogResource.java
 create mode 100644 src/main/java/com/epam/ta/reportportal/model/log/SearchLogRq.java
 create mode 100644 src/main/java/com/epam/ta/reportportal/model/log/SearchLogRs.java
 create mode 100644 src/main/java/com/epam/ta/reportportal/model/notification/EmailNotificationRQ.java
 create mode 100644 src/main/java/com/epam/ta/reportportal/model/preference/PreferenceResource.java
 create mode 100644 src/main/java/com/epam/ta/reportportal/model/project/AssignUsersRQ.java
 create mode 100644 src/main/java/com/epam/ta/reportportal/model/project/CreateProjectRQ.java
 create mode 100644 src/main/java/com/epam/ta/reportportal/model/project/DeleteProjectRQ.java
 create mode 100644 src/main/java/com/epam/ta/reportportal/model/project/LaunchesPerUser.java
 create mode 100644 src/main/java/com/epam/ta/reportportal/model/project/ProjectConfiguration.java
 create mode 100644 src/main/java/com/epam/ta/reportportal/model/project/ProjectInfoResource.java
 create mode 100644 src/main/java/com/epam/ta/reportportal/model/project/ProjectResource.java
 create mode 100644 src/main/java/com/epam/ta/reportportal/model/project/UnassignUsersRQ.java
 create mode 100644 src/main/java/com/epam/ta/reportportal/model/project/UniqueErrorConfig.java
 create mode 100644 src/main/java/com/epam/ta/reportportal/model/project/UpdateProjectRQ.java
 create mode 100644 src/main/java/com/epam/ta/reportportal/model/project/config/CreateIssueSubTypeRQ.java
 create mode 100644 src/main/java/com/epam/ta/reportportal/model/project/config/IssueSubTypeCreatedRS.java
 create mode 100644 src/main/java/com/epam/ta/reportportal/model/project/config/IssueSubTypeResource.java
 create mode 100644 src/main/java/com/epam/ta/reportportal/model/project/config/ProjectConfigurationUpdate.java
 create mode 100644 src/main/java/com/epam/ta/reportportal/model/project/config/ProjectSettingsResource.java
 create mode 100644 src/main/java/com/epam/ta/reportportal/model/project/config/UpdateIssueSubTypeRQ.java
 create mode 100644 src/main/java/com/epam/ta/reportportal/model/project/config/UpdateOneIssueSubTypeRQ.java
 create mode 100644 src/main/java/com/epam/ta/reportportal/model/project/config/pattern/CreatePatternTemplateRQ.java
 create mode 100644 src/main/java/com/epam/ta/reportportal/model/project/config/pattern/PatternTemplateResource.java
 create mode 100644 src/main/java/com/epam/ta/reportportal/model/project/config/pattern/UpdatePatternTemplateRQ.java
 create mode 100644 src/main/java/com/epam/ta/reportportal/model/project/email/ProjectNotificationConfigDTO.java
 create mode 100644 src/main/java/com/epam/ta/reportportal/model/project/email/SenderCaseDTO.java
 create mode 100644 src/main/java/com/epam/ta/reportportal/model/role/SaveRoleRQ.java
 create mode 100644 src/main/java/com/epam/ta/reportportal/model/settings/AnalyticsResource.java
 create mode 100644 src/main/java/com/epam/ta/reportportal/model/settings/ServerEmailResource.java
 create mode 100644 src/main/java/com/epam/ta/reportportal/model/settings/ServerSettingsResource.java
 create mode 100644 src/main/java/com/epam/ta/reportportal/model/user/ChangePasswordRQ.java
 create mode 100644 src/main/java/com/epam/ta/reportportal/model/user/CreateUserBidRS.java
 create mode 100644 src/main/java/com/epam/ta/reportportal/model/user/CreateUserRQ.java
 create mode 100644 src/main/java/com/epam/ta/reportportal/model/user/CreateUserRQConfirm.java
 create mode 100644 src/main/java/com/epam/ta/reportportal/model/user/CreateUserRQFull.java
 create mode 100644 src/main/java/com/epam/ta/reportportal/model/user/CreateUserRS.java
 create mode 100644 src/main/java/com/epam/ta/reportportal/model/user/EditUserRQ.java
 create mode 100644 src/main/java/com/epam/ta/reportportal/model/user/ResetPasswordRQ.java
 create mode 100644 src/main/java/com/epam/ta/reportportal/model/user/RestorePasswordRQ.java
 create mode 100644 src/main/java/com/epam/ta/reportportal/model/user/SearchUserResource.java
 create mode 100644 src/main/java/com/epam/ta/reportportal/model/user/UserBidRS.java
 create mode 100644 src/main/java/com/epam/ta/reportportal/model/user/UserResource.java
 create mode 100644 src/main/java/com/epam/ta/reportportal/model/validation/NotBlankWithSizeValidator.java
 create mode 100644 src/main/java/com/epam/ta/reportportal/model/widget/ChartObject.java
 create mode 100644 src/main/java/com/epam/ta/reportportal/model/widget/ContentParameters.java
 create mode 100644 src/main/java/com/epam/ta/reportportal/model/widget/MaterializedWidgetType.java
 create mode 100644 src/main/java/com/epam/ta/reportportal/model/widget/SortEntry.java
 create mode 100644 src/main/java/com/epam/ta/reportportal/model/widget/WidgetPreviewRQ.java
 create mode 100644 src/main/java/com/epam/ta/reportportal/model/widget/WidgetRQ.java
 create mode 100644 src/main/java/com/epam/ta/reportportal/model/widget/WidgetResource.java
 create mode 100644 src/test/java/com/epam/ta/reportportal/core/launch/util/MergeLaunchesSerializerTest.java
 create mode 100644 src/test/java/com/epam/ta/reportportal/ws/validation/PageTest.java
 create mode 100644 src/test/java/com/epam/ta/reportportal/ws/validation/TicketsValidationTest.java
 create mode 100644 src/test/java/com/epam/ta/reportportal/ws/validation/WidgetRqValidatorTest.java

diff --git a/build.gradle b/build.gradle
index 5e678f891c..e4691227dd 100644
--- a/build.gradle
+++ b/build.gradle
@@ -73,9 +73,9 @@ dependencies {
         implementation 'com.epam.reportportal:plugin-api'
     } else {
         implementation 'com.github.reportportal:commons-events:e337f8b7be'
-        implementation 'com.github.reportportal:commons-dao:5ac2052'
+        implementation 'com.github.reportportal:commons-dao:458b67ab61'
         implementation 'com.github.reportportal:commons-rules:42d4dd5634'
-        implementation 'com.github.reportportal:commons-model:3251388'
+        implementation 'com.github.reportportal:commons-model:5739c3c347'
         implementation 'com.github.reportportal:commons:07566b8e'
         implementation 'com.github.reportportal:commons-fonts:d6e62dd'
         implementation 'com.github.reportportal:plugin-api:0ccfed880c'
@@ -180,7 +180,8 @@ dependencyCheck {
 }
 
 bootJar {
-    project.hasProperty('gcp') ? getArchiveFileName().set('app.jar') : archiveClassifier.set('exec')
+    project.hasProperty('gcp') ? getArchiveFileName().set('app.jar') : archiveClassifier.set('' +
+            'exec')
 }
 jar.enabled(true)
 jar.archiveClassifier.set('')
diff --git a/project-properties.gradle b/project-properties.gradle
index feec486eed..ec95f6a42b 100755
--- a/project-properties.gradle
+++ b/project-properties.gradle
@@ -77,7 +77,8 @@ project.ext {
                     '**/job/FlushingDataJob**',
                     "**/core/analyzer/auto/client/model/**",
                     '**/core/analyzer/auto/impl/SuggestedItem**',
-                    '**/core/item/impl/provider/impl/mock/**'
+                    '**/core/item/impl/provider/impl/mock/**',
+                    '**/model/**'
     ]
 }
 
diff --git a/src/main/java/com/epam/ta/reportportal/core/activity/ActivityHandler.java b/src/main/java/com/epam/ta/reportportal/core/activity/ActivityHandler.java
index e795b03a7b..7f4d841322 100644
--- a/src/main/java/com/epam/ta/reportportal/core/activity/ActivityHandler.java
+++ b/src/main/java/com/epam/ta/reportportal/core/activity/ActivityHandler.java
@@ -14,12 +14,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package com.epam.ta.reportportal.core.activity;
 
 import com.epam.ta.reportportal.commons.ReportPortalUser;
 import com.epam.ta.reportportal.commons.querygen.Filter;
 import com.epam.ta.reportportal.commons.querygen.Queryable;
-import com.epam.ta.reportportal.ws.model.ActivityEventResource;
+import com.epam.ta.reportportal.model.ActivityEventResource;
 import com.epam.ta.reportportal.ws.model.ActivityResource;
 import org.springframework.data.domain.Pageable;
 
@@ -32,16 +33,15 @@ public interface ActivityHandler {
    * Load list of {@link com.epam.ta.reportportal.ws.model.ActivityResource} for specified
    * {@link com.epam.ta.reportportal.entity.item.TestItem}
    *
-   * @param projectDetails     Details of project
-   *                           {@link com.epam.ta.reportportal.commons.ReportPortalUser.ProjectDetails}
-   * @param filter             Filter
-   * @param pageable           Page Details
-   * @param predefinedFilter   Additional filter
+   * @param projectDetails   Details of project
+   *                         {@link com.epam.ta.reportportal.commons.ReportPortalUser.ProjectDetails}
+   * @param filter           Filter
+   * @param pageable         Page Details
+   * @param predefinedFilter Additional filter
    * @return Found activities
    */
   Iterable<ActivityResource> getActivitiesHistory(ReportPortalUser.ProjectDetails projectDetails,
-      Filter filter,
-      Queryable predefinedFilter, Pageable pageable);
+      Filter filter, Queryable predefinedFilter, Pageable pageable);
 
   /**
    * Load {@link com.epam.ta.reportportal.ws.model.ActivityResource}
@@ -53,23 +53,22 @@ Iterable<ActivityResource> getActivitiesHistory(ReportPortalUser.ProjectDetails
    */
   ActivityResource getActivity(ReportPortalUser.ProjectDetails projectDetails, Long activityId);
 
-	/**
-	 * Load list of {@link com.epam.ta.reportportal.ws.model.ActivityEventResource} for specified
-	 * {@link com.epam.ta.reportportal.entity.item.TestItem}
-	 *
-	 * @param projectDetails Details of project
-	 *                       {@link com.epam.ta.reportportal.commons.ReportPortalUser.ProjectDetails}
-	 * @param itemId         ID of test item
-	 * @param filter         Filter
-	 * @param pageable       Page Details
-	 * @return Found activities
-	 */
-	Iterable<ActivityEventResource> getItemActivities(ReportPortalUser.ProjectDetails projectDetails,
-			Long itemId, Filter filter,
-			Pageable pageable);
+  /**
+   * Load list of {@link ActivityEventResource} for specified
+   * {@link com.epam.ta.reportportal.entity.item.TestItem}
+   *
+   * @param projectDetails Details of project
+   *                       {@link com.epam.ta.reportportal.commons.ReportPortalUser.ProjectDetails}
+   * @param itemId         ID of test item
+   * @param filter         Filter
+   * @param pageable       Page Details
+   * @return Found activities
+   */
+  Iterable<ActivityEventResource> getItemActivities(ReportPortalUser.ProjectDetails projectDetails,
+      Long itemId, Filter filter, Pageable pageable);
 
   /**
-   * Load list of {@link com.epam.ta.reportportal.ws.model.ActivityResource} for specified
+   * Load list of {@link ActivityResource} for specified
    * {@link com.epam.ta.reportportal.entity.project.Project}
    *
    * @param projectDetails Details of project {@link ReportPortalUser.ProjectDetails}
diff --git a/src/main/java/com/epam/ta/reportportal/core/activity/impl/ActivityHandlerImpl.java b/src/main/java/com/epam/ta/reportportal/core/activity/impl/ActivityHandlerImpl.java
index a14b93f9d9..2ea2d99b3c 100644
--- a/src/main/java/com/epam/ta/reportportal/core/activity/impl/ActivityHandlerImpl.java
+++ b/src/main/java/com/epam/ta/reportportal/core/activity/impl/ActivityHandlerImpl.java
@@ -46,10 +46,10 @@
 import com.epam.ta.reportportal.entity.item.TestItem;
 import com.epam.ta.reportportal.entity.launch.Launch;
 import com.epam.ta.reportportal.exception.ReportPortalException;
+import com.epam.ta.reportportal.model.ActivityEventResource;
 import com.epam.ta.reportportal.ws.converter.PagedResourcesAssembler;
 import com.epam.ta.reportportal.ws.converter.converters.ActivityConverter;
 import com.epam.ta.reportportal.ws.converter.converters.ActivityEventConverter;
-import com.epam.ta.reportportal.ws.model.ActivityEventResource;
 import com.epam.ta.reportportal.ws.model.ActivityResource;
 import com.epam.ta.reportportal.ws.model.ErrorType;
 import java.util.function.Predicate;
diff --git a/src/main/java/com/epam/ta/reportportal/core/activityevent/ActivityEventHandler.java b/src/main/java/com/epam/ta/reportportal/core/activityevent/ActivityEventHandler.java
index 398e503048..5fa60a2bd4 100644
--- a/src/main/java/com/epam/ta/reportportal/core/activityevent/ActivityEventHandler.java
+++ b/src/main/java/com/epam/ta/reportportal/core/activityevent/ActivityEventHandler.java
@@ -18,12 +18,11 @@
 
 import com.epam.ta.reportportal.commons.ReportPortalUser;
 import com.epam.ta.reportportal.commons.querygen.Queryable;
-import com.epam.ta.reportportal.ws.model.ActivityEventResource;
-import com.epam.ta.reportportal.ws.model.PagedResponse;
+import com.epam.ta.reportportal.model.ActivityEventResource;
+import com.epam.ta.reportportal.model.PagedResponse;
 import java.util.List;
 import org.springframework.data.domain.Pageable;
 
-
 /**
  * Activity Event Handler.
  *
diff --git a/src/main/java/com/epam/ta/reportportal/core/activityevent/impl/ActivityEventHandlerImpl.java b/src/main/java/com/epam/ta/reportportal/core/activityevent/impl/ActivityEventHandlerImpl.java
index bb1db79398..1b8b18b1b0 100644
--- a/src/main/java/com/epam/ta/reportportal/core/activityevent/impl/ActivityEventHandlerImpl.java
+++ b/src/main/java/com/epam/ta/reportportal/core/activityevent/impl/ActivityEventHandlerImpl.java
@@ -24,11 +24,11 @@
 import com.epam.ta.reportportal.core.activityevent.ActivityEventHandler;
 import com.epam.ta.reportportal.dao.ActivityRepository;
 import com.epam.ta.reportportal.entity.activity.Activity;
+import com.epam.ta.reportportal.model.ActivityEventResource;
+import com.epam.ta.reportportal.model.PagedResponse;
 import com.epam.ta.reportportal.ws.converter.PagedResourcesAssembler;
 import com.epam.ta.reportportal.ws.converter.converters.ActivityEventConverter;
-import com.epam.ta.reportportal.ws.model.ActivityEventResource;
 import com.epam.ta.reportportal.ws.model.ErrorType;
-import com.epam.ta.reportportal.ws.model.PagedResponse;
 import java.util.List;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
@@ -42,8 +42,8 @@
 @Service
 public class ActivityEventHandlerImpl implements ActivityEventHandler {
 
-  private static final String LENGTH_LESS_THAN_1_SYMBOL_MSG = "Length of the filtering string "
-      + "'{}' is less than 1 symbol";
+  private static final String LENGTH_LESS_THAN_1_SYMBOL_MSG =
+      "Length of the filtering string " + "'{}' is less than 1 symbol";
 
   private final ActivityRepository activityRepository;
 
@@ -55,8 +55,7 @@ public ActivityEventHandlerImpl(ActivityRepository activityRepository) {
   public PagedResponse<ActivityEventResource> getActivityEventsHistory(Queryable filter,
       Pageable pageable) {
     Page<Activity> activityPage = activityRepository.findByFilter(filter, pageable);
-    return PagedResourcesAssembler
-        .pagedResponseConverter(ActivityEventConverter.TO_RESOURCE)
+    return PagedResourcesAssembler.pagedResponseConverter(ActivityEventConverter.TO_RESOURCE)
         .apply(activityPage);
   }
 
@@ -68,8 +67,9 @@ public List<String> getSubjectNames(ProjectDetails projectDetails, String value)
   }
 
   private void checkBusinessRuleLessThan1Symbol(String value) {
-    BusinessRule.expect(value.length() >= 1, Predicates.equalTo(true))
-        .verify(ErrorType.INCORRECT_FILTER_PARAMETERS,
-            Suppliers.formattedSupplier(LENGTH_LESS_THAN_1_SYMBOL_MSG, value));
+    BusinessRule.expect(value.length() >= 1, Predicates.equalTo(true)).verify(
+        ErrorType.INCORRECT_FILTER_PARAMETERS,
+        Suppliers.formattedSupplier(LENGTH_LESS_THAN_1_SYMBOL_MSG, value)
+    );
   }
 }
diff --git a/src/main/java/com/epam/ta/reportportal/core/admin/ServerAdminHandler.java b/src/main/java/com/epam/ta/reportportal/core/admin/ServerAdminHandler.java
index 591afac049..4f407a8db7 100644
--- a/src/main/java/com/epam/ta/reportportal/core/admin/ServerAdminHandler.java
+++ b/src/main/java/com/epam/ta/reportportal/core/admin/ServerAdminHandler.java
@@ -16,9 +16,9 @@
 
 package com.epam.ta.reportportal.core.admin;
 
+import com.epam.ta.reportportal.model.settings.AnalyticsResource;
+import com.epam.ta.reportportal.model.settings.ServerSettingsResource;
 import com.epam.ta.reportportal.ws.model.OperationCompletionRS;
-import com.epam.ta.reportportal.ws.model.settings.AnalyticsResource;
-import com.epam.ta.reportportal.ws.model.settings.ServerSettingsResource;
 import java.util.Map;
 
 /**
diff --git a/src/main/java/com/epam/ta/reportportal/core/admin/ServerAdminHandlerImpl.java b/src/main/java/com/epam/ta/reportportal/core/admin/ServerAdminHandlerImpl.java
index feb792b1d6..d0af43eef8 100644
--- a/src/main/java/com/epam/ta/reportportal/core/admin/ServerAdminHandlerImpl.java
+++ b/src/main/java/com/epam/ta/reportportal/core/admin/ServerAdminHandlerImpl.java
@@ -22,9 +22,9 @@
 
 import com.epam.ta.reportportal.dao.ServerSettingsRepository;
 import com.epam.ta.reportportal.entity.ServerSettings;
+import com.epam.ta.reportportal.model.settings.AnalyticsResource;
 import com.epam.ta.reportportal.ws.converter.converters.ServerSettingsConverter;
 import com.epam.ta.reportportal.ws.model.OperationCompletionRS;
-import com.epam.ta.reportportal.ws.model.settings.AnalyticsResource;
 import java.util.Map;
 import java.util.stream.Collectors;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -54,17 +54,17 @@ public Map<String, String> getServerSettings() {
   @Override
   public OperationCompletionRS saveAnalyticsSettings(AnalyticsResource analyticsResource) {
     String analyticsType = analyticsResource.getType();
-    Map<String, ServerSettings> serverAnalyticsDetails = findServerSettings().entrySet()
-        .stream()
+    Map<String, ServerSettings> serverAnalyticsDetails = findServerSettings().entrySet().stream()
         .filter(entry -> entry.getKey().startsWith(ANALYTICS_CONFIG_PREFIX))
         .collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue));
 
-    String formattedAnalyticsType = analyticsType.startsWith(ANALYTICS_CONFIG_PREFIX) ?
-        analyticsType :
-        ANALYTICS_CONFIG_PREFIX + analyticsType;
+    String formattedAnalyticsType =
+        analyticsType.startsWith(ANALYTICS_CONFIG_PREFIX) ? analyticsType :
+            ANALYTICS_CONFIG_PREFIX + analyticsType;
 
-    ServerSettings analyticsDetails = ofNullable(
-        serverAnalyticsDetails.get(formattedAnalyticsType)).orElseGet(ServerSettings::new);
+    ServerSettings analyticsDetails =
+        ofNullable(serverAnalyticsDetails.get(formattedAnalyticsType)).orElseGet(
+            ServerSettings::new);
     analyticsDetails.setKey(formattedAnalyticsType);
     analyticsDetails.setValue(
         String.valueOf((ofNullable(analyticsResource.getEnabled()).orElse(false))));
@@ -74,8 +74,7 @@ public OperationCompletionRS saveAnalyticsSettings(AnalyticsResource analyticsRe
   }
 
   private Map<String, ServerSettings> findServerSettings() {
-    return serverSettingsRepository.selectServerSettings()
-        .stream()
+    return serverSettingsRepository.selectServerSettings().stream()
         .collect(toMap(ServerSettings::getKey, s -> s, (prev, curr) -> prev));
   }
 }
\ No newline at end of file
diff --git a/src/main/java/com/epam/ta/reportportal/core/analyzer/auto/SearchLogService.java b/src/main/java/com/epam/ta/reportportal/core/analyzer/auto/SearchLogService.java
index e6913b8035..2e4d880ae5 100644
--- a/src/main/java/com/epam/ta/reportportal/core/analyzer/auto/SearchLogService.java
+++ b/src/main/java/com/epam/ta/reportportal/core/analyzer/auto/SearchLogService.java
@@ -17,8 +17,8 @@
 package com.epam.ta.reportportal.core.analyzer.auto;
 
 import com.epam.ta.reportportal.commons.ReportPortalUser;
-import com.epam.ta.reportportal.ws.model.log.SearchLogRq;
-import com.epam.ta.reportportal.ws.model.log.SearchLogRs;
+import com.epam.ta.reportportal.model.log.SearchLogRq;
+import com.epam.ta.reportportal.model.log.SearchLogRs;
 
 /**
  * @author <a href="mailto:ihar_kahadouski@epam.com">Ihar Kahadouski</a>
diff --git a/src/main/java/com/epam/ta/reportportal/core/analyzer/auto/client/AnalyzerServiceClient.java b/src/main/java/com/epam/ta/reportportal/core/analyzer/auto/client/AnalyzerServiceClient.java
index f6fdd5b19e..2e0c78334d 100644
--- a/src/main/java/com/epam/ta/reportportal/core/analyzer/auto/client/AnalyzerServiceClient.java
+++ b/src/main/java/com/epam/ta/reportportal/core/analyzer/auto/client/AnalyzerServiceClient.java
@@ -21,10 +21,10 @@
 import com.epam.ta.reportportal.core.analyzer.auto.client.model.SuggestRq;
 import com.epam.ta.reportportal.core.analyzer.auto.client.model.cluster.ClusterData;
 import com.epam.ta.reportportal.core.analyzer.auto.client.model.cluster.GenerateClustersRq;
-import com.epam.ta.reportportal.ws.model.analyzer.AnalyzedItemRs;
+import com.epam.ta.reportportal.model.analyzer.AnalyzedItemRs;
+import com.epam.ta.reportportal.model.analyzer.SearchRq;
+import com.epam.ta.reportportal.model.analyzer.SearchRs;
 import com.epam.ta.reportportal.ws.model.analyzer.IndexLaunch;
-import com.epam.ta.reportportal.ws.model.analyzer.SearchRq;
-import com.epam.ta.reportportal.ws.model.analyzer.SearchRs;
 import java.util.List;
 import java.util.Map;
 
diff --git a/src/main/java/com/epam/ta/reportportal/core/analyzer/auto/client/impl/AnalyzerServiceClientImpl.java b/src/main/java/com/epam/ta/reportportal/core/analyzer/auto/client/impl/AnalyzerServiceClientImpl.java
index 69de662e08..aef1abbfee 100644
--- a/src/main/java/com/epam/ta/reportportal/core/analyzer/auto/client/impl/AnalyzerServiceClientImpl.java
+++ b/src/main/java/com/epam/ta/reportportal/core/analyzer/auto/client/impl/AnalyzerServiceClientImpl.java
@@ -29,11 +29,11 @@
 import com.epam.ta.reportportal.core.analyzer.auto.client.model.cluster.ClusterData;
 import com.epam.ta.reportportal.core.analyzer.auto.client.model.cluster.GenerateClustersRq;
 import com.epam.ta.reportportal.exception.ReportPortalException;
+import com.epam.ta.reportportal.model.analyzer.AnalyzedItemRs;
+import com.epam.ta.reportportal.model.analyzer.SearchRq;
+import com.epam.ta.reportportal.model.analyzer.SearchRs;
 import com.epam.ta.reportportal.ws.model.ErrorType;
-import com.epam.ta.reportportal.ws.model.analyzer.AnalyzedItemRs;
 import com.epam.ta.reportportal.ws.model.analyzer.IndexLaunch;
-import com.epam.ta.reportportal.ws.model.analyzer.SearchRq;
-import com.epam.ta.reportportal.ws.model.analyzer.SearchRs;
 import com.rabbitmq.http.client.domain.ExchangeInfo;
 import java.util.Collections;
 import java.util.Comparator;
@@ -90,28 +90,31 @@ public Map<String, List<AnalyzedItemRs>> analyze(IndexLaunch rq) {
 
   @Override
   public List<SearchRs> searchLogs(SearchRq rq) {
-    String exchangeName = resolveExchangeName(DOES_SUPPORT_SEARCH)
-        .orElseThrow(() -> new ReportPortalException(ErrorType.UNABLE_INTERACT_WITH_INTEGRATION,
+    String exchangeName =
+        resolveExchangeName(DOES_SUPPORT_SEARCH).orElseThrow(() -> new ReportPortalException(
+            ErrorType.UNABLE_INTERACT_WITH_INTEGRATION,
             "There are no analyzer services with search logs support deployed."
         ));
     return rabbitTemplate.convertSendAndReceiveAsType(exchangeName, SEARCH_ROUTE, rq,
         new ParameterizedTypeReference<>() {
-        });
+        }
+    );
   }
 
   @Override
   public void removeSuggest(Long projectId) {
-    resolveExchangeName(DOES_SUPPORT_SUGGEST)
-        .ifPresent(
-            suggestExchange -> rabbitTemplate.convertAndSend(suggestExchange, REMOVE_SUGGEST_ROUTE,
-                projectId));
+    resolveExchangeName(DOES_SUPPORT_SUGGEST).ifPresent(
+        suggestExchange -> rabbitTemplate.convertAndSend(suggestExchange, REMOVE_SUGGEST_ROUTE,
+            projectId
+        ));
   }
 
   @Override
   public List<SuggestInfo> searchSuggests(SuggestRq rq) {
     return rabbitTemplate.convertSendAndReceiveAsType(getSuggestExchangeName(), SUGGEST_ROUTE, rq,
         new ParameterizedTypeReference<>() {
-        });
+        }
+    );
   }
 
   @Override
@@ -121,42 +124,41 @@ public void handleSuggestChoice(List<SuggestInfo> suggestInfos) {
 
   @Override
   public ClusterData generateClusters(GenerateClustersRq generateClustersRq) {
-    final String exchangeName = resolveExchangeName(DOES_SUPPORT_CLUSTER).orElseThrow(
-        () -> new ReportPortalException(ErrorType.UNABLE_INTERACT_WITH_INTEGRATION,
+    final String exchangeName =
+        resolveExchangeName(DOES_SUPPORT_CLUSTER).orElseThrow(() -> new ReportPortalException(
+            ErrorType.UNABLE_INTERACT_WITH_INTEGRATION,
             "There are no analyzer services with clusters creation support deployed."
         ));
     return rabbitTemplate.convertSendAndReceiveAsType(exchangeName, CLUSTER_ROUTE,
         generateClustersRq, new ParameterizedTypeReference<>() {
-        });
+        }
+    );
   }
 
   private Optional<String> resolveExchangeName(Predicate<ExchangeInfo> supportCondition) {
-    return rabbitMqManagementClient.getAnalyzerExchangesInfo()
-        .stream()
-        .filter(supportCondition)
-        .min(Comparator.comparingInt(EXCHANGE_PRIORITY))
-        .map(ExchangeInfo::getName);
+    return rabbitMqManagementClient.getAnalyzerExchangesInfo().stream().filter(supportCondition)
+        .min(Comparator.comparingInt(EXCHANGE_PRIORITY)).map(ExchangeInfo::getName);
   }
 
   private String getSuggestExchangeName() {
-    return resolveExchangeName(DOES_SUPPORT_SUGGEST)
-        .orElseThrow(() -> new ReportPortalException(ErrorType.UNABLE_INTERACT_WITH_INTEGRATION,
-            "There are no analyzer services with suggest items support deployed."
-        ));
+    return resolveExchangeName(DOES_SUPPORT_SUGGEST).orElseThrow(() -> new ReportPortalException(
+        ErrorType.UNABLE_INTERACT_WITH_INTEGRATION,
+        "There are no analyzer services with suggest items support deployed."
+    ));
   }
 
   private void analyze(IndexLaunch rq, Map<String, List<AnalyzedItemRs>> resultMap,
       ExchangeInfo exchangeInfo) {
-    List<AnalyzedItemRs> result = rabbitTemplate.convertSendAndReceiveAsType(exchangeInfo.getName(),
-        ANALYZE_ROUTE,
-        Collections.singletonList(rq),
-        new ParameterizedTypeReference<>() {
-        }
-    );
+    List<AnalyzedItemRs> result =
+        rabbitTemplate.convertSendAndReceiveAsType(exchangeInfo.getName(), ANALYZE_ROUTE,
+            Collections.singletonList(rq), new ParameterizedTypeReference<>() {
+            }
+        );
     if (!CollectionUtils.isEmpty(result)) {
       resultMap.put(
           (String) exchangeInfo.getArguments().getOrDefault(virtualHost, exchangeInfo.getName()),
-          result);
+          result
+      );
       removeAnalyzedFromRq(rq, result);
     }
   }
diff --git a/src/main/java/com/epam/ta/reportportal/core/analyzer/auto/client/impl/IndexerServiceClientImpl.java b/src/main/java/com/epam/ta/reportportal/core/analyzer/auto/client/impl/IndexerServiceClientImpl.java
index 6f5450f6e2..9f5547ab24 100644
--- a/src/main/java/com/epam/ta/reportportal/core/analyzer/auto/client/impl/IndexerServiceClientImpl.java
+++ b/src/main/java/com/epam/ta/reportportal/core/analyzer/auto/client/impl/IndexerServiceClientImpl.java
@@ -26,15 +26,13 @@
 import com.epam.ta.reportportal.core.analyzer.auto.client.model.IndexDefectsUpdate;
 import com.epam.ta.reportportal.core.analyzer.auto.client.model.IndexItemsRemove;
 import com.epam.ta.reportportal.core.analyzer.auto.client.model.IndexLaunchRemove;
-import com.epam.ta.reportportal.ws.model.analyzer.CleanIndexRq;
+import com.epam.ta.reportportal.model.analyzer.CleanIndexRq;
 import com.epam.ta.reportportal.ws.model.analyzer.IndexLaunch;
-import com.epam.ta.reportportal.ws.model.analyzer.IndexRs;
 import java.util.AbstractMap;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.List;
 import java.util.Map;
-import java.util.Objects;
 import java.util.stream.Collectors;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -80,91 +78,68 @@ public void index(List<IndexLaunch> rq) {
 
   @Override
   public List<Long> indexDefectsUpdate(Long projectId, Map<Long, String> itemsForIndexUpdate) {
-    return rabbitMqManagementClient.getAnalyzerExchangesInfo()
-        .stream()
-        .filter(DOES_SUPPORT_INDEX)
-        .flatMap(
-            exchange -> ofNullable(rabbitTemplate.convertSendAndReceiveAsType(exchange.getName(),
-                DEFECT_UPDATE_ROUTE,
+    return rabbitMqManagementClient.getAnalyzerExchangesInfo().stream().filter(DOES_SUPPORT_INDEX)
+        .flatMap(exchange -> ofNullable(
+            rabbitTemplate.convertSendAndReceiveAsType(exchange.getName(), DEFECT_UPDATE_ROUTE,
                 new IndexDefectsUpdate(projectId, itemsForIndexUpdate),
                 new ParameterizedTypeReference<List<Long>>() {
                 }
-            )).orElse(Collections.emptyList()).stream())
-        .collect(toList());
+            )).orElse(Collections.emptyList()).stream()).collect(toList());
   }
 
   @Override
   public Integer indexItemsRemove(Long projectId, Collection<Long> itemsForIndexRemove) {
-    return rabbitMqManagementClient.getAnalyzerExchangesInfo()
-        .stream()
-        .filter(DOES_SUPPORT_INDEX)
-        .map(exchange -> ofNullable(rabbitTemplate.convertSendAndReceiveAsType(exchange.getName(),
-            ITEM_REMOVE_ROUTE,
-            new IndexItemsRemove(projectId, itemsForIndexRemove),
-            new ParameterizedTypeReference<Integer>() {
-            }
-        )).orElse(0))
-        .mapToInt(Integer::intValue)
-        .sum();
+    return rabbitMqManagementClient.getAnalyzerExchangesInfo().stream().filter(DOES_SUPPORT_INDEX)
+        .map(exchange -> ofNullable(
+            rabbitTemplate.convertSendAndReceiveAsType(exchange.getName(), ITEM_REMOVE_ROUTE,
+                new IndexItemsRemove(projectId, itemsForIndexRemove),
+                new ParameterizedTypeReference<Integer>() {
+                }
+            )).orElse(0)).mapToInt(Integer::intValue).sum();
   }
 
   @Override
   public void indexItemsRemoveAsync(Long projectId, Collection<Long> itemsForIndexRemove) {
-    rabbitMqManagementClient.getAnalyzerExchangesInfo()
-        .stream()
-        .filter(DOES_SUPPORT_INDEX)
-        .forEach(exchange -> rabbitTemplate.convertAndSend(exchange.getName(),
-            ITEM_REMOVE_ROUTE,
+    rabbitMqManagementClient.getAnalyzerExchangesInfo().stream().filter(DOES_SUPPORT_INDEX).forEach(
+        exchange -> rabbitTemplate.convertAndSend(exchange.getName(), ITEM_REMOVE_ROUTE,
             new IndexItemsRemove(projectId, itemsForIndexRemove)
         ));
   }
 
   @Override
   public void indexLaunchesRemove(Long projectId, Collection<Long> launchesForIndexRemove) {
-    rabbitMqManagementClient.getAnalyzerExchangesInfo()
-        .stream()
-        .filter(DOES_SUPPORT_INDEX)
-        .forEach(exchange -> rabbitTemplate.convertAndSend(exchange.getName(),
-            LAUNCH_REMOVE_ROUTE,
+    rabbitMqManagementClient.getAnalyzerExchangesInfo().stream().filter(DOES_SUPPORT_INDEX).forEach(
+        exchange -> rabbitTemplate.convertAndSend(exchange.getName(), LAUNCH_REMOVE_ROUTE,
             new IndexLaunchRemove(projectId, launchesForIndexRemove)
         ));
   }
 
   @Override
   public Long cleanIndex(Long index, List<Long> ids) {
-    Map<Integer, Long> priorityToCleanedLogsCountMapping = rabbitMqManagementClient.getAnalyzerExchangesInfo()
-        .stream()
-        .collect(Collectors.toMap(EXCHANGE_PRIORITY::applyAsInt,
-            exchange -> rabbitTemplate.convertSendAndReceiveAsType(exchange.getName(),
-                CLEAN_ROUTE,
-                new CleanIndexRq(index, ids),
-                new ParameterizedTypeReference<>() {
-                }
-            )
-        ));
-    return priorityToCleanedLogsCountMapping.entrySet()
-        .stream()
-        .min(Map.Entry.comparingByKey())
-        .orElseGet(() -> new AbstractMap.SimpleEntry<>(0, 0L))
-        .getValue();
+    Map<Integer, Long> priorityToCleanedLogsCountMapping =
+        rabbitMqManagementClient.getAnalyzerExchangesInfo().stream().collect(
+            Collectors.toMap(EXCHANGE_PRIORITY::applyAsInt,
+                exchange -> rabbitTemplate.convertSendAndReceiveAsType(exchange.getName(),
+                    CLEAN_ROUTE, new CleanIndexRq(index, ids), new ParameterizedTypeReference<>() {
+                    }
+                )
+            ));
+    return priorityToCleanedLogsCountMapping.entrySet().stream().min(Map.Entry.comparingByKey())
+        .orElseGet(() -> new AbstractMap.SimpleEntry<>(0, 0L)).getValue();
   }
 
   @Override
   public void deleteIndex(Long index) {
-    rabbitMqManagementClient.getAnalyzerExchangesInfo()
-        .stream()
-        .map(exchange -> rabbitTemplate.convertSendAndReceiveAsType(exchange.getName(),
-            DELETE_ROUTE,
-            index,
-            new ParameterizedTypeReference<Integer>() {
+    rabbitMqManagementClient.getAnalyzerExchangesInfo().stream().map(
+        exchange -> rabbitTemplate.convertSendAndReceiveAsType(exchange.getName(), DELETE_ROUTE,
+            index, new ParameterizedTypeReference<Integer>() {
             }
-        ))
-        .forEach(it -> {
-          if (DELETE_INDEX_SUCCESS_CODE.equals(it)) {
-            LOGGER.info("Successfully deleted index '{}'", index);
-          } else {
-            LOGGER.error("Error deleting index '{}'", index);
-          }
-        });
+        )).forEach(it -> {
+      if (DELETE_INDEX_SUCCESS_CODE.equals(it)) {
+        LOGGER.info("Successfully deleted index '{}'", index);
+      } else {
+        LOGGER.error("Error deleting index '{}'", index);
+      }
+    });
   }
 }
diff --git a/src/main/java/com/epam/ta/reportportal/core/analyzer/auto/impl/AnalyzerServiceImpl.java b/src/main/java/com/epam/ta/reportportal/core/analyzer/auto/impl/AnalyzerServiceImpl.java
index 48e3aa4577..c60bee6e46 100644
--- a/src/main/java/com/epam/ta/reportportal/core/analyzer/auto/impl/AnalyzerServiceImpl.java
+++ b/src/main/java/com/epam/ta/reportportal/core/analyzer/auto/impl/AnalyzerServiceImpl.java
@@ -35,12 +35,12 @@
 import com.epam.ta.reportportal.entity.item.issue.IssueEntity;
 import com.epam.ta.reportportal.entity.item.issue.IssueType;
 import com.epam.ta.reportportal.entity.launch.Launch;
+import com.epam.ta.reportportal.model.activity.TestItemActivityResource;
+import com.epam.ta.reportportal.model.analyzer.AnalyzedItemRs;
+import com.epam.ta.reportportal.model.analyzer.RelevantItemInfo;
 import com.epam.ta.reportportal.ws.converter.builders.IssueEntityBuilder;
 import com.epam.ta.reportportal.ws.model.ErrorType;
-import com.epam.ta.reportportal.ws.model.activity.TestItemActivityResource;
-import com.epam.ta.reportportal.ws.model.analyzer.AnalyzedItemRs;
 import com.epam.ta.reportportal.ws.model.analyzer.IndexLaunch;
-import com.epam.ta.reportportal.ws.model.analyzer.RelevantItemInfo;
 import com.epam.ta.reportportal.ws.model.project.AnalyzerConfig;
 import com.google.common.collect.Iterables;
 import com.google.common.collect.Sets;
diff --git a/src/main/java/com/epam/ta/reportportal/core/analyzer/auto/impl/AnalyzerUtils.java b/src/main/java/com/epam/ta/reportportal/core/analyzer/auto/impl/AnalyzerUtils.java
index a3d048e25b..88cfaa150d 100644
--- a/src/main/java/com/epam/ta/reportportal/core/analyzer/auto/impl/AnalyzerUtils.java
+++ b/src/main/java/com/epam/ta/reportportal/core/analyzer/auto/impl/AnalyzerUtils.java
@@ -31,11 +31,11 @@
 import com.epam.ta.reportportal.entity.log.LogFull;
 import com.epam.ta.reportportal.entity.project.Project;
 import com.epam.ta.reportportal.entity.project.ProjectUtils;
+import com.epam.ta.reportportal.model.analyzer.RelevantItemInfo;
+import com.epam.ta.reportportal.model.project.UniqueErrorConfig;
 import com.epam.ta.reportportal.ws.model.analyzer.IndexLog;
 import com.epam.ta.reportportal.ws.model.analyzer.IndexTestItem;
-import com.epam.ta.reportportal.ws.model.analyzer.RelevantItemInfo;
 import com.epam.ta.reportportal.ws.model.project.AnalyzerConfig;
-import com.epam.ta.reportportal.ws.model.project.UniqueErrorConfig;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
diff --git a/src/main/java/com/epam/ta/reportportal/core/analyzer/auto/impl/SearchLogServiceImpl.java b/src/main/java/com/epam/ta/reportportal/core/analyzer/auto/impl/SearchLogServiceImpl.java
index 997f3f709c..5714d074c3 100644
--- a/src/main/java/com/epam/ta/reportportal/core/analyzer/auto/impl/SearchLogServiceImpl.java
+++ b/src/main/java/com/epam/ta/reportportal/core/analyzer/auto/impl/SearchLogServiceImpl.java
@@ -42,13 +42,13 @@
 import com.epam.ta.reportportal.entity.log.LogFull;
 import com.epam.ta.reportportal.entity.project.Project;
 import com.epam.ta.reportportal.exception.ReportPortalException;
+import com.epam.ta.reportportal.model.analyzer.SearchRq;
+import com.epam.ta.reportportal.model.analyzer.SearchRs;
+import com.epam.ta.reportportal.model.log.SearchLogRq;
+import com.epam.ta.reportportal.model.log.SearchLogRs;
 import com.epam.ta.reportportal.ws.converter.converters.IssueConverter;
 import com.epam.ta.reportportal.ws.converter.converters.TestItemConverter;
 import com.epam.ta.reportportal.ws.model.ErrorType;
-import com.epam.ta.reportportal.ws.model.analyzer.SearchRq;
-import com.epam.ta.reportportal.ws.model.analyzer.SearchRs;
-import com.epam.ta.reportportal.ws.model.log.SearchLogRq;
-import com.epam.ta.reportportal.ws.model.log.SearchLogRs;
 import com.epam.ta.reportportal.ws.model.project.AnalyzerConfig;
 import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
diff --git a/src/main/java/com/epam/ta/reportportal/core/analyzer/auto/impl/SuggestedItem.java b/src/main/java/com/epam/ta/reportportal/core/analyzer/auto/impl/SuggestedItem.java
index 5d956d6055..57a6b482c3 100644
--- a/src/main/java/com/epam/ta/reportportal/core/analyzer/auto/impl/SuggestedItem.java
+++ b/src/main/java/com/epam/ta/reportportal/core/analyzer/auto/impl/SuggestedItem.java
@@ -13,11 +13,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package com.epam.ta.reportportal.core.analyzer.auto.impl;
 
 import com.epam.ta.reportportal.core.analyzer.auto.client.model.SuggestInfo;
-import com.epam.ta.reportportal.ws.model.TestItemResource;
-import com.epam.ta.reportportal.ws.model.log.LogResource;
+import com.epam.ta.reportportal.model.TestItemResource;
+import com.epam.ta.reportportal.model.log.LogResource;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import java.util.Set;
 
diff --git a/src/main/java/com/epam/ta/reportportal/core/analyzer/auto/indexer/BatchLogIndexer.java b/src/main/java/com/epam/ta/reportportal/core/analyzer/auto/indexer/BatchLogIndexer.java
index 7a98614b1d..606b69f7d8 100644
--- a/src/main/java/com/epam/ta/reportportal/core/analyzer/auto/indexer/BatchLogIndexer.java
+++ b/src/main/java/com/epam/ta/reportportal/core/analyzer/auto/indexer/BatchLogIndexer.java
@@ -99,7 +99,7 @@ private Long indexPartition(List<Long> itemIds, AnalyzerConfig analyzerConfig, L
   private Long countLogs(List<IndexLaunch> indexLaunch) {
     return indexLaunch.stream()
         .flatMap(launch -> launch.getTestItems().stream())
-        .mapToLong(item -> item.getLogs().size())
+        .mapToLong(item -> item.getLogs() != null ? item.getLogs().size() : 0)
         .sum();
   }
 
diff --git a/src/main/java/com/epam/ta/reportportal/core/analyzer/pattern/handler/impl/ItemsPatternAnalyzerImpl.java b/src/main/java/com/epam/ta/reportportal/core/analyzer/pattern/handler/impl/ItemsPatternAnalyzerImpl.java
index 7f8b78d5ef..85834b9c9d 100644
--- a/src/main/java/com/epam/ta/reportportal/core/analyzer/pattern/handler/impl/ItemsPatternAnalyzerImpl.java
+++ b/src/main/java/com/epam/ta/reportportal/core/analyzer/pattern/handler/impl/ItemsPatternAnalyzerImpl.java
@@ -24,8 +24,8 @@
 import com.epam.ta.reportportal.entity.pattern.PatternTemplate;
 import com.epam.ta.reportportal.entity.pattern.PatternTemplateTestItemPojo;
 import com.epam.ta.reportportal.entity.pattern.PatternTemplateType;
+import com.epam.ta.reportportal.model.activity.PatternTemplateActivityResource;
 import com.epam.ta.reportportal.ws.converter.converters.PatternTemplateConverter;
-import com.epam.ta.reportportal.ws.model.activity.PatternTemplateActivityResource;
 import java.util.List;
 import java.util.Map;
 import java.util.Optional;
diff --git a/src/main/java/com/epam/ta/reportportal/core/analyzer/pattern/service/CreatePatternTemplateHandler.java b/src/main/java/com/epam/ta/reportportal/core/analyzer/pattern/service/CreatePatternTemplateHandler.java
index 340e80c187..915fc8e90a 100644
--- a/src/main/java/com/epam/ta/reportportal/core/analyzer/pattern/service/CreatePatternTemplateHandler.java
+++ b/src/main/java/com/epam/ta/reportportal/core/analyzer/pattern/service/CreatePatternTemplateHandler.java
@@ -17,7 +17,7 @@
 package com.epam.ta.reportportal.core.analyzer.pattern.service;
 
 import com.epam.ta.reportportal.entity.pattern.PatternTemplate;
-import com.epam.ta.reportportal.ws.model.project.config.pattern.CreatePatternTemplateRQ;
+import com.epam.ta.reportportal.model.project.config.pattern.CreatePatternTemplateRQ;
 
 /**
  * @author <a href="mailto:ivan_budayeu@epam.com">Ivan Budayeu</a>
diff --git a/src/main/java/com/epam/ta/reportportal/core/analyzer/pattern/service/impl/CreatePatternTemplateHandlerImpl.java b/src/main/java/com/epam/ta/reportportal/core/analyzer/pattern/service/impl/CreatePatternTemplateHandlerImpl.java
index ccac8df33b..4323f4a73f 100644
--- a/src/main/java/com/epam/ta/reportportal/core/analyzer/pattern/service/impl/CreatePatternTemplateHandlerImpl.java
+++ b/src/main/java/com/epam/ta/reportportal/core/analyzer/pattern/service/impl/CreatePatternTemplateHandlerImpl.java
@@ -13,6 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package com.epam.ta.reportportal.core.analyzer.pattern.service.impl;
 
 import static com.epam.ta.reportportal.commons.Predicates.equalTo;
@@ -21,9 +22,9 @@
 import com.epam.ta.reportportal.core.analyzer.pattern.service.CreatePatternTemplateHandler;
 import com.epam.ta.reportportal.dao.PatternTemplateRepository;
 import com.epam.ta.reportportal.entity.pattern.PatternTemplate;
+import com.epam.ta.reportportal.model.project.config.pattern.CreatePatternTemplateRQ;
 import com.epam.ta.reportportal.ws.converter.builders.PatternTemplateBuilder;
 import com.epam.ta.reportportal.ws.model.ErrorType;
-import com.epam.ta.reportportal.ws.model.project.config.pattern.CreatePatternTemplateRQ;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 
@@ -44,14 +45,12 @@ public PatternTemplate createPatternTemplate(Long projectId,
       CreatePatternTemplateRQ createPatternTemplateRQ) {
     final String name = StringUtils.trim(createPatternTemplateRQ.getName());
     BusinessRule.expect(
-            patternTemplateRepository.existsByProjectIdAndNameIgnoreCase(projectId, name),
-            equalTo(false))
-        .verify(ErrorType.RESOURCE_ALREADY_EXISTS, name);
-    PatternTemplate patternTemplate = new PatternTemplateBuilder().withCreateRequest(
-            createPatternTemplateRQ)
-        .withName(name)
-        .withProjectId(projectId)
-        .get();
+        patternTemplateRepository.existsByProjectIdAndNameIgnoreCase(projectId, name),
+        equalTo(false)
+    ).verify(ErrorType.RESOURCE_ALREADY_EXISTS, name);
+    PatternTemplate patternTemplate =
+        new PatternTemplateBuilder().withCreateRequest(createPatternTemplateRQ).withName(name)
+            .withProjectId(projectId).get();
     return patternTemplateRepository.save(patternTemplate);
   }
 }
diff --git a/src/main/java/com/epam/ta/reportportal/core/analyzer/pattern/service/impl/CreateRegexPatternTemplateHandler.java b/src/main/java/com/epam/ta/reportportal/core/analyzer/pattern/service/impl/CreateRegexPatternTemplateHandler.java
index 6474044932..d539d863a9 100644
--- a/src/main/java/com/epam/ta/reportportal/core/analyzer/pattern/service/impl/CreateRegexPatternTemplateHandler.java
+++ b/src/main/java/com/epam/ta/reportportal/core/analyzer/pattern/service/impl/CreateRegexPatternTemplateHandler.java
@@ -20,8 +20,8 @@
 import com.epam.ta.reportportal.dao.PatternTemplateRepository;
 import com.epam.ta.reportportal.entity.pattern.PatternTemplate;
 import com.epam.ta.reportportal.exception.ReportPortalException;
+import com.epam.ta.reportportal.model.project.config.pattern.CreatePatternTemplateRQ;
 import com.epam.ta.reportportal.ws.model.ErrorType;
-import com.epam.ta.reportportal.ws.model.project.config.pattern.CreatePatternTemplateRQ;
 import javax.persistence.PersistenceException;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -45,7 +45,8 @@ public PatternTemplate createPatternTemplate(Long projectId,
     } catch (PersistenceException ex) {
       throw new ReportPortalException(ErrorType.BAD_REQUEST_ERROR,
           Suppliers.formattedSupplier("Provided regex pattern - '{}' is invalid",
-              createPatternTemplateRQ.getValue()).get()
+              createPatternTemplateRQ.getValue()
+          ).get()
       );
     }
     return super.createPatternTemplate(projectId, createPatternTemplateRQ);
diff --git a/src/main/java/com/epam/ta/reportportal/core/analyzer/strategy/LaunchAnalysisStrategy.java b/src/main/java/com/epam/ta/reportportal/core/analyzer/strategy/LaunchAnalysisStrategy.java
index 38dec9a63a..5cd04f7dfe 100644
--- a/src/main/java/com/epam/ta/reportportal/core/analyzer/strategy/LaunchAnalysisStrategy.java
+++ b/src/main/java/com/epam/ta/reportportal/core/analyzer/strategy/LaunchAnalysisStrategy.java
@@ -17,7 +17,7 @@
 package com.epam.ta.reportportal.core.analyzer.strategy;
 
 import com.epam.ta.reportportal.commons.ReportPortalUser;
-import com.epam.ta.reportportal.ws.model.launch.AnalyzeLaunchRQ;
+import com.epam.ta.reportportal.model.launch.AnalyzeLaunchRQ;
 
 /**
  * @author <a href="mailto:ivan_budayeu@epam.com">Ivan Budayeu</a>
diff --git a/src/main/java/com/epam/ta/reportportal/core/analyzer/strategy/LaunchAutoAnalysisStrategy.java b/src/main/java/com/epam/ta/reportportal/core/analyzer/strategy/LaunchAutoAnalysisStrategy.java
index 55213d6bbc..6705735f2c 100644
--- a/src/main/java/com/epam/ta/reportportal/core/analyzer/strategy/LaunchAutoAnalysisStrategy.java
+++ b/src/main/java/com/epam/ta/reportportal/core/analyzer/strategy/LaunchAutoAnalysisStrategy.java
@@ -31,7 +31,7 @@
 import com.epam.ta.reportportal.entity.launch.Launch;
 import com.epam.ta.reportportal.entity.project.Project;
 import com.epam.ta.reportportal.exception.ReportPortalException;
-import com.epam.ta.reportportal.ws.model.launch.AnalyzeLaunchRQ;
+import com.epam.ta.reportportal.model.launch.AnalyzeLaunchRQ;
 import com.epam.ta.reportportal.ws.model.project.AnalyzerConfig;
 import java.util.LinkedHashSet;
 import java.util.Set;
@@ -49,8 +49,7 @@ public class LaunchAutoAnalysisStrategy extends AbstractLaunchAnalysisStrategy {
 
   @Autowired
   public LaunchAutoAnalysisStrategy(ProjectRepository projectRepository,
-      LaunchRepository launchRepository,
-      LaunchAutoAnalysisStarter manualAnalysisStarter) {
+      LaunchRepository launchRepository, LaunchAutoAnalysisStarter manualAnalysisStarter) {
     super(projectRepository, launchRepository);
     this.manualAnalysisStarter = manualAnalysisStarter;
   }
@@ -71,27 +70,20 @@ public void analyze(AnalyzeLaunchRQ analyzeRQ, ReportPortalUser.ProjectDetails p
         .orElseThrow(() -> new ReportPortalException(LAUNCH_NOT_FOUND, analyzeRQ.getLaunchId()));
     validateLaunch(launch, projectDetails);
 
-    Project project = projectRepository.findById(projectDetails.getProjectId())
-        .orElseThrow(
-            () -> new ReportPortalException(PROJECT_NOT_FOUND, projectDetails.getProjectId()));
+    Project project = projectRepository.findById(projectDetails.getProjectId()).orElseThrow(
+        () -> new ReportPortalException(PROJECT_NOT_FOUND, projectDetails.getProjectId()));
 
     AnalyzerConfig analyzerConfig = getAnalyzerConfig(project);
     analyzerConfig.setAnalyzerMode(analyzeMode.getValue());
 
-    final StartLaunchAutoAnalysisConfig autoAnalysisConfig = StartLaunchAutoAnalysisConfig.of(
-        launch.getId(),
-        analyzerConfig,
-        analyzeItemsModes,
-        user
-    );
+    final StartLaunchAutoAnalysisConfig autoAnalysisConfig =
+        StartLaunchAutoAnalysisConfig.of(launch.getId(), analyzerConfig, analyzeItemsModes, user);
 
     manualAnalysisStarter.start(autoAnalysisConfig);
   }
 
   private LinkedHashSet<AnalyzeItemsMode> getAnalyzeItemsModes(AnalyzeLaunchRQ analyzeRQ) {
-    return analyzeRQ.getAnalyzeItemsModes()
-        .stream()
-        .map(AnalyzeItemsMode::fromString)
+    return analyzeRQ.getAnalyzeItemsModes().stream().map(AnalyzeItemsMode::fromString)
         .collect(Collectors.toCollection(LinkedHashSet::new));
   }
 
diff --git a/src/main/java/com/epam/ta/reportportal/core/analyzer/strategy/LaunchPatternAnalysisStrategy.java b/src/main/java/com/epam/ta/reportportal/core/analyzer/strategy/LaunchPatternAnalysisStrategy.java
index 91ecb49023..b63b72eb97 100644
--- a/src/main/java/com/epam/ta/reportportal/core/analyzer/strategy/LaunchPatternAnalysisStrategy.java
+++ b/src/main/java/com/epam/ta/reportportal/core/analyzer/strategy/LaunchPatternAnalysisStrategy.java
@@ -27,8 +27,8 @@
 import com.epam.ta.reportportal.dao.ProjectRepository;
 import com.epam.ta.reportportal.entity.launch.Launch;
 import com.epam.ta.reportportal.exception.ReportPortalException;
+import com.epam.ta.reportportal.model.launch.AnalyzeLaunchRQ;
 import com.epam.ta.reportportal.ws.model.ErrorType;
-import com.epam.ta.reportportal.ws.model.launch.AnalyzeLaunchRQ;
 import java.util.Set;
 import org.apache.commons.collections.CollectionUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -44,8 +44,7 @@ public class LaunchPatternAnalysisStrategy extends AbstractLaunchAnalysisStrateg
 
   @Autowired
   public LaunchPatternAnalysisStrategy(ProjectRepository projectRepository,
-      LaunchRepository launchRepository,
-      LaunchPatternAnalyzer launchPatternAnalyzer) {
+      LaunchRepository launchRepository, LaunchPatternAnalyzer launchPatternAnalyzer) {
     super(projectRepository, launchRepository);
     this.launchPatternAnalyzer = launchPatternAnalyzer;
   }
@@ -53,13 +52,13 @@ public LaunchPatternAnalysisStrategy(ProjectRepository projectRepository,
   public void analyze(AnalyzeLaunchRQ analyzeRQ, ReportPortalUser.ProjectDetails projectDetails,
       ReportPortalUser user) {
 
-    Set<AnalyzeItemsMode> analyzeItemsModes = analyzeRQ.getAnalyzeItemsModes()
-        .stream()
-        .map(AnalyzeItemsMode::fromString)
-        .collect(toSet());
+    Set<AnalyzeItemsMode> analyzeItemsModes =
+        analyzeRQ.getAnalyzeItemsModes().stream().map(AnalyzeItemsMode::fromString)
+            .collect(toSet());
 
     expect(analyzeItemsModes, CollectionUtils::isNotEmpty).verify(ErrorType.PATTERN_ANALYSIS_ERROR,
-        "No analyze item mode specified.");
+        "No analyze item mode specified."
+    );
 
     Launch launch = launchRepository.findById(analyzeRQ.getLaunchId())
         .orElseThrow(() -> new ReportPortalException(LAUNCH_NOT_FOUND, analyzeRQ.getLaunchId()));
diff --git a/src/main/java/com/epam/ta/reportportal/core/bts/handler/impl/CreateTicketHandlerImpl.java b/src/main/java/com/epam/ta/reportportal/core/bts/handler/impl/CreateTicketHandlerImpl.java
index ac925d43f3..d00fc1a212 100644
--- a/src/main/java/com/epam/ta/reportportal/core/bts/handler/impl/CreateTicketHandlerImpl.java
+++ b/src/main/java/com/epam/ta/reportportal/core/bts/handler/impl/CreateTicketHandlerImpl.java
@@ -36,7 +36,7 @@
 import com.epam.ta.reportportal.entity.integration.Integration;
 import com.epam.ta.reportportal.entity.item.TestItem;
 import com.epam.ta.reportportal.exception.ReportPortalException;
-import com.epam.ta.reportportal.ws.model.activity.TestItemActivityResource;
+import com.epam.ta.reportportal.model.activity.TestItemActivityResource;
 import com.epam.ta.reportportal.ws.model.externalsystem.PostTicketRQ;
 import com.epam.ta.reportportal.ws.model.externalsystem.Ticket;
 import java.util.Collections;
@@ -61,8 +61,7 @@ public class CreateTicketHandlerImpl implements CreateTicketHandler {
 
   @Autowired
   public CreateTicketHandlerImpl(TestItemRepository testItemRepository, PluginBox pluginBox,
-      MessageBus messageBus,
-      GetIntegrationHandler getIntegrationHandler) {
+      MessageBus messageBus, GetIntegrationHandler getIntegrationHandler) {
     this.testItemRepository = testItemRepository;
     this.pluginBox = pluginBox;
     this.messageBus = messageBus;
@@ -71,32 +70,28 @@ public CreateTicketHandlerImpl(TestItemRepository testItemRepository, PluginBox
 
   @Override
   public Ticket createIssue(PostTicketRQ postTicketRQ, Long integrationId,
-      ReportPortalUser.ProjectDetails projectDetails,
-      ReportPortalUser user) {
+      ReportPortalUser.ProjectDetails projectDetails, ReportPortalUser user) {
     validatePostTicketRQ(postTicketRQ);
 
     List<TestItem> testItems = ofNullable(postTicketRQ.getBackLinks()).map(
-            links -> testItemRepository.findAllById(links.keySet()))
-        .orElseGet(Collections::emptyList);
-    List<TestItemActivityResource> before = testItems.stream()
-        .map(it -> TO_ACTIVITY_RESOURCE.apply(it, projectDetails.getProjectId()))
-        .collect(Collectors.toList());
+        links -> testItemRepository.findAllById(links.keySet())).orElseGet(Collections::emptyList);
+    List<TestItemActivityResource> before =
+        testItems.stream().map(it -> TO_ACTIVITY_RESOURCE.apply(it, projectDetails.getProjectId()))
+            .collect(Collectors.toList());
 
-    Integration integration = getIntegrationHandler.getEnabledBtsIntegration(projectDetails,
-        integrationId);
+    Integration integration =
+        getIntegrationHandler.getEnabledBtsIntegration(projectDetails, integrationId);
 
     expect(BtsConstants.DEFECT_FORM_FIELDS.getParam(integration.getParams()), notNull()).verify(
-        BAD_REQUEST_ERROR,
-        "There aren't any submitted BTS fields!"
-    );
+        BAD_REQUEST_ERROR, "There aren't any submitted BTS fields!");
 
-    BtsExtension btsExtension = pluginBox.getInstance(integration.getType().getName(),
-            BtsExtension.class)
-        .orElseThrow(() -> new ReportPortalException(BAD_REQUEST_ERROR,
-            Suppliers.formattedSupplier("BugTracking plugin for {} isn't installed",
-                BtsConstants.PROJECT.getParam(integration.getParams())
-            ).get()
-        ));
+    BtsExtension btsExtension =
+        pluginBox.getInstance(integration.getType().getName(), BtsExtension.class).orElseThrow(
+            () -> new ReportPortalException(BAD_REQUEST_ERROR,
+                Suppliers.formattedSupplier("BugTracking plugin for {} isn't installed",
+                    BtsConstants.PROJECT.getParam(integration.getParams())
+                ).get()
+            ));
 
     Ticket ticket = btsExtension.submitTicket(postTicketRQ, integration);
 
@@ -112,7 +107,8 @@ public Ticket createIssue(PostTicketRQ postTicketRQ, Long integrationId,
    */
   private void validatePostTicketRQ(PostTicketRQ postTicketRQ) {
     if (postTicketRQ.getIsIncludeLogs() || postTicketRQ.getIsIncludeScreenshots()) {
-      expect(postTicketRQ.getBackLinks(), notNull()).verify(UNABLE_POST_TICKET,
+      expect(postTicketRQ.getBackLinks(), notNull()).verify(
+          UNABLE_POST_TICKET,
           "Test item id should be specified, when logs required in ticket description."
       );
     }
diff --git a/src/main/java/com/epam/ta/reportportal/core/dashboard/CreateDashboardHandler.java b/src/main/java/com/epam/ta/reportportal/core/dashboard/CreateDashboardHandler.java
index 994d2ed7cf..508f680142 100644
--- a/src/main/java/com/epam/ta/reportportal/core/dashboard/CreateDashboardHandler.java
+++ b/src/main/java/com/epam/ta/reportportal/core/dashboard/CreateDashboardHandler.java
@@ -17,8 +17,8 @@
 package com.epam.ta.reportportal.core.dashboard;
 
 import com.epam.ta.reportportal.commons.ReportPortalUser;
-import com.epam.ta.reportportal.ws.model.EntryCreatedRS;
-import com.epam.ta.reportportal.ws.model.dashboard.CreateDashboardRQ;
+import com.epam.ta.reportportal.model.EntryCreatedRS;
+import com.epam.ta.reportportal.model.dashboard.CreateDashboardRQ;
 
 /**
  * @author Pavel Bortnik
diff --git a/src/main/java/com/epam/ta/reportportal/core/dashboard/GetDashboardHandler.java b/src/main/java/com/epam/ta/reportportal/core/dashboard/GetDashboardHandler.java
index 2b9f95f44d..793237548b 100644
--- a/src/main/java/com/epam/ta/reportportal/core/dashboard/GetDashboardHandler.java
+++ b/src/main/java/com/epam/ta/reportportal/core/dashboard/GetDashboardHandler.java
@@ -18,7 +18,7 @@
 
 import com.epam.ta.reportportal.commons.ReportPortalUser;
 import com.epam.ta.reportportal.commons.querygen.Filter;
-import com.epam.ta.reportportal.ws.model.dashboard.DashboardResource;
+import com.epam.ta.reportportal.model.dashboard.DashboardResource;
 import org.springframework.data.domain.Pageable;
 
 /**
diff --git a/src/main/java/com/epam/ta/reportportal/core/dashboard/UpdateDashboardHandler.java b/src/main/java/com/epam/ta/reportportal/core/dashboard/UpdateDashboardHandler.java
index 9fa2d7fcb8..d6f4a4e99c 100644
--- a/src/main/java/com/epam/ta/reportportal/core/dashboard/UpdateDashboardHandler.java
+++ b/src/main/java/com/epam/ta/reportportal/core/dashboard/UpdateDashboardHandler.java
@@ -17,10 +17,9 @@
 package com.epam.ta.reportportal.core.dashboard;
 
 import com.epam.ta.reportportal.commons.ReportPortalUser;
-import com.epam.ta.reportportal.commons.querygen.Filter;
+import com.epam.ta.reportportal.model.dashboard.AddWidgetRq;
+import com.epam.ta.reportportal.model.dashboard.UpdateDashboardRQ;
 import com.epam.ta.reportportal.ws.model.OperationCompletionRS;
-import com.epam.ta.reportportal.ws.model.dashboard.AddWidgetRq;
-import com.epam.ta.reportportal.ws.model.dashboard.UpdateDashboardRQ;
 
 /**
  * @author Pavel Bortnik
diff --git a/src/main/java/com/epam/ta/reportportal/core/dashboard/impl/CreateDashboardHandlerImpl.java b/src/main/java/com/epam/ta/reportportal/core/dashboard/impl/CreateDashboardHandlerImpl.java
index 62960aa97c..77c6f21a95 100644
--- a/src/main/java/com/epam/ta/reportportal/core/dashboard/impl/CreateDashboardHandlerImpl.java
+++ b/src/main/java/com/epam/ta/reportportal/core/dashboard/impl/CreateDashboardHandlerImpl.java
@@ -16,6 +16,8 @@
 
 package com.epam.ta.reportportal.core.dashboard.impl;
 
+import static com.epam.ta.reportportal.ws.converter.converters.DashboardConverter.TO_ACTIVITY_RESOURCE;
+
 import com.epam.ta.reportportal.commons.ReportPortalUser;
 import com.epam.ta.reportportal.commons.validation.BusinessRule;
 import com.epam.ta.reportportal.commons.validation.Suppliers;
@@ -24,52 +26,55 @@
 import com.epam.ta.reportportal.core.events.activity.DashboardCreatedEvent;
 import com.epam.ta.reportportal.dao.DashboardRepository;
 import com.epam.ta.reportportal.entity.dashboard.Dashboard;
+import com.epam.ta.reportportal.model.EntryCreatedRS;
+import com.epam.ta.reportportal.model.dashboard.CreateDashboardRQ;
 import com.epam.ta.reportportal.ws.converter.builders.DashboardBuilder;
-import com.epam.ta.reportportal.ws.model.EntryCreatedRS;
 import com.epam.ta.reportportal.ws.model.ErrorType;
-import com.epam.ta.reportportal.ws.model.dashboard.CreateDashboardRQ;
 import org.apache.commons.lang3.BooleanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-import static com.epam.ta.reportportal.ws.converter.converters.DashboardConverter.TO_ACTIVITY_RESOURCE;
-
 /**
  * @author Pavel Bortnik
  */
 @Service
 public class CreateDashboardHandlerImpl implements CreateDashboardHandler {
 
-	private final DashboardRepository dashboardRepository;
-	private final MessageBus messageBus;
+  private final DashboardRepository dashboardRepository;
+  private final MessageBus messageBus;
 
-	private final static int DASHBOARD_LIMIT = 300;
+  private final static int DASHBOARD_LIMIT = 300;
 
-	@Autowired
-	public CreateDashboardHandlerImpl(DashboardRepository dashboardRepository, MessageBus messageBus) {
-		this.dashboardRepository = dashboardRepository;
-		this.messageBus = messageBus;
-	}
+  @Autowired
+  public CreateDashboardHandlerImpl(DashboardRepository dashboardRepository,
+      MessageBus messageBus) {
+    this.dashboardRepository = dashboardRepository;
+    this.messageBus = messageBus;
+  }
 
-	@Override
-	public EntryCreatedRS createDashboard(ReportPortalUser.ProjectDetails projectDetails, CreateDashboardRQ rq, ReportPortalUser user) {
+  @Override
+  public EntryCreatedRS createDashboard(ReportPortalUser.ProjectDetails projectDetails,
+      CreateDashboardRQ rq, ReportPortalUser user) {
 
-		BusinessRule.expect(dashboardRepository.findAllByProjectId(projectDetails.getProjectId()).size() >= DASHBOARD_LIMIT,
-				BooleanUtils::isFalse).verify(ErrorType.DASHBOARD_UPDATE_ERROR, Suppliers.formattedSupplier(
-				"The limit of {} dashboards has been reached. To create a new one you need to delete at least one created previously.",
-				DASHBOARD_LIMIT
-		));
-		BusinessRule.expect(dashboardRepository.existsByNameAndOwnerAndProjectId(rq.getName(),
-				user.getUsername(),
-				projectDetails.getProjectId()
-		), BooleanUtils::isFalse).verify(ErrorType.RESOURCE_ALREADY_EXISTS, rq.getName());
+    BusinessRule.expect(dashboardRepository.findAllByProjectId(projectDetails.getProjectId()).size()
+            >= DASHBOARD_LIMIT, BooleanUtils::isFalse)
+        .verify(ErrorType.DASHBOARD_UPDATE_ERROR, Suppliers.formattedSupplier(
+            "The limit of {} dashboards has been reached. To create a new one you need to delete at least one created previously.",
+            DASHBOARD_LIMIT
+        ));
+    BusinessRule.expect(
+        dashboardRepository.existsByNameAndOwnerAndProjectId(rq.getName(), user.getUsername(),
+            projectDetails.getProjectId()
+        ), BooleanUtils::isFalse).verify(ErrorType.RESOURCE_ALREADY_EXISTS, rq.getName());
 
-		Dashboard dashboard = new DashboardBuilder().addDashboardRq(rq)
-				.addProject(projectDetails.getProjectId())
-				.addOwner(user.getUsername())
-				.get();
-		dashboardRepository.save(dashboard);
-		messageBus.publishActivity(new DashboardCreatedEvent(TO_ACTIVITY_RESOURCE.apply(dashboard), user.getUserId(), user.getUsername()));
-		return new EntryCreatedRS(dashboard.getId());
-	}
+    Dashboard dashboard =
+        new DashboardBuilder().addDashboardRq(rq).addProject(projectDetails.getProjectId())
+            .addOwner(user.getUsername()).get();
+    dashboardRepository.save(dashboard);
+    messageBus.publishActivity(
+        new DashboardCreatedEvent(TO_ACTIVITY_RESOURCE.apply(dashboard), user.getUserId(),
+            user.getUsername()
+        ));
+    return new EntryCreatedRS(dashboard.getId());
+  }
 }
diff --git a/src/main/java/com/epam/ta/reportportal/core/dashboard/impl/GetDashboardHandlerImpl.java b/src/main/java/com/epam/ta/reportportal/core/dashboard/impl/GetDashboardHandlerImpl.java
index e51389181e..2749289094 100644
--- a/src/main/java/com/epam/ta/reportportal/core/dashboard/impl/GetDashboardHandlerImpl.java
+++ b/src/main/java/com/epam/ta/reportportal/core/dashboard/impl/GetDashboardHandlerImpl.java
@@ -23,10 +23,10 @@
 import com.epam.ta.reportportal.dao.DashboardRepository;
 import com.epam.ta.reportportal.entity.dashboard.Dashboard;
 import com.epam.ta.reportportal.exception.ReportPortalException;
+import com.epam.ta.reportportal.model.dashboard.DashboardResource;
 import com.epam.ta.reportportal.ws.converter.PagedResourcesAssembler;
 import com.epam.ta.reportportal.ws.converter.converters.DashboardConverter;
 import com.epam.ta.reportportal.ws.model.ErrorType;
-import com.epam.ta.reportportal.ws.model.dashboard.DashboardResource;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
diff --git a/src/main/java/com/epam/ta/reportportal/core/dashboard/impl/UpdateDashboardHandlerImpl.java b/src/main/java/com/epam/ta/reportportal/core/dashboard/impl/UpdateDashboardHandlerImpl.java
index 2229472d22..45271feec5 100644
--- a/src/main/java/com/epam/ta/reportportal/core/dashboard/impl/UpdateDashboardHandlerImpl.java
+++ b/src/main/java/com/epam/ta/reportportal/core/dashboard/impl/UpdateDashboardHandlerImpl.java
@@ -31,13 +31,13 @@
 import com.epam.ta.reportportal.entity.dashboard.DashboardWidget;
 import com.epam.ta.reportportal.entity.widget.Widget;
 import com.epam.ta.reportportal.exception.ReportPortalException;
+import com.epam.ta.reportportal.model.activity.DashboardActivityResource;
+import com.epam.ta.reportportal.model.dashboard.AddWidgetRq;
+import com.epam.ta.reportportal.model.dashboard.UpdateDashboardRQ;
 import com.epam.ta.reportportal.ws.converter.builders.DashboardBuilder;
 import com.epam.ta.reportportal.ws.converter.converters.WidgetConverter;
 import com.epam.ta.reportportal.ws.model.ErrorType;
 import com.epam.ta.reportportal.ws.model.OperationCompletionRS;
-import com.epam.ta.reportportal.ws.model.activity.DashboardActivityResource;
-import com.epam.ta.reportportal.ws.model.dashboard.AddWidgetRq;
-import com.epam.ta.reportportal.ws.model.dashboard.UpdateDashboardRQ;
 import java.util.Set;
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.lang3.BooleanUtils;
diff --git a/src/main/java/com/epam/ta/reportportal/core/events/activity/AssignUserEvent.java b/src/main/java/com/epam/ta/reportportal/core/events/activity/AssignUserEvent.java
index c262f722d0..c6db29515e 100644
--- a/src/main/java/com/epam/ta/reportportal/core/events/activity/AssignUserEvent.java
+++ b/src/main/java/com/epam/ta/reportportal/core/events/activity/AssignUserEvent.java
@@ -26,7 +26,7 @@
 import com.epam.ta.reportportal.entity.activity.EventObject;
 import com.epam.ta.reportportal.entity.activity.EventPriority;
 import com.epam.ta.reportportal.entity.activity.EventSubject;
-import com.epam.ta.reportportal.ws.model.activity.UserActivityResource;
+import com.epam.ta.reportportal.model.activity.UserActivityResource;
 
 public class AssignUserEvent extends AbstractEvent implements ActivityEvent {
 
@@ -51,19 +51,13 @@ public void setUserActivityResource(UserActivityResource userActivityResource) {
 
   @Override
   public Activity toActivity() {
-    return new ActivityBuilder()
-        .addCreatedNow()
-        .addAction(EventAction.ASSIGN)
-        .addEventName(ASSIGN_USER.getValue())
-        .addPriority(EventPriority.HIGH)
-        .addObjectId(userActivityResource.getId())
-        .addObjectName(userActivityResource.getFullName())
-        .addObjectType(EventObject.USER)
-        .addProjectId(userActivityResource.getDefaultProjectId())
+    return new ActivityBuilder().addCreatedNow().addAction(EventAction.ASSIGN)
+        .addEventName(ASSIGN_USER.getValue()).addPriority(EventPriority.HIGH)
+        .addObjectId(userActivityResource.getId()).addObjectName(userActivityResource.getFullName())
+        .addObjectType(EventObject.USER).addProjectId(userActivityResource.getDefaultProjectId())
         .addSubjectId(isSystemEvent ? null : getUserId())
         .addSubjectName(isSystemEvent ? RP_SUBJECT_NAME : getUserLogin())
-        .addSubjectType(isSystemEvent ? EventSubject.APPLICATION : EventSubject.USER)
-        .get();
+        .addSubjectType(isSystemEvent ? EventSubject.APPLICATION : EventSubject.USER).get();
   }
 
 }
diff --git a/src/main/java/com/epam/ta/reportportal/core/events/activity/ChangeRoleEvent.java b/src/main/java/com/epam/ta/reportportal/core/events/activity/ChangeRoleEvent.java
index 923f170a72..0b957a4391 100644
--- a/src/main/java/com/epam/ta/reportportal/core/events/activity/ChangeRoleEvent.java
+++ b/src/main/java/com/epam/ta/reportportal/core/events/activity/ChangeRoleEvent.java
@@ -25,7 +25,7 @@
 import com.epam.ta.reportportal.entity.activity.EventObject;
 import com.epam.ta.reportportal.entity.activity.EventPriority;
 import com.epam.ta.reportportal.entity.activity.EventSubject;
-import com.epam.ta.reportportal.ws.model.activity.UserActivityResource;
+import com.epam.ta.reportportal.model.activity.UserActivityResource;
 
 public class ChangeRoleEvent extends AbstractEvent implements ActivityEvent {
 
@@ -54,20 +54,12 @@ public void setUserActivityResource(UserActivityResource userActivityResource) {
 
   @Override
   public Activity toActivity() {
-    return new ActivityBuilder()
-        .addCreatedNow()
-        .addAction(EventAction.CHANGE_ROLE)
-        .addEventName(CHANGE_ROLE.getValue())
-        .addPriority(EventPriority.HIGH)
-        .addObjectId(userActivityResource.getId())
-        .addObjectName(userActivityResource.getFullName())
-        .addObjectType(EventObject.USER)
-        .addProjectId(userActivityResource.getDefaultProjectId())
-        .addSubjectId(getUserId())
-        .addSubjectName(getUserLogin())
-        .addSubjectType(EventSubject.USER)
-        .addHistoryField("projectRole", oldRole, newRole)
-        .get();
+    return new ActivityBuilder().addCreatedNow().addAction(EventAction.CHANGE_ROLE)
+        .addEventName(CHANGE_ROLE.getValue()).addPriority(EventPriority.HIGH)
+        .addObjectId(userActivityResource.getId()).addObjectName(userActivityResource.getFullName())
+        .addObjectType(EventObject.USER).addProjectId(userActivityResource.getDefaultProjectId())
+        .addSubjectId(getUserId()).addSubjectName(getUserLogin()).addSubjectType(EventSubject.USER)
+        .addHistoryField("projectRole", oldRole, newRole).get();
   }
 
 }
diff --git a/src/main/java/com/epam/ta/reportportal/core/events/activity/DashboardCreatedEvent.java b/src/main/java/com/epam/ta/reportportal/core/events/activity/DashboardCreatedEvent.java
index 6042e7027c..52627302ea 100644
--- a/src/main/java/com/epam/ta/reportportal/core/events/activity/DashboardCreatedEvent.java
+++ b/src/main/java/com/epam/ta/reportportal/core/events/activity/DashboardCreatedEvent.java
@@ -23,7 +23,7 @@
 import com.epam.ta.reportportal.entity.activity.EventObject;
 import com.epam.ta.reportportal.entity.activity.EventPriority;
 import com.epam.ta.reportportal.entity.activity.EventSubject;
-import com.epam.ta.reportportal.ws.model.activity.DashboardActivityResource;
+import com.epam.ta.reportportal.model.activity.DashboardActivityResource;
 
 /**
  * @author pavel_bortnik
diff --git a/src/main/java/com/epam/ta/reportportal/core/events/activity/DashboardDeletedEvent.java b/src/main/java/com/epam/ta/reportportal/core/events/activity/DashboardDeletedEvent.java
index 859200ce72..dd6bf8eef5 100644
--- a/src/main/java/com/epam/ta/reportportal/core/events/activity/DashboardDeletedEvent.java
+++ b/src/main/java/com/epam/ta/reportportal/core/events/activity/DashboardDeletedEvent.java
@@ -23,7 +23,7 @@
 import com.epam.ta.reportportal.entity.activity.EventObject;
 import com.epam.ta.reportportal.entity.activity.EventPriority;
 import com.epam.ta.reportportal.entity.activity.EventSubject;
-import com.epam.ta.reportportal.ws.model.activity.DashboardActivityResource;
+import com.epam.ta.reportportal.model.activity.DashboardActivityResource;
 
 /**
  * @author pavel_bortnik
diff --git a/src/main/java/com/epam/ta/reportportal/core/events/activity/DashboardUpdatedEvent.java b/src/main/java/com/epam/ta/reportportal/core/events/activity/DashboardUpdatedEvent.java
index 4a46ee66b6..d0ba5a8c32 100644
--- a/src/main/java/com/epam/ta/reportportal/core/events/activity/DashboardUpdatedEvent.java
+++ b/src/main/java/com/epam/ta/reportportal/core/events/activity/DashboardUpdatedEvent.java
@@ -26,7 +26,7 @@
 import com.epam.ta.reportportal.entity.activity.EventObject;
 import com.epam.ta.reportportal.entity.activity.EventPriority;
 import com.epam.ta.reportportal.entity.activity.EventSubject;
-import com.epam.ta.reportportal.ws.model.activity.DashboardActivityResource;
+import com.epam.ta.reportportal.model.activity.DashboardActivityResource;
 
 /**
  * @author Andrei Varabyeu
diff --git a/src/main/java/com/epam/ta/reportportal/core/events/activity/DefectTypeCreatedEvent.java b/src/main/java/com/epam/ta/reportportal/core/events/activity/DefectTypeCreatedEvent.java
index be91c72767..2ceb54b366 100644
--- a/src/main/java/com/epam/ta/reportportal/core/events/activity/DefectTypeCreatedEvent.java
+++ b/src/main/java/com/epam/ta/reportportal/core/events/activity/DefectTypeCreatedEvent.java
@@ -13,6 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package com.epam.ta.reportportal.core.events.activity;
 
 import com.epam.ta.reportportal.builder.ActivityBuilder;
@@ -23,7 +24,7 @@
 import com.epam.ta.reportportal.entity.activity.EventObject;
 import com.epam.ta.reportportal.entity.activity.EventPriority;
 import com.epam.ta.reportportal.entity.activity.EventSubject;
-import com.epam.ta.reportportal.ws.model.activity.IssueTypeActivityResource;
+import com.epam.ta.reportportal.model.activity.IssueTypeActivityResource;
 
 /**
  * @author Andrei Varabyeu
@@ -61,18 +62,11 @@ public void setProjectId(Long projectId) {
 
   @Override
   public Activity toActivity() {
-    return new ActivityBuilder()
-        .addCreatedNow()
-        .addAction(EventAction.CREATE)
-        .addEventName(ActivityAction.CREATE_DEFECT.getValue())
-        .addPriority(EventPriority.LOW)
+    return new ActivityBuilder().addCreatedNow().addAction(EventAction.CREATE)
+        .addEventName(ActivityAction.CREATE_DEFECT.getValue()).addPriority(EventPriority.LOW)
         .addObjectId(issueTypeActivityResource.getId())
         .addObjectName(issueTypeActivityResource.getLongName())
-        .addObjectType(EventObject.DEFECT_TYPE)
-        .addProjectId(projectId)
-        .addSubjectId(getUserId())
-        .addSubjectName(getUserLogin())
-        .addSubjectType(EventSubject.USER)
-        .get();
+        .addObjectType(EventObject.DEFECT_TYPE).addProjectId(projectId).addSubjectId(getUserId())
+        .addSubjectName(getUserLogin()).addSubjectType(EventSubject.USER).get();
   }
 }
diff --git a/src/main/java/com/epam/ta/reportportal/core/events/activity/DefectTypeDeletedEvent.java b/src/main/java/com/epam/ta/reportportal/core/events/activity/DefectTypeDeletedEvent.java
index 519898cd01..9d49e4dc92 100644
--- a/src/main/java/com/epam/ta/reportportal/core/events/activity/DefectTypeDeletedEvent.java
+++ b/src/main/java/com/epam/ta/reportportal/core/events/activity/DefectTypeDeletedEvent.java
@@ -13,6 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package com.epam.ta.reportportal.core.events.activity;
 
 import com.epam.ta.reportportal.builder.ActivityBuilder;
@@ -23,13 +24,13 @@
 import com.epam.ta.reportportal.entity.activity.EventObject;
 import com.epam.ta.reportportal.entity.activity.EventPriority;
 import com.epam.ta.reportportal.entity.activity.EventSubject;
-import com.epam.ta.reportportal.ws.model.activity.IssueTypeActivityResource;
+import com.epam.ta.reportportal.model.activity.IssueTypeActivityResource;
 
 /**
  * @author Andrei Varabyeu
  */
-public class DefectTypeDeletedEvent extends BeforeEvent<IssueTypeActivityResource> implements
-    ActivityEvent {
+public class DefectTypeDeletedEvent extends BeforeEvent<IssueTypeActivityResource>
+    implements ActivityEvent {
 
   private Long projectId;
 
@@ -52,18 +53,10 @@ public void setProjectId(Long projectId) {
 
   @Override
   public Activity toActivity() {
-    return new ActivityBuilder()
-        .addCreatedNow()
-        .addAction(EventAction.DELETE)
-        .addEventName(ActivityAction.DELETE_DEFECT.getValue())
-        .addPriority(EventPriority.MEDIUM)
-        .addObjectId(getBefore().getId())
-        .addObjectName(getBefore().getLongName())
-        .addObjectType(EventObject.DEFECT_TYPE)
-        .addProjectId(projectId)
-        .addSubjectId(getUserId())
-        .addSubjectName(getUserLogin())
-        .addSubjectType(EventSubject.USER)
-        .get();
+    return new ActivityBuilder().addCreatedNow().addAction(EventAction.DELETE)
+        .addEventName(ActivityAction.DELETE_DEFECT.getValue()).addPriority(EventPriority.MEDIUM)
+        .addObjectId(getBefore().getId()).addObjectName(getBefore().getLongName())
+        .addObjectType(EventObject.DEFECT_TYPE).addProjectId(projectId).addSubjectId(getUserId())
+        .addSubjectName(getUserLogin()).addSubjectType(EventSubject.USER).get();
   }
 }
diff --git a/src/main/java/com/epam/ta/reportportal/core/events/activity/DefectTypeUpdatedEvent.java b/src/main/java/com/epam/ta/reportportal/core/events/activity/DefectTypeUpdatedEvent.java
index 86289b32f5..7f304014b3 100644
--- a/src/main/java/com/epam/ta/reportportal/core/events/activity/DefectTypeUpdatedEvent.java
+++ b/src/main/java/com/epam/ta/reportportal/core/events/activity/DefectTypeUpdatedEvent.java
@@ -13,6 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package com.epam.ta.reportportal.core.events.activity;
 
 import com.epam.ta.reportportal.builder.ActivityBuilder;
@@ -23,7 +24,7 @@
 import com.epam.ta.reportportal.entity.activity.EventObject;
 import com.epam.ta.reportportal.entity.activity.EventPriority;
 import com.epam.ta.reportportal.entity.activity.EventSubject;
-import com.epam.ta.reportportal.ws.model.activity.IssueTypeActivityResource;
+import com.epam.ta.reportportal.model.activity.IssueTypeActivityResource;
 
 /**
  * @author Andrei Varabyeu
@@ -61,18 +62,11 @@ public void setProjectId(Long projectId) {
 
   @Override
   public Activity toActivity() {
-    return new ActivityBuilder()
-        .addCreatedNow()
-        .addAction(EventAction.UPDATE)
-        .addEventName(ActivityAction.UPDATE_DEFECT.getValue())
-        .addPriority(EventPriority.LOW)
+    return new ActivityBuilder().addCreatedNow().addAction(EventAction.UPDATE)
+        .addEventName(ActivityAction.UPDATE_DEFECT.getValue()).addPriority(EventPriority.LOW)
         .addObjectId(issueTypeActivityResource.getId())
         .addObjectName(issueTypeActivityResource.getLongName())
-        .addObjectType(EventObject.DEFECT_TYPE)
-        .addProjectId(projectId)
-        .addSubjectId(getUserId())
-        .addSubjectName(getUserLogin())
-        .addSubjectType(EventSubject.USER)
-        .get();
+        .addObjectType(EventObject.DEFECT_TYPE).addProjectId(projectId).addSubjectId(getUserId())
+        .addSubjectName(getUserLogin()).addSubjectType(EventSubject.USER).get();
   }
 }
diff --git a/src/main/java/com/epam/ta/reportportal/core/events/activity/FilterCreatedEvent.java b/src/main/java/com/epam/ta/reportportal/core/events/activity/FilterCreatedEvent.java
index 1e3e7963bf..193272f7f3 100644
--- a/src/main/java/com/epam/ta/reportportal/core/events/activity/FilterCreatedEvent.java
+++ b/src/main/java/com/epam/ta/reportportal/core/events/activity/FilterCreatedEvent.java
@@ -24,7 +24,7 @@
 import com.epam.ta.reportportal.entity.activity.EventObject;
 import com.epam.ta.reportportal.entity.activity.EventPriority;
 import com.epam.ta.reportportal.entity.activity.EventSubject;
-import com.epam.ta.reportportal.ws.model.activity.UserFilterActivityResource;
+import com.epam.ta.reportportal.model.activity.UserFilterActivityResource;
 
 /**
  * @author pavel_bortnik
@@ -52,18 +52,11 @@ public void setUserFilterActivityResource(UserFilterActivityResource userFilterA
 
   @Override
   public Activity toActivity() {
-    return new ActivityBuilder()
-        .addCreatedNow()
-        .addAction(EventAction.CREATE)
-        .addEventName(ActivityAction.CREATE_FILTER.getValue())
-        .addPriority(EventPriority.LOW)
+    return new ActivityBuilder().addCreatedNow().addAction(EventAction.CREATE)
+        .addEventName(ActivityAction.CREATE_FILTER.getValue()).addPriority(EventPriority.LOW)
         .addObjectId(userFilterActivityResource.getId())
-        .addObjectName(userFilterActivityResource.getName())
-        .addObjectType(EventObject.FILTER)
-        .addProjectId(userFilterActivityResource.getProjectId())
-        .addSubjectId(getUserId())
-        .addSubjectName(getUserLogin())
-        .addSubjectType(EventSubject.USER)
-        .get();
+        .addObjectName(userFilterActivityResource.getName()).addObjectType(EventObject.FILTER)
+        .addProjectId(userFilterActivityResource.getProjectId()).addSubjectId(getUserId())
+        .addSubjectName(getUserLogin()).addSubjectType(EventSubject.USER).get();
   }
 }
diff --git a/src/main/java/com/epam/ta/reportportal/core/events/activity/FilterDeletedEvent.java b/src/main/java/com/epam/ta/reportportal/core/events/activity/FilterDeletedEvent.java
index 38e644d15f..b3b3614460 100644
--- a/src/main/java/com/epam/ta/reportportal/core/events/activity/FilterDeletedEvent.java
+++ b/src/main/java/com/epam/ta/reportportal/core/events/activity/FilterDeletedEvent.java
@@ -24,13 +24,13 @@
 import com.epam.ta.reportportal.entity.activity.EventObject;
 import com.epam.ta.reportportal.entity.activity.EventPriority;
 import com.epam.ta.reportportal.entity.activity.EventSubject;
-import com.epam.ta.reportportal.ws.model.activity.UserFilterActivityResource;
+import com.epam.ta.reportportal.model.activity.UserFilterActivityResource;
 
 /**
  * @author pavel_bortnik
  */
-public class FilterDeletedEvent extends BeforeEvent<UserFilterActivityResource> implements
-    ActivityEvent {
+public class FilterDeletedEvent extends BeforeEvent<UserFilterActivityResource>
+    implements ActivityEvent {
 
   public FilterDeletedEvent() {
   }
@@ -41,18 +41,11 @@ public FilterDeletedEvent(UserFilterActivityResource before, Long userId, String
 
   @Override
   public Activity toActivity() {
-    return new ActivityBuilder()
-        .addCreatedNow()
-        .addAction(EventAction.DELETE)
-        .addEventName(ActivityAction.DELETE_FILTER.getValue())
-        .addPriority(EventPriority.LOW)
-        .addObjectId(getBefore().getId())
-        .addObjectName(getBefore().getName())
-        .addObjectType(EventObject.FILTER)
-        .addProjectId(getBefore().getProjectId())
-        .addSubjectId(getUserId())
-        .addSubjectName(getUserLogin())
-        .addSubjectType(EventSubject.USER)
+    return new ActivityBuilder().addCreatedNow().addAction(EventAction.DELETE)
+        .addEventName(ActivityAction.DELETE_FILTER.getValue()).addPriority(EventPriority.LOW)
+        .addObjectId(getBefore().getId()).addObjectName(getBefore().getName())
+        .addObjectType(EventObject.FILTER).addProjectId(getBefore().getProjectId())
+        .addSubjectId(getUserId()).addSubjectName(getUserLogin()).addSubjectType(EventSubject.USER)
         .get();
   }
 }
diff --git a/src/main/java/com/epam/ta/reportportal/core/events/activity/FilterUpdatedEvent.java b/src/main/java/com/epam/ta/reportportal/core/events/activity/FilterUpdatedEvent.java
index 9b58cc01c5..83eeaadfe8 100644
--- a/src/main/java/com/epam/ta/reportportal/core/events/activity/FilterUpdatedEvent.java
+++ b/src/main/java/com/epam/ta/reportportal/core/events/activity/FilterUpdatedEvent.java
@@ -27,13 +27,13 @@
 import com.epam.ta.reportportal.entity.activity.EventObject;
 import com.epam.ta.reportportal.entity.activity.EventPriority;
 import com.epam.ta.reportportal.entity.activity.EventSubject;
-import com.epam.ta.reportportal.ws.model.activity.UserFilterActivityResource;
+import com.epam.ta.reportportal.model.activity.UserFilterActivityResource;
 
 /**
  * @author Pavel Bortnik
  */
-public class FilterUpdatedEvent extends AroundEvent<UserFilterActivityResource> implements
-    ActivityEvent {
+public class FilterUpdatedEvent extends AroundEvent<UserFilterActivityResource>
+    implements ActivityEvent {
 
   public FilterUpdatedEvent() {
   }
@@ -45,21 +45,12 @@ public FilterUpdatedEvent(UserFilterActivityResource before, UserFilterActivityR
 
   @Override
   public Activity toActivity() {
-    return new ActivityBuilder()
-        .addCreatedNow()
-        .addAction(EventAction.UPDATE)
-        .addEventName(ActivityAction.UPDATE_FILTER.getValue())
-        .addPriority(EventPriority.LOW)
-        .addObjectId(getAfter().getId())
-        .addObjectName(getAfter().getName())
-        .addObjectType(EventObject.FILTER)
-        .addProjectId(getAfter().getProjectId())
-        .addSubjectId(getUserId())
-        .addSubjectName(getUserLogin())
-        .addSubjectType(EventSubject.USER)
-        .addHistoryField(processName(getBefore().getName(), getAfter().getName()))
-        .addHistoryField(
-            processDescription(getBefore().getDescription(), getAfter().getDescription()))
-        .get();
+    return new ActivityBuilder().addCreatedNow().addAction(EventAction.UPDATE)
+        .addEventName(ActivityAction.UPDATE_FILTER.getValue()).addPriority(EventPriority.LOW)
+        .addObjectId(getAfter().getId()).addObjectName(getAfter().getName())
+        .addObjectType(EventObject.FILTER).addProjectId(getAfter().getProjectId())
+        .addSubjectId(getUserId()).addSubjectName(getUserLogin()).addSubjectType(EventSubject.USER)
+        .addHistoryField(processName(getBefore().getName(), getAfter().getName())).addHistoryField(
+            processDescription(getBefore().getDescription(), getAfter().getDescription())).get();
   }
 }
diff --git a/src/main/java/com/epam/ta/reportportal/core/events/activity/IntegrationCreatedEvent.java b/src/main/java/com/epam/ta/reportportal/core/events/activity/IntegrationCreatedEvent.java
index c24c9f8fcb..60d8ec2a74 100644
--- a/src/main/java/com/epam/ta/reportportal/core/events/activity/IntegrationCreatedEvent.java
+++ b/src/main/java/com/epam/ta/reportportal/core/events/activity/IntegrationCreatedEvent.java
@@ -27,7 +27,7 @@
 import com.epam.ta.reportportal.entity.activity.EventPriority;
 import com.epam.ta.reportportal.entity.activity.EventSubject;
 import com.epam.ta.reportportal.entity.activity.HistoryField;
-import com.epam.ta.reportportal.ws.model.activity.IntegrationActivityResource;
+import com.epam.ta.reportportal.model.activity.IntegrationActivityResource;
 import java.util.Optional;
 
 /**
diff --git a/src/main/java/com/epam/ta/reportportal/core/events/activity/IntegrationDeletedEvent.java b/src/main/java/com/epam/ta/reportportal/core/events/activity/IntegrationDeletedEvent.java
index c44a0782af..e74e784d33 100644
--- a/src/main/java/com/epam/ta/reportportal/core/events/activity/IntegrationDeletedEvent.java
+++ b/src/main/java/com/epam/ta/reportportal/core/events/activity/IntegrationDeletedEvent.java
@@ -27,7 +27,7 @@
 import com.epam.ta.reportportal.entity.activity.EventPriority;
 import com.epam.ta.reportportal.entity.activity.EventSubject;
 import com.epam.ta.reportportal.entity.activity.HistoryField;
-import com.epam.ta.reportportal.ws.model.activity.IntegrationActivityResource;
+import com.epam.ta.reportportal.model.activity.IntegrationActivityResource;
 import java.util.Optional;
 
 /**
diff --git a/src/main/java/com/epam/ta/reportportal/core/events/activity/IntegrationUpdatedEvent.java b/src/main/java/com/epam/ta/reportportal/core/events/activity/IntegrationUpdatedEvent.java
index 37b2c4bf72..dd21e96b17 100644
--- a/src/main/java/com/epam/ta/reportportal/core/events/activity/IntegrationUpdatedEvent.java
+++ b/src/main/java/com/epam/ta/reportportal/core/events/activity/IntegrationUpdatedEvent.java
@@ -27,7 +27,7 @@
 import com.epam.ta.reportportal.entity.activity.EventPriority;
 import com.epam.ta.reportportal.entity.activity.EventSubject;
 import com.epam.ta.reportportal.entity.activity.HistoryField;
-import com.epam.ta.reportportal.ws.model.activity.IntegrationActivityResource;
+import com.epam.ta.reportportal.model.activity.IntegrationActivityResource;
 import java.util.Optional;
 import org.apache.commons.lang3.StringUtils;
 
diff --git a/src/main/java/com/epam/ta/reportportal/core/events/activity/ItemIssueTypeDefinedEvent.java b/src/main/java/com/epam/ta/reportportal/core/events/activity/ItemIssueTypeDefinedEvent.java
index 0d270efe27..ed0f1c0505 100644
--- a/src/main/java/com/epam/ta/reportportal/core/events/activity/ItemIssueTypeDefinedEvent.java
+++ b/src/main/java/com/epam/ta/reportportal/core/events/activity/ItemIssueTypeDefinedEvent.java
@@ -30,8 +30,8 @@
 import com.epam.ta.reportportal.entity.activity.EventPriority;
 import com.epam.ta.reportportal.entity.activity.EventSubject;
 import com.epam.ta.reportportal.entity.activity.HistoryField;
-import com.epam.ta.reportportal.ws.model.activity.TestItemActivityResource;
-import com.epam.ta.reportportal.ws.model.analyzer.RelevantItemInfo;
+import com.epam.ta.reportportal.model.activity.TestItemActivityResource;
+import com.epam.ta.reportportal.model.analyzer.RelevantItemInfo;
 import java.util.Optional;
 
 /**
diff --git a/src/main/java/com/epam/ta/reportportal/core/events/activity/LaunchDeletedEvent.java b/src/main/java/com/epam/ta/reportportal/core/events/activity/LaunchDeletedEvent.java
index c9405dd887..721297aca4 100644
--- a/src/main/java/com/epam/ta/reportportal/core/events/activity/LaunchDeletedEvent.java
+++ b/src/main/java/com/epam/ta/reportportal/core/events/activity/LaunchDeletedEvent.java
@@ -23,7 +23,7 @@
 import com.epam.ta.reportportal.entity.activity.EventObject;
 import com.epam.ta.reportportal.entity.activity.EventPriority;
 import com.epam.ta.reportportal.entity.activity.EventSubject;
-import com.epam.ta.reportportal.ws.model.activity.LaunchActivityResource;
+import com.epam.ta.reportportal.model.activity.LaunchActivityResource;
 
 /**
  * @author Andrei Varabyeu
diff --git a/src/main/java/com/epam/ta/reportportal/core/events/activity/LaunchStartedEvent.java b/src/main/java/com/epam/ta/reportportal/core/events/activity/LaunchStartedEvent.java
index 8e2875a6bd..8a0fb1cfe0 100644
--- a/src/main/java/com/epam/ta/reportportal/core/events/activity/LaunchStartedEvent.java
+++ b/src/main/java/com/epam/ta/reportportal/core/events/activity/LaunchStartedEvent.java
@@ -23,7 +23,7 @@
 import com.epam.ta.reportportal.entity.activity.EventObject;
 import com.epam.ta.reportportal.entity.activity.EventPriority;
 import com.epam.ta.reportportal.entity.activity.EventSubject;
-import com.epam.ta.reportportal.ws.model.activity.LaunchActivityResource;
+import com.epam.ta.reportportal.model.activity.LaunchActivityResource;
 
 /**
  * @author Andrei Varabyeu
diff --git a/src/main/java/com/epam/ta/reportportal/core/events/activity/LinkTicketEvent.java b/src/main/java/com/epam/ta/reportportal/core/events/activity/LinkTicketEvent.java
index 523feb06c3..faedefed2b 100644
--- a/src/main/java/com/epam/ta/reportportal/core/events/activity/LinkTicketEvent.java
+++ b/src/main/java/com/epam/ta/reportportal/core/events/activity/LinkTicketEvent.java
@@ -25,7 +25,7 @@
 import com.epam.ta.reportportal.entity.activity.EventObject;
 import com.epam.ta.reportportal.entity.activity.EventPriority;
 import com.epam.ta.reportportal.entity.activity.EventSubject;
-import com.epam.ta.reportportal.ws.model.activity.TestItemActivityResource;
+import com.epam.ta.reportportal.model.activity.TestItemActivityResource;
 import com.google.common.base.Strings;
 
 /**
diff --git a/src/main/java/com/epam/ta/reportportal/core/events/activity/NotificationsConfigUpdatedEvent.java b/src/main/java/com/epam/ta/reportportal/core/events/activity/NotificationsConfigUpdatedEvent.java
index 4084376563..b39f592b2b 100644
--- a/src/main/java/com/epam/ta/reportportal/core/events/activity/NotificationsConfigUpdatedEvent.java
+++ b/src/main/java/com/epam/ta/reportportal/core/events/activity/NotificationsConfigUpdatedEvent.java
@@ -30,9 +30,9 @@
 import com.epam.ta.reportportal.entity.activity.EventPriority;
 import com.epam.ta.reportportal.entity.activity.EventSubject;
 import com.epam.ta.reportportal.entity.activity.HistoryField;
-import com.epam.ta.reportportal.ws.model.project.ProjectResource;
-import com.epam.ta.reportportal.ws.model.project.email.ProjectNotificationConfigDTO;
-import com.epam.ta.reportportal.ws.model.project.email.SenderCaseDTO;
+import com.epam.ta.reportportal.model.project.ProjectResource;
+import com.epam.ta.reportportal.model.project.email.ProjectNotificationConfigDTO;
+import com.epam.ta.reportportal.model.project.email.SenderCaseDTO;
 import java.util.Collections;
 import java.util.List;
 import java.util.stream.Collectors;
diff --git a/src/main/java/com/epam/ta/reportportal/core/events/activity/PatternCreatedEvent.java b/src/main/java/com/epam/ta/reportportal/core/events/activity/PatternCreatedEvent.java
index 4b4bbf664d..db45873ff8 100644
--- a/src/main/java/com/epam/ta/reportportal/core/events/activity/PatternCreatedEvent.java
+++ b/src/main/java/com/epam/ta/reportportal/core/events/activity/PatternCreatedEvent.java
@@ -24,7 +24,7 @@
 import com.epam.ta.reportportal.entity.activity.EventObject;
 import com.epam.ta.reportportal.entity.activity.EventPriority;
 import com.epam.ta.reportportal.entity.activity.EventSubject;
-import com.epam.ta.reportportal.ws.model.activity.PatternTemplateActivityResource;
+import com.epam.ta.reportportal.model.activity.PatternTemplateActivityResource;
 
 /**
  * @author <a href="mailto:ivan_budayeu@epam.com">Ivan Budayeu</a>
diff --git a/src/main/java/com/epam/ta/reportportal/core/events/activity/PatternDeletedEvent.java b/src/main/java/com/epam/ta/reportportal/core/events/activity/PatternDeletedEvent.java
index e356482d7d..2c1b71e746 100644
--- a/src/main/java/com/epam/ta/reportportal/core/events/activity/PatternDeletedEvent.java
+++ b/src/main/java/com/epam/ta/reportportal/core/events/activity/PatternDeletedEvent.java
@@ -24,7 +24,7 @@
 import com.epam.ta.reportportal.entity.activity.EventObject;
 import com.epam.ta.reportportal.entity.activity.EventPriority;
 import com.epam.ta.reportportal.entity.activity.EventSubject;
-import com.epam.ta.reportportal.ws.model.activity.PatternTemplateActivityResource;
+import com.epam.ta.reportportal.model.activity.PatternTemplateActivityResource;
 
 /**
  * @author <a href="mailto:ivan_budayeu@epam.com">Ivan Budayeu</a>
diff --git a/src/main/java/com/epam/ta/reportportal/core/events/activity/PatternMatchedEvent.java b/src/main/java/com/epam/ta/reportportal/core/events/activity/PatternMatchedEvent.java
index 7b69c44512..560761d21c 100644
--- a/src/main/java/com/epam/ta/reportportal/core/events/activity/PatternMatchedEvent.java
+++ b/src/main/java/com/epam/ta/reportportal/core/events/activity/PatternMatchedEvent.java
@@ -27,7 +27,7 @@
 import com.epam.ta.reportportal.entity.activity.EventPriority;
 import com.epam.ta.reportportal.entity.activity.EventSubject;
 import com.epam.ta.reportportal.entity.activity.HistoryField;
-import com.epam.ta.reportportal.ws.model.activity.PatternTemplateActivityResource;
+import com.epam.ta.reportportal.model.activity.PatternTemplateActivityResource;
 import java.util.Optional;
 
 /**
diff --git a/src/main/java/com/epam/ta/reportportal/core/events/activity/PatternUpdatedEvent.java b/src/main/java/com/epam/ta/reportportal/core/events/activity/PatternUpdatedEvent.java
index 247302bff2..b77b1591eb 100644
--- a/src/main/java/com/epam/ta/reportportal/core/events/activity/PatternUpdatedEvent.java
+++ b/src/main/java/com/epam/ta/reportportal/core/events/activity/PatternUpdatedEvent.java
@@ -28,7 +28,7 @@
 import com.epam.ta.reportportal.entity.activity.EventObject;
 import com.epam.ta.reportportal.entity.activity.EventPriority;
 import com.epam.ta.reportportal.entity.activity.EventSubject;
-import com.epam.ta.reportportal.ws.model.activity.PatternTemplateActivityResource;
+import com.epam.ta.reportportal.model.activity.PatternTemplateActivityResource;
 
 /**
  * @author <a href="mailto:ivan_budayeu@epam.com">Ivan Budayeu</a>
diff --git a/src/main/java/com/epam/ta/reportportal/core/events/activity/PluginDeletedEvent.java b/src/main/java/com/epam/ta/reportportal/core/events/activity/PluginDeletedEvent.java
index 007dad31b7..42cd91e805 100644
--- a/src/main/java/com/epam/ta/reportportal/core/events/activity/PluginDeletedEvent.java
+++ b/src/main/java/com/epam/ta/reportportal/core/events/activity/PluginDeletedEvent.java
@@ -8,7 +8,7 @@
 import com.epam.ta.reportportal.entity.activity.EventObject;
 import com.epam.ta.reportportal.entity.activity.EventPriority;
 import com.epam.ta.reportportal.entity.activity.EventSubject;
-import com.epam.ta.reportportal.ws.model.activity.PluginActivityResource;
+import com.epam.ta.reportportal.model.activity.PluginActivityResource;
 
 public class PluginDeletedEvent extends BeforeEvent<PluginActivityResource>
     implements ActivityEvent {
diff --git a/src/main/java/com/epam/ta/reportportal/core/events/activity/PluginUpdatedEvent.java b/src/main/java/com/epam/ta/reportportal/core/events/activity/PluginUpdatedEvent.java
index 7409588a9e..f193604e3d 100644
--- a/src/main/java/com/epam/ta/reportportal/core/events/activity/PluginUpdatedEvent.java
+++ b/src/main/java/com/epam/ta/reportportal/core/events/activity/PluginUpdatedEvent.java
@@ -12,7 +12,7 @@
 import com.epam.ta.reportportal.entity.activity.EventObject;
 import com.epam.ta.reportportal.entity.activity.EventPriority;
 import com.epam.ta.reportportal.entity.activity.EventSubject;
-import com.epam.ta.reportportal.ws.model.activity.PluginActivityResource;
+import com.epam.ta.reportportal.model.activity.PluginActivityResource;
 
 public class PluginUpdatedEvent extends AroundEvent<PluginActivityResource>
     implements ActivityEvent {
diff --git a/src/main/java/com/epam/ta/reportportal/core/events/activity/PluginUploadedEvent.java b/src/main/java/com/epam/ta/reportportal/core/events/activity/PluginUploadedEvent.java
index b50fa31d9a..4c3180be89 100644
--- a/src/main/java/com/epam/ta/reportportal/core/events/activity/PluginUploadedEvent.java
+++ b/src/main/java/com/epam/ta/reportportal/core/events/activity/PluginUploadedEvent.java
@@ -8,7 +8,7 @@
 import com.epam.ta.reportportal.entity.activity.EventObject;
 import com.epam.ta.reportportal.entity.activity.EventPriority;
 import com.epam.ta.reportportal.entity.activity.EventSubject;
-import com.epam.ta.reportportal.ws.model.activity.PluginActivityResource;
+import com.epam.ta.reportportal.model.activity.PluginActivityResource;
 
 public class PluginUploadedEvent extends AbstractEvent implements ActivityEvent {
 
@@ -17,7 +17,8 @@ public class PluginUploadedEvent extends AbstractEvent implements ActivityEvent
   public PluginUploadedEvent() {
   }
 
-  public PluginUploadedEvent(PluginActivityResource pluginActivityResource, Long userId, String userLogin) {
+  public PluginUploadedEvent(PluginActivityResource pluginActivityResource, Long userId,
+      String userLogin) {
     super(userId, userLogin);
     this.pluginActivityResource = pluginActivityResource;
   }
@@ -33,9 +34,9 @@ public void setPluginActivityResource(PluginActivityResource pluginActivityResou
   @Override
   public Activity toActivity() {
     return new ActivityBuilder().addCreatedNow().addAction(EventAction.CREATE)
-        .addEventName(ActivityAction.CREATE_PLUGIN.getValue()).addObjectId(pluginActivityResource.getId())
-        .addObjectName(pluginActivityResource.getName()).addObjectType(EventObject.PLUGIN)
-        .addSubjectId(getUserId()).addSubjectName(getUserLogin()).addSubjectType(EventSubject.USER)
-        .addPriority(EventPriority.CRITICAL).get();
+        .addEventName(ActivityAction.CREATE_PLUGIN.getValue())
+        .addObjectId(pluginActivityResource.getId()).addObjectName(pluginActivityResource.getName())
+        .addObjectType(EventObject.PLUGIN).addSubjectId(getUserId()).addSubjectName(getUserLogin())
+        .addSubjectType(EventSubject.USER).addPriority(EventPriority.CRITICAL).get();
   }
 }
diff --git a/src/main/java/com/epam/ta/reportportal/core/events/activity/ProjectAnalyzerConfigEvent.java b/src/main/java/com/epam/ta/reportportal/core/events/activity/ProjectAnalyzerConfigEvent.java
index 9fb9d8d0aa..8a7c0b91c3 100644
--- a/src/main/java/com/epam/ta/reportportal/core/events/activity/ProjectAnalyzerConfigEvent.java
+++ b/src/main/java/com/epam/ta/reportportal/core/events/activity/ProjectAnalyzerConfigEvent.java
@@ -16,7 +16,6 @@
 
 package com.epam.ta.reportportal.core.events.activity;
 
-import static com.epam.ta.reportportal.core.events.activity.util.ActivityDetailsUtil.configEquals;
 import static com.epam.ta.reportportal.core.events.activity.util.ActivityDetailsUtil.processParameter;
 import static com.epam.ta.reportportal.entity.enums.ProjectAttributeEnum.ALL_MESSAGES_SHOULD_MATCH;
 import static com.epam.ta.reportportal.entity.enums.ProjectAttributeEnum.AUTO_ANALYZER_ENABLED;
@@ -24,7 +23,6 @@
 import static com.epam.ta.reportportal.entity.enums.ProjectAttributeEnum.AUTO_UNIQUE_ERROR_ANALYZER_ENABLED;
 import static com.epam.ta.reportportal.entity.enums.ProjectAttributeEnum.MIN_SHOULD_MATCH;
 import static com.epam.ta.reportportal.entity.enums.ProjectAttributeEnum.NUMBER_OF_LOG_LINES;
-import static com.epam.ta.reportportal.entity.enums.ProjectAttributeEnum.Prefix;
 import static com.epam.ta.reportportal.entity.enums.ProjectAttributeEnum.SEARCH_LOGS_MIN_SHOULD_MATCH;
 import static com.epam.ta.reportportal.entity.enums.ProjectAttributeEnum.UNIQUE_ERROR_ANALYZER_REMOVE_NUMBERS;
 
@@ -36,22 +34,21 @@
 import com.epam.ta.reportportal.entity.activity.EventObject;
 import com.epam.ta.reportportal.entity.activity.EventPriority;
 import com.epam.ta.reportportal.entity.activity.EventSubject;
-import com.epam.ta.reportportal.ws.model.activity.ProjectAttributesActivityResource;
+import com.epam.ta.reportportal.model.activity.ProjectAttributesActivityResource;
 import java.util.Map;
 import java.util.stream.Stream;
 
 /**
  * @author Pavel Bortnik
  */
-public class ProjectAnalyzerConfigEvent extends
-    AroundEvent<ProjectAttributesActivityResource> implements ActivityEvent {
+public class ProjectAnalyzerConfigEvent extends AroundEvent<ProjectAttributesActivityResource>
+    implements ActivityEvent {
 
   public ProjectAnalyzerConfigEvent() {
   }
 
   public ProjectAnalyzerConfigEvent(ProjectAttributesActivityResource before,
-      ProjectAttributesActivityResource after, Long userId,
-      String userLogin) {
+      ProjectAttributesActivityResource after, Long userId, String userLogin) {
     super(userId, userLogin, before, after);
   }
 
@@ -63,27 +60,17 @@ public Activity toActivity() {
     final Map<String, String> oldConfig = before.getConfig();
     final Map<String, String> newConfig = after.getConfig();
 
-    final ActivityBuilder activityBuilder = new ActivityBuilder()
-        .addCreatedNow()
-        .addAction(EventAction.UPDATE)
-        .addEventName(ActivityAction.UPDATE_ANALYZER.getValue())
-        .addPriority(EventPriority.LOW)
-        .addObjectId(before.getProjectId())
-        .addObjectName("analyzer")
-        .addObjectType(EventObject.PROJECT)
-        .addProjectId(before.getProjectId())
-        .addSubjectId(getUserId())
-        .addSubjectName(getUserLogin())
-        .addSubjectType(EventSubject.USER);
+    final ActivityBuilder activityBuilder =
+        new ActivityBuilder().addCreatedNow().addAction(EventAction.UPDATE)
+            .addEventName(ActivityAction.UPDATE_ANALYZER.getValue()).addPriority(EventPriority.LOW)
+            .addObjectId(before.getProjectId()).addObjectName("analyzer")
+            .addObjectType(EventObject.PROJECT).addProjectId(before.getProjectId())
+            .addSubjectId(getUserId()).addSubjectName(getUserLogin())
+            .addSubjectType(EventSubject.USER);
 
-    Stream.of(AUTO_ANALYZER_MODE,
-            MIN_SHOULD_MATCH,
-            SEARCH_LOGS_MIN_SHOULD_MATCH,
-            NUMBER_OF_LOG_LINES,
-            AUTO_ANALYZER_ENABLED,
-            AUTO_UNIQUE_ERROR_ANALYZER_ENABLED,
-            UNIQUE_ERROR_ANALYZER_REMOVE_NUMBERS,
-            ALL_MESSAGES_SHOULD_MATCH
+    Stream.of(AUTO_ANALYZER_MODE, MIN_SHOULD_MATCH, SEARCH_LOGS_MIN_SHOULD_MATCH,
+            NUMBER_OF_LOG_LINES, AUTO_ANALYZER_ENABLED, AUTO_UNIQUE_ERROR_ANALYZER_ENABLED,
+            UNIQUE_ERROR_ANALYZER_REMOVE_NUMBERS, ALL_MESSAGES_SHOULD_MATCH
         ).map(type -> processParameter(oldConfig, newConfig, type.getAttribute()))
         .forEach(activityBuilder::addHistoryField);
 
diff --git a/src/main/java/com/epam/ta/reportportal/core/events/activity/ProjectPatternAnalyzerUpdateEvent.java b/src/main/java/com/epam/ta/reportportal/core/events/activity/ProjectPatternAnalyzerUpdateEvent.java
index f525f112e1..9e3b3fbad8 100644
--- a/src/main/java/com/epam/ta/reportportal/core/events/activity/ProjectPatternAnalyzerUpdateEvent.java
+++ b/src/main/java/com/epam/ta/reportportal/core/events/activity/ProjectPatternAnalyzerUpdateEvent.java
@@ -13,6 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package com.epam.ta.reportportal.core.events.activity;
 
 import static com.epam.ta.reportportal.core.events.activity.util.ActivityDetailsUtil.processParameter;
@@ -26,22 +27,20 @@
 import com.epam.ta.reportportal.entity.activity.EventObject;
 import com.epam.ta.reportportal.entity.activity.EventPriority;
 import com.epam.ta.reportportal.entity.activity.EventSubject;
-import com.epam.ta.reportportal.ws.model.activity.ProjectAttributesActivityResource;
+import com.epam.ta.reportportal.model.activity.ProjectAttributesActivityResource;
 import java.util.Map;
 
 /**
  * @author <a href="mailto:pavel_bortnik@epam.com">Pavel Bortnik</a>
  */
-public class ProjectPatternAnalyzerUpdateEvent extends
-    AroundEvent<ProjectAttributesActivityResource> implements
-    ActivityEvent {
+public class ProjectPatternAnalyzerUpdateEvent
+    extends AroundEvent<ProjectAttributesActivityResource> implements ActivityEvent {
 
   public ProjectPatternAnalyzerUpdateEvent() {
   }
 
   public ProjectPatternAnalyzerUpdateEvent(ProjectAttributesActivityResource before,
-      ProjectAttributesActivityResource after, Long userId,
-      String userLogin) {
+      ProjectAttributesActivityResource after, Long userId, String userLogin) {
     super(userId, userLogin, before, after);
   }
 
@@ -52,20 +51,14 @@ public Activity toActivity() {
     final Map<String, String> oldConfig = before.getConfig();
     final Map<String, String> newConfig = after.getConfig();
 
-    final ActivityBuilder activityBuilder = new ActivityBuilder()
-        .addCreatedNow()
-        .addAction(EventAction.UPDATE)
-        .addEventName(ActivityAction.UPDATE_PATTERN_ANALYZER.getValue())
-        .addPriority(EventPriority.LOW)
-        .addObjectId(before.getProjectId())
-        .addObjectName("pattern")
-        .addObjectType(EventObject.PROJECT)
-        .addProjectId(before.getProjectId())
-        .addSubjectId(getUserId())
-        .addSubjectName(getUserLogin())
-        .addSubjectType(EventSubject.USER)
-        .addHistoryField(
-            processParameter(oldConfig, newConfig, AUTO_PATTERN_ANALYZER_ENABLED.getAttribute()));
+    final ActivityBuilder activityBuilder =
+        new ActivityBuilder().addCreatedNow().addAction(EventAction.UPDATE)
+            .addEventName(ActivityAction.UPDATE_PATTERN_ANALYZER.getValue())
+            .addPriority(EventPriority.LOW).addObjectId(before.getProjectId())
+            .addObjectName("pattern").addObjectType(EventObject.PROJECT)
+            .addProjectId(before.getProjectId()).addSubjectId(getUserId())
+            .addSubjectName(getUserLogin()).addSubjectType(EventSubject.USER).addHistoryField(
+                processParameter(oldConfig, newConfig, AUTO_PATTERN_ANALYZER_ENABLED.getAttribute()));
     return activityBuilder.get();
   }
 }
diff --git a/src/main/java/com/epam/ta/reportportal/core/events/activity/ProjectUpdatedEvent.java b/src/main/java/com/epam/ta/reportportal/core/events/activity/ProjectUpdatedEvent.java
index c314131bc9..67162ac282 100644
--- a/src/main/java/com/epam/ta/reportportal/core/events/activity/ProjectUpdatedEvent.java
+++ b/src/main/java/com/epam/ta/reportportal/core/events/activity/ProjectUpdatedEvent.java
@@ -13,6 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package com.epam.ta.reportportal.core.events.activity;
 
 import static com.epam.ta.reportportal.core.events.activity.util.ActivityDetailsUtil.processParameter;
@@ -29,49 +30,40 @@
 import com.epam.ta.reportportal.entity.activity.EventObject;
 import com.epam.ta.reportportal.entity.activity.EventPriority;
 import com.epam.ta.reportportal.entity.activity.EventSubject;
-import com.epam.ta.reportportal.ws.model.activity.ProjectAttributesActivityResource;
+import com.epam.ta.reportportal.model.activity.ProjectAttributesActivityResource;
 
 /**
  * Being triggered on after project update
  *
  * @author Andrei Varabyeu
  */
-public class ProjectUpdatedEvent extends AroundEvent<ProjectAttributesActivityResource> implements
-    ActivityEvent {
+public class ProjectUpdatedEvent extends AroundEvent<ProjectAttributesActivityResource>
+    implements ActivityEvent {
 
   public ProjectUpdatedEvent() {
   }
 
   public ProjectUpdatedEvent(ProjectAttributesActivityResource before,
-      ProjectAttributesActivityResource after, Long userId,
-      String userLogin) {
+      ProjectAttributesActivityResource after, Long userId, String userLogin) {
     super(userId, userLogin, before, after);
   }
 
   @Override
   public Activity toActivity() {
-    return new ActivityBuilder().addCreatedNow()
-            .addAction(EventAction.UPDATE)
-            .addEventName(ActivityAction.UPDATE_PROJECT.getValue())
-            .addPriority(EventPriority.HIGH)
-            .addObjectId(getBefore().getProjectId())
-            .addObjectName(getBefore().getProjectName())
-            .addObjectType(EventObject.PROJECT)
-            .addProjectId(getBefore().getProjectId())
-            .addSubjectId(getUserId())
-            .addSubjectName(getUserLogin())
-            .addSubjectType(EventSubject.USER)
-            .addHistoryField(processParameter(getBefore().getConfig(),
-                getAfter().getConfig(),
-                INTERRUPT_JOB_TIME.getAttribute()
-            ))
-            .addHistoryField(processParameter(getBefore().getConfig(), getAfter().getConfig(),
-                KEEP_SCREENSHOTS.getAttribute()))
-            .addHistoryField(processParameter(getBefore().getConfig(), getAfter().getConfig(),
-                KEEP_LOGS.getAttribute()))
-            .addHistoryField(processParameter(getBefore().getConfig(), getAfter().getConfig(),
-                KEEP_LAUNCHES.getAttribute()))
-            .get();
+    return new ActivityBuilder().addCreatedNow().addAction(EventAction.UPDATE)
+        .addEventName(ActivityAction.UPDATE_PROJECT.getValue()).addPriority(EventPriority.HIGH)
+        .addObjectId(getBefore().getProjectId()).addObjectName(getBefore().getProjectName())
+        .addObjectType(EventObject.PROJECT).addProjectId(getBefore().getProjectId())
+        .addSubjectId(getUserId()).addSubjectName(getUserLogin()).addSubjectType(EventSubject.USER)
+        .addHistoryField(processParameter(getBefore().getConfig(), getAfter().getConfig(),
+            INTERRUPT_JOB_TIME.getAttribute()
+        )).addHistoryField(processParameter(getBefore().getConfig(), getAfter().getConfig(),
+            KEEP_SCREENSHOTS.getAttribute()
+        )).addHistoryField(processParameter(getBefore().getConfig(), getAfter().getConfig(),
+            KEEP_LOGS.getAttribute()
+        )).addHistoryField(processParameter(getBefore().getConfig(), getAfter().getConfig(),
+            KEEP_LAUNCHES.getAttribute()
+        )).get();
   }
 
 }
diff --git a/src/main/java/com/epam/ta/reportportal/core/events/activity/TicketPostedEvent.java b/src/main/java/com/epam/ta/reportportal/core/events/activity/TicketPostedEvent.java
index 06f6cc4b6b..08953bb08b 100644
--- a/src/main/java/com/epam/ta/reportportal/core/events/activity/TicketPostedEvent.java
+++ b/src/main/java/com/epam/ta/reportportal/core/events/activity/TicketPostedEvent.java
@@ -13,6 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package com.epam.ta.reportportal.core.events.activity;
 
 import static com.epam.ta.reportportal.core.events.activity.util.ActivityDetailsUtil.EMPTY_STRING;
@@ -26,7 +27,7 @@
 import com.epam.ta.reportportal.entity.activity.EventObject;
 import com.epam.ta.reportportal.entity.activity.EventPriority;
 import com.epam.ta.reportportal.entity.activity.EventSubject;
-import com.epam.ta.reportportal.ws.model.activity.TestItemActivityResource;
+import com.epam.ta.reportportal.model.activity.TestItemActivityResource;
 import com.epam.ta.reportportal.ws.model.externalsystem.Ticket;
 import com.google.common.base.Strings;
 
@@ -66,26 +67,18 @@ public void setTestItemActivityResource(TestItemActivityResource testItemActivit
 
   @Override
   public Activity toActivity() {
-    return new ActivityBuilder().addCreatedNow()
-        .addAction(EventAction.POST)
-        .addEventName(ActivityAction.POST_ISSUE.getValue())
-        .addPriority(EventPriority.LOW)
+    return new ActivityBuilder().addCreatedNow().addAction(EventAction.POST)
+        .addEventName(ActivityAction.POST_ISSUE.getValue()).addPriority(EventPriority.LOW)
         .addObjectId(testItemActivityResource.getId())
-        .addObjectName(testItemActivityResource.getName())
-        .addObjectType(EventObject.ITEM_ISSUE)
-        .addProjectId(testItemActivityResource.getProjectId())
-        .addSubjectId(getUserId())
-        .addSubjectName(getUserLogin())
-        .addSubjectType(EventSubject.USER)
-        .addHistoryField(
-            TICKET_ID,
-            Strings.isNullOrEmpty(testItemActivityResource.getTickets()) ? EMPTY_STRING
-                : testItemActivityResource.getTickets(),
+        .addObjectName(testItemActivityResource.getName()).addObjectType(EventObject.ITEM_ISSUE)
+        .addProjectId(testItemActivityResource.getProjectId()).addSubjectId(getUserId())
+        .addSubjectName(getUserLogin()).addSubjectType(EventSubject.USER).addHistoryField(
+            TICKET_ID, Strings.isNullOrEmpty(testItemActivityResource.getTickets()) ? EMPTY_STRING :
+                testItemActivityResource.getTickets(),
             Strings.isNullOrEmpty(testItemActivityResource.getTickets()) ?
                 ticket.getId() + ":" + ticket.getTicketUrl() :
                 testItemActivityResource.getTickets() + "," + ticket.getId() + ":"
                     + ticket.getTicketUrl()
-        )
-        .get();
+        ).get();
   }
 }
diff --git a/src/main/java/com/epam/ta/reportportal/core/events/activity/UnassignUserEvent.java b/src/main/java/com/epam/ta/reportportal/core/events/activity/UnassignUserEvent.java
index b323e36465..dedd684a71 100644
--- a/src/main/java/com/epam/ta/reportportal/core/events/activity/UnassignUserEvent.java
+++ b/src/main/java/com/epam/ta/reportportal/core/events/activity/UnassignUserEvent.java
@@ -26,7 +26,7 @@
 import com.epam.ta.reportportal.entity.activity.EventObject;
 import com.epam.ta.reportportal.entity.activity.EventPriority;
 import com.epam.ta.reportportal.entity.activity.EventSubject;
-import com.epam.ta.reportportal.ws.model.activity.UserActivityResource;
+import com.epam.ta.reportportal.model.activity.UserActivityResource;
 
 public class UnassignUserEvent extends AbstractEvent implements ActivityEvent {
 
@@ -70,19 +70,13 @@ public void setSystemEvent(boolean systemEvent) {
 
   @Override
   public Activity toActivity() {
-    return new ActivityBuilder()
-        .addCreatedNow()
-        .addAction(EventAction.UNASSIGN)
-        .addEventName(UNASSIGN_USER.getValue())
-        .addPriority(EventPriority.MEDIUM)
-        .addObjectId(userActivityResource.getId())
-        .addObjectName(userActivityResource.getFullName())
-        .addObjectType(EventObject.USER)
-        .addProjectId(userActivityResource.getDefaultProjectId())
+    return new ActivityBuilder().addCreatedNow().addAction(EventAction.UNASSIGN)
+        .addEventName(UNASSIGN_USER.getValue()).addPriority(EventPriority.MEDIUM)
+        .addObjectId(userActivityResource.getId()).addObjectName(userActivityResource.getFullName())
+        .addObjectType(EventObject.USER).addProjectId(userActivityResource.getDefaultProjectId())
         .addSubjectId(isSystemEvent ? null : getUserId())
         .addSubjectName(isSystemEvent ? RP_SUBJECT_NAME : getUserLogin())
-        .addSubjectType(isSystemEvent ? EventSubject.APPLICATION : EventSubject.USER)
-        .get();
+        .addSubjectType(isSystemEvent ? EventSubject.APPLICATION : EventSubject.USER).get();
   }
 
 }
diff --git a/src/main/java/com/epam/ta/reportportal/core/events/activity/UserCreatedEvent.java b/src/main/java/com/epam/ta/reportportal/core/events/activity/UserCreatedEvent.java
index 7576388859..801a630f14 100644
--- a/src/main/java/com/epam/ta/reportportal/core/events/activity/UserCreatedEvent.java
+++ b/src/main/java/com/epam/ta/reportportal/core/events/activity/UserCreatedEvent.java
@@ -25,7 +25,7 @@
 import com.epam.ta.reportportal.entity.activity.EventObject;
 import com.epam.ta.reportportal.entity.activity.EventPriority;
 import com.epam.ta.reportportal.entity.activity.EventSubject;
-import com.epam.ta.reportportal.ws.model.activity.UserActivityResource;
+import com.epam.ta.reportportal.model.activity.UserActivityResource;
 
 /**
  * @author Andrei Varabyeu
diff --git a/src/main/java/com/epam/ta/reportportal/core/events/activity/UserDeletedEvent.java b/src/main/java/com/epam/ta/reportportal/core/events/activity/UserDeletedEvent.java
index f0ae526e05..b644d85137 100644
--- a/src/main/java/com/epam/ta/reportportal/core/events/activity/UserDeletedEvent.java
+++ b/src/main/java/com/epam/ta/reportportal/core/events/activity/UserDeletedEvent.java
@@ -8,7 +8,7 @@
 import com.epam.ta.reportportal.entity.activity.EventObject;
 import com.epam.ta.reportportal.entity.activity.EventPriority;
 import com.epam.ta.reportportal.entity.activity.EventSubject;
-import com.epam.ta.reportportal.ws.model.activity.UserActivityResource;
+import com.epam.ta.reportportal.model.activity.UserActivityResource;
 
 public class UserDeletedEvent extends BeforeEvent<UserActivityResource> implements ActivityEvent {
 
diff --git a/src/main/java/com/epam/ta/reportportal/core/events/activity/UsersDeletedEvent.java b/src/main/java/com/epam/ta/reportportal/core/events/activity/UsersDeletedEvent.java
index ff9a106fd0..fb4427397c 100644
--- a/src/main/java/com/epam/ta/reportportal/core/events/activity/UsersDeletedEvent.java
+++ b/src/main/java/com/epam/ta/reportportal/core/events/activity/UsersDeletedEvent.java
@@ -8,7 +8,7 @@
 import com.epam.ta.reportportal.entity.activity.EventObject;
 import com.epam.ta.reportportal.entity.activity.EventPriority;
 import com.epam.ta.reportportal.entity.activity.EventSubject;
-import com.epam.ta.reportportal.ws.model.activity.UserActivityResource;
+import com.epam.ta.reportportal.model.activity.UserActivityResource;
 
 public class UsersDeletedEvent extends BeforeEvent<UserActivityResource> implements ActivityEvent {
 
diff --git a/src/main/java/com/epam/ta/reportportal/core/events/activity/WidgetCreatedEvent.java b/src/main/java/com/epam/ta/reportportal/core/events/activity/WidgetCreatedEvent.java
index 8c3b515a80..eb3a59f0ba 100644
--- a/src/main/java/com/epam/ta/reportportal/core/events/activity/WidgetCreatedEvent.java
+++ b/src/main/java/com/epam/ta/reportportal/core/events/activity/WidgetCreatedEvent.java
@@ -24,7 +24,7 @@
 import com.epam.ta.reportportal.entity.activity.EventObject;
 import com.epam.ta.reportportal.entity.activity.EventPriority;
 import com.epam.ta.reportportal.entity.activity.EventSubject;
-import com.epam.ta.reportportal.ws.model.activity.WidgetActivityResource;
+import com.epam.ta.reportportal.model.activity.WidgetActivityResource;
 
 /**
  * @author pavel_bortnik
@@ -52,18 +52,11 @@ public void setWidgetActivityResource(WidgetActivityResource widgetActivityResou
 
   @Override
   public Activity toActivity() {
-    return new ActivityBuilder()
-        .addCreatedNow()
-        .addAction(EventAction.CREATE)
-        .addEventName(ActivityAction.CREATE_WIDGET.getValue())
-        .addPriority(EventPriority.LOW)
-        .addObjectId(widgetActivityResource.getId())
-        .addObjectName(widgetActivityResource.getName())
-        .addObjectType(EventObject.WIDGET)
-        .addProjectId(widgetActivityResource.getProjectId())
-        .addSubjectId(getUserId())
-        .addSubjectName(getUserLogin())
-        .addSubjectType(EventSubject.USER)
+    return new ActivityBuilder().addCreatedNow().addAction(EventAction.CREATE)
+        .addEventName(ActivityAction.CREATE_WIDGET.getValue()).addPriority(EventPriority.LOW)
+        .addObjectId(widgetActivityResource.getId()).addObjectName(widgetActivityResource.getName())
+        .addObjectType(EventObject.WIDGET).addProjectId(widgetActivityResource.getProjectId())
+        .addSubjectId(getUserId()).addSubjectName(getUserLogin()).addSubjectType(EventSubject.USER)
         .get();
   }
 
diff --git a/src/main/java/com/epam/ta/reportportal/core/events/activity/WidgetDeletedEvent.java b/src/main/java/com/epam/ta/reportportal/core/events/activity/WidgetDeletedEvent.java
index a9cd80baa4..3f564b8cc1 100644
--- a/src/main/java/com/epam/ta/reportportal/core/events/activity/WidgetDeletedEvent.java
+++ b/src/main/java/com/epam/ta/reportportal/core/events/activity/WidgetDeletedEvent.java
@@ -24,7 +24,7 @@
 import com.epam.ta.reportportal.entity.activity.EventObject;
 import com.epam.ta.reportportal.entity.activity.EventPriority;
 import com.epam.ta.reportportal.entity.activity.EventSubject;
-import com.epam.ta.reportportal.ws.model.activity.WidgetActivityResource;
+import com.epam.ta.reportportal.model.activity.WidgetActivityResource;
 
 /**
  * @author pavel_bortnik
diff --git a/src/main/java/com/epam/ta/reportportal/core/events/activity/WidgetUpdatedEvent.java b/src/main/java/com/epam/ta/reportportal/core/events/activity/WidgetUpdatedEvent.java
index 80353e0bb9..f634b86e7f 100644
--- a/src/main/java/com/epam/ta/reportportal/core/events/activity/WidgetUpdatedEvent.java
+++ b/src/main/java/com/epam/ta/reportportal/core/events/activity/WidgetUpdatedEvent.java
@@ -13,6 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package com.epam.ta.reportportal.core.events.activity;
 
 import static com.epam.ta.reportportal.core.events.activity.util.ActivityDetailsUtil.CONTENT_FIELDS;
@@ -30,15 +31,16 @@
 import com.epam.ta.reportportal.entity.activity.EventPriority;
 import com.epam.ta.reportportal.entity.activity.EventSubject;
 import com.epam.ta.reportportal.entity.activity.HistoryField;
-import com.epam.ta.reportportal.ws.model.activity.WidgetActivityResource;
+import com.epam.ta.reportportal.model.activity.WidgetActivityResource;
 import java.util.Optional;
 import java.util.Set;
 
 /**
  * @author Andrei Varabyeu
  */
-public class WidgetUpdatedEvent extends AroundEvent<WidgetActivityResource> implements
-    ActivityEvent {
+
+public class WidgetUpdatedEvent extends AroundEvent<WidgetActivityResource>
+    implements ActivityEvent {
 
   private String widgetOptionsBefore;
   private String widgetOptionsAfter;
@@ -47,8 +49,7 @@ public WidgetUpdatedEvent() {
   }
 
   public WidgetUpdatedEvent(WidgetActivityResource before, WidgetActivityResource after,
-      String widgetOptionsBefore,
-      String widgetOptionsAfter, Long userId, String userLogin) {
+      String widgetOptionsBefore, String widgetOptionsAfter, Long userId, String userLogin) {
     super(userId, userLogin, before, after);
     this.widgetOptionsBefore = widgetOptionsBefore;
     this.widgetOptionsAfter = widgetOptionsAfter;
@@ -72,19 +73,12 @@ public void setWidgetOptionsAfter(String widgetOptionsAfter) {
 
   @Override
   public Activity toActivity() {
-    return new ActivityBuilder().addCreatedNow()
-        .addAction(EventAction.UPDATE)
-        .addEventName(ActivityAction.UPDATE_WIDGET.getValue())
-        .addPriority(EventPriority.LOW)
-        .addObjectId(getAfter().getId())
-        .addObjectName(getAfter().getName())
-        .addObjectType(EventObject.WIDGET)
-        .addProjectId(getAfter().getProjectId())
-        .addSubjectId(getUserId())
-        .addSubjectName(getUserLogin())
-        .addSubjectType(EventSubject.USER)
-        .addHistoryField(processName(getBefore().getName(), getAfter().getName()))
-        .addHistoryField(
+    return new ActivityBuilder().addCreatedNow().addAction(EventAction.UPDATE)
+        .addEventName(ActivityAction.UPDATE_WIDGET.getValue()).addPriority(EventPriority.LOW)
+        .addObjectId(getAfter().getId()).addObjectName(getAfter().getName())
+        .addObjectType(EventObject.WIDGET).addProjectId(getAfter().getProjectId())
+        .addSubjectId(getUserId()).addSubjectName(getUserLogin()).addSubjectType(EventSubject.USER)
+        .addHistoryField(processName(getBefore().getName(), getAfter().getName())).addHistoryField(
             processDescription(getBefore().getDescription(), getAfter().getDescription()))
         .addHistoryField(processItemsCount(getBefore().getItemsCount(), getAfter().getItemsCount()))
         .addHistoryField(
diff --git a/src/main/java/com/epam/ta/reportportal/core/events/activity/item/TestItemStatusChangedEvent.java b/src/main/java/com/epam/ta/reportportal/core/events/activity/item/TestItemStatusChangedEvent.java
index 2a622b1295..e5c378bbd7 100644
--- a/src/main/java/com/epam/ta/reportportal/core/events/activity/item/TestItemStatusChangedEvent.java
+++ b/src/main/java/com/epam/ta/reportportal/core/events/activity/item/TestItemStatusChangedEvent.java
@@ -27,7 +27,7 @@
 import com.epam.ta.reportportal.entity.activity.EventObject;
 import com.epam.ta.reportportal.entity.activity.EventPriority;
 import com.epam.ta.reportportal.entity.activity.EventSubject;
-import com.epam.ta.reportportal.ws.model.activity.TestItemActivityResource;
+import com.epam.ta.reportportal.model.activity.TestItemActivityResource;
 
 /**
  * @author <a href="mailto:ihar_kahadouski@epam.com">Ihar Kahadouski</a>
diff --git a/src/main/java/com/epam/ta/reportportal/core/events/activity/util/IntegrationActivityPriorityResolver.java b/src/main/java/com/epam/ta/reportportal/core/events/activity/util/IntegrationActivityPriorityResolver.java
index d37df54a70..8e01e8eef4 100644
--- a/src/main/java/com/epam/ta/reportportal/core/events/activity/util/IntegrationActivityPriorityResolver.java
+++ b/src/main/java/com/epam/ta/reportportal/core/events/activity/util/IntegrationActivityPriorityResolver.java
@@ -17,7 +17,7 @@
 package com.epam.ta.reportportal.core.events.activity.util;
 
 import com.epam.ta.reportportal.entity.activity.EventPriority;
-import com.epam.ta.reportportal.ws.model.activity.IntegrationActivityResource;
+import com.epam.ta.reportportal.model.activity.IntegrationActivityResource;
 
 /**
  * @author <a href="mailto:pavel_bortnik@epam.com">Pavel Bortnik</a>
diff --git a/src/main/java/com/epam/ta/reportportal/core/events/annotations/WidgetLimitRange.java b/src/main/java/com/epam/ta/reportportal/core/events/annotations/WidgetLimitRange.java
new file mode 100644
index 0000000000..d547f45436
--- /dev/null
+++ b/src/main/java/com/epam/ta/reportportal/core/events/annotations/WidgetLimitRange.java
@@ -0,0 +1,21 @@
+package com.epam.ta.reportportal.core.events.annotations;
+
+import javax.validation.Constraint;
+import java.lang.annotation.*;
+
+/**
+ * @author <a href="mailto:pavel_bortnik@epam.com">Pavel Bortnik</a>
+ */
+@Documented
+@Constraint(validatedBy = { WidgetLimitRangeValidator.class})
+@Retention(RetentionPolicy.RUNTIME)
+@Target({ ElementType.ANNOTATION_TYPE, ElementType.METHOD, ElementType.FIELD, ElementType.TYPE, ElementType.PARAMETER })
+public @interface WidgetLimitRange {
+	String message() default "The provided limit is not allowed for the widget";
+
+	Class<?>[] groups() default {};
+
+	Class<?>[] payload() default {};
+
+	String[] allowedValues() default {};
+}
diff --git a/src/main/java/com/epam/ta/reportportal/core/events/annotations/WidgetLimitRangeValidator.java b/src/main/java/com/epam/ta/reportportal/core/events/annotations/WidgetLimitRangeValidator.java
new file mode 100644
index 0000000000..429961640c
--- /dev/null
+++ b/src/main/java/com/epam/ta/reportportal/core/events/annotations/WidgetLimitRangeValidator.java
@@ -0,0 +1,41 @@
+package com.epam.ta.reportportal.core.events.annotations;
+
+import static com.epam.ta.reportportal.ws.model.ValidationConstraints.MAX_WIDGET_LIMIT;
+import static com.epam.ta.reportportal.ws.model.ValidationConstraints.MIN_WIDGET_LIMIT;
+
+import com.epam.ta.reportportal.model.BaseEntityRQ;
+import com.epam.ta.reportportal.model.widget.MaterializedWidgetType;
+import com.epam.ta.reportportal.model.widget.WidgetRQ;
+import java.util.Arrays;
+import javax.validation.ConstraintValidator;
+import javax.validation.ConstraintValidatorContext;
+
+/**
+ * @author <a href="mailto:pavel_bortnik@epam.com">Pavel Bortnik</a>
+ */
+public class WidgetLimitRangeValidator
+    implements ConstraintValidator<WidgetLimitRange, BaseEntityRQ> {
+
+  @Override
+  public boolean isValid(BaseEntityRQ value, ConstraintValidatorContext context) {
+    if (value instanceof WidgetRQ) {
+      WidgetRQ widgetRQ = (WidgetRQ) value;
+      int limit = widgetRQ.getContentParameters().getItemsCount();
+      if (Arrays.stream(MaterializedWidgetType.values())
+          .anyMatch(it -> it.getType().equalsIgnoreCase(widgetRQ.getWidgetType()))) {
+        return limit >= MIN_WIDGET_LIMIT;
+      }
+      updateValidationMessage(
+          "Widget item limit size must be between " + MIN_WIDGET_LIMIT + " and " + MAX_WIDGET_LIMIT,
+          context
+      );
+      return limit >= MIN_WIDGET_LIMIT && limit <= MAX_WIDGET_LIMIT;
+    }
+    return false;
+  }
+
+  public void updateValidationMessage(String message, ConstraintValidatorContext context) {
+    context.disableDefaultConstraintViolation();
+    context.buildConstraintViolationWithTemplate(message).addConstraintViolation();
+  }
+}
diff --git a/src/main/java/com/epam/ta/reportportal/core/events/handler/item/TestItemUniqueErrorAnalysisRunner.java b/src/main/java/com/epam/ta/reportportal/core/events/handler/item/TestItemUniqueErrorAnalysisRunner.java
index f281499da6..907ddc28ed 100644
--- a/src/main/java/com/epam/ta/reportportal/core/events/handler/item/TestItemUniqueErrorAnalysisRunner.java
+++ b/src/main/java/com/epam/ta/reportportal/core/events/handler/item/TestItemUniqueErrorAnalysisRunner.java
@@ -24,8 +24,8 @@
 import com.epam.ta.reportportal.core.launch.cluster.ClusterGenerator;
 import com.epam.ta.reportportal.core.launch.cluster.config.ClusterEntityContext;
 import com.epam.ta.reportportal.core.launch.cluster.config.GenerateClustersConfig;
+import com.epam.ta.reportportal.model.project.UniqueErrorConfig;
 import com.epam.ta.reportportal.ws.model.project.AnalyzerConfig;
-import com.epam.ta.reportportal.ws.model.project.UniqueErrorConfig;
 import java.util.List;
 import java.util.Map;
 import org.springframework.beans.factory.annotation.Qualifier;
@@ -35,8 +35,8 @@
  * @author <a href="mailto:ivan_budayeu@epam.com">Ivan Budayeu</a>
  */
 @Service
-public class TestItemUniqueErrorAnalysisRunner implements
-    ConfigurableEventHandler<IssueResolvedEvent, Map<String, String>> {
+public class TestItemUniqueErrorAnalysisRunner
+    implements ConfigurableEventHandler<IssueResolvedEvent, Map<String, String>> {
 
   private final ClusterGenerator clusterGenerator;
 
@@ -57,10 +57,10 @@ public void handle(IssueResolvedEvent event, Map<String, String> projectConfig)
       final AnalyzerConfig analyzerConfig = getAnalyzerConfig(projectConfig);
       clustersConfig.setAnalyzerConfig(analyzerConfig);
 
-      final ClusterEntityContext entityContext = ClusterEntityContext.of(event.getLaunchId(),
-          event.getProjectId(),
-          List.of(event.getItemId())
-      );
+      final ClusterEntityContext entityContext =
+          ClusterEntityContext.of(event.getLaunchId(), event.getProjectId(),
+              List.of(event.getItemId())
+          );
       clustersConfig.setEntityContext(entityContext);
 
       clusterGenerator.generate(clustersConfig);
diff --git a/src/main/java/com/epam/ta/reportportal/core/filter/GetUserFilterHandler.java b/src/main/java/com/epam/ta/reportportal/core/filter/GetUserFilterHandler.java
index e2918400fa..80ba1be427 100644
--- a/src/main/java/com/epam/ta/reportportal/core/filter/GetUserFilterHandler.java
+++ b/src/main/java/com/epam/ta/reportportal/core/filter/GetUserFilterHandler.java
@@ -19,11 +19,10 @@
 import com.epam.ta.reportportal.commons.ReportPortalUser;
 import com.epam.ta.reportportal.commons.querygen.Filter;
 import com.epam.ta.reportportal.entity.filter.UserFilter;
-import com.epam.ta.reportportal.ws.model.OwnedEntityResource;
-import com.epam.ta.reportportal.ws.model.filter.UserFilterResource;
-import org.springframework.data.domain.Pageable;
-
+import com.epam.ta.reportportal.model.OwnedEntityResource;
+import com.epam.ta.reportportal.model.filter.UserFilterResource;
 import java.util.List;
+import org.springframework.data.domain.Pageable;
 
 /**
  * Get filter handler
@@ -32,47 +31,49 @@
  */
 public interface GetUserFilterHandler {
 
-	/**
-	 * Get {@link UserFilterResource} by provided id
-	 *
-	 * @param id             Provided id
-	 * @param projectDetails Projcet details
-	 * @return {@link UserFilterResource}
-	 */
-	UserFilterResource getUserFilter(Long id, ReportPortalUser.ProjectDetails projectDetails);
+  /**
+   * Get {@link UserFilterResource} by provided id
+   *
+   * @param id             Provided id
+   * @param projectDetails Projcet details
+   * @return {@link UserFilterResource}
+   */
+  UserFilterResource getUserFilter(Long id, ReportPortalUser.ProjectDetails projectDetails);
 
-	/**
-	 * Get {@link UserFilterResource} objects
-	 *
-	 * @param projectName Project Name
-	 * @param pageable    Page request
-	 * @param filter      Filter representation
-	 * @param user        Report Portal User
-	 * @return {@link Iterable}
-	 */
-	Iterable<UserFilterResource> getUserFilters(String projectName, Pageable pageable, Filter filter, ReportPortalUser user);
+  /**
+   * Get {@link UserFilterResource} objects
+   *
+   * @param projectName Project Name
+   * @param pageable    Page request
+   * @param filter      Filter representation
+   * @param user        Report Portal User
+   * @return {@link Iterable}
+   */
+  Iterable<UserFilterResource> getUserFilters(String projectName, Pageable pageable, Filter filter,
+      ReportPortalUser user);
 
-	/**
-	 * Get all {@link com.epam.ta.reportportal.entity.filter.UserFilter}'s names
-	 *
-	 * @param projectDetails Project details
-	 * @param pageable       Page request
-	 * @param filter         Filter representation
-	 * @param user           Report Portal user
-	 * @return List of {@link OwnedEntityResource}
-	 */
-	Iterable<OwnedEntityResource> getFiltersNames(ReportPortalUser.ProjectDetails projectDetails, Pageable pageable, Filter filter,
-			ReportPortalUser user);
+  /**
+   * Get all {@link com.epam.ta.reportportal.entity.filter.UserFilter}'s names
+   *
+   * @param projectDetails Project details
+   * @param pageable       Page request
+   * @param filter         Filter representation
+   * @param user           Report Portal user
+   * @return List of {@link OwnedEntityResource}
+   */
+  Iterable<OwnedEntityResource> getFiltersNames(ReportPortalUser.ProjectDetails projectDetails,
+      Pageable pageable, Filter filter, ReportPortalUser user);
 
-	/**
-	 * Get all
-	 * {@link com.epam.ta.reportportal.ws.model.filter.UserFilterResource}
-	 * objects
-	 *
-	 * @param ids            Filter IDs
-	 * @param projectDetails Project details
-	 * @param user           Report Portal user
-	 * @return Found filters
-	 */
-	List<UserFilter> getFiltersById(Long[] ids, ReportPortalUser.ProjectDetails projectDetails, ReportPortalUser user);
+  /**
+   * Get all
+   * {@link UserFilterResource}
+   * objects
+   *
+   * @param ids            Filter IDs
+   * @param projectDetails Project details
+   * @param user           Report Portal user
+   * @return Found filters
+   */
+  List<UserFilter> getFiltersById(Long[] ids, ReportPortalUser.ProjectDetails projectDetails,
+      ReportPortalUser user);
 }
diff --git a/src/main/java/com/epam/ta/reportportal/core/filter/SearchCriteriaService.java b/src/main/java/com/epam/ta/reportportal/core/filter/SearchCriteriaService.java
index cfb5c93d17..f26ee8fead 100644
--- a/src/main/java/com/epam/ta/reportportal/core/filter/SearchCriteriaService.java
+++ b/src/main/java/com/epam/ta/reportportal/core/filter/SearchCriteriaService.java
@@ -18,7 +18,7 @@
 
 import com.epam.ta.reportportal.commons.querygen.Queryable;
 import com.epam.ta.reportportal.core.filter.predefined.PredefinedFilterType;
-import com.epam.ta.reportportal.ws.model.SearchCriteriaRQ;
+import com.epam.ta.reportportal.model.SearchCriteriaRQ;
 
 /**
  * Service for converting SearchCriteria to Filter.
@@ -27,7 +27,7 @@
  */
 public interface SearchCriteriaService {
 
-  Queryable createFilterBySearchCriteria(SearchCriteriaRQ searchCriteriaRQ,
-      Class<?> target, PredefinedFilterType predefinedFilterType);
+  Queryable createFilterBySearchCriteria(SearchCriteriaRQ searchCriteriaRQ, Class<?> target,
+      PredefinedFilterType predefinedFilterType);
 
 }
diff --git a/src/main/java/com/epam/ta/reportportal/core/filter/UpdateUserFilterHandler.java b/src/main/java/com/epam/ta/reportportal/core/filter/UpdateUserFilterHandler.java
index 2374c0eb67..6eb5f5cc55 100644
--- a/src/main/java/com/epam/ta/reportportal/core/filter/UpdateUserFilterHandler.java
+++ b/src/main/java/com/epam/ta/reportportal/core/filter/UpdateUserFilterHandler.java
@@ -17,14 +17,11 @@
 package com.epam.ta.reportportal.core.filter;
 
 import com.epam.ta.reportportal.commons.ReportPortalUser;
-import com.epam.ta.reportportal.entity.filter.UserFilter;
-import com.epam.ta.reportportal.ws.model.CollectionsRQ;
-import com.epam.ta.reportportal.ws.model.EntryCreatedRS;
+import com.epam.ta.reportportal.model.CollectionsRQ;
+import com.epam.ta.reportportal.model.EntryCreatedRS;
+import com.epam.ta.reportportal.model.filter.BulkUpdateFilterRQ;
+import com.epam.ta.reportportal.model.filter.UpdateUserFilterRQ;
 import com.epam.ta.reportportal.ws.model.OperationCompletionRS;
-import com.epam.ta.reportportal.ws.model.filter.BulkUpdateFilterRQ;
-import com.epam.ta.reportportal.ws.model.filter.UpdateUserFilterRQ;
-
-import java.util.Collection;
 import java.util.List;
 
 /**
@@ -42,7 +39,8 @@ public interface UpdateUserFilterHandler {
    * @param user           The {@link ReportPortalUser} who is creating the filter
    * @return An {@link EntryCreatedRS} instance containing the created filter's ID
    */
-  EntryCreatedRS createFilter(UpdateUserFilterRQ createFilterRQ, String projectName, ReportPortalUser user);
+  EntryCreatedRS createFilter(UpdateUserFilterRQ createFilterRQ, String projectName,
+      ReportPortalUser user);
 
   /**
    * Update user filter with specified id
@@ -53,18 +51,18 @@ public interface UpdateUserFilterHandler {
    * @param user           User
    * @return {@link OperationCompletionRS}
    */
-  OperationCompletionRS updateUserFilter(Long userFilterId, UpdateUserFilterRQ updateRQ, ReportPortalUser.ProjectDetails projectDetails,
-      ReportPortalUser user);
+  OperationCompletionRS updateUserFilter(Long userFilterId, UpdateUserFilterRQ updateRQ,
+      ReportPortalUser.ProjectDetails projectDetails, ReportPortalUser user);
 
   /**
    * Update user filter
    *
-   * @param updateRQ        Request for filter update
-   * @param projectDetails  {@link ReportPortalUser.ProjectDetails}
-   * @param user            {@link ReportPortalUser} filter's owner
+   * @param updateRQ       Request for filter update
+   * @param projectDetails {@link ReportPortalUser.ProjectDetails}
+   * @param user           {@link ReportPortalUser} filter's owner
    * @return List of {@link OperationCompletionRS}
    */
-  List<OperationCompletionRS> updateUserFilter(CollectionsRQ<BulkUpdateFilterRQ> updateRQ, ReportPortalUser.ProjectDetails projectDetails,
-      ReportPortalUser user);
+  List<OperationCompletionRS> updateUserFilter(CollectionsRQ<BulkUpdateFilterRQ> updateRQ,
+      ReportPortalUser.ProjectDetails projectDetails, ReportPortalUser user);
 
 }
\ No newline at end of file
diff --git a/src/main/java/com/epam/ta/reportportal/core/filter/impl/GetUserFilterHandlerImpl.java b/src/main/java/com/epam/ta/reportportal/core/filter/impl/GetUserFilterHandlerImpl.java
index d106551e61..fb4cb05163 100644
--- a/src/main/java/com/epam/ta/reportportal/core/filter/impl/GetUserFilterHandlerImpl.java
+++ b/src/main/java/com/epam/ta/reportportal/core/filter/impl/GetUserFilterHandlerImpl.java
@@ -23,12 +23,12 @@
 import com.epam.ta.reportportal.dao.UserFilterRepository;
 import com.epam.ta.reportportal.entity.filter.UserFilter;
 import com.epam.ta.reportportal.exception.ReportPortalException;
+import com.epam.ta.reportportal.model.OwnedEntityResource;
+import com.epam.ta.reportportal.model.filter.UserFilterResource;
 import com.epam.ta.reportportal.util.ProjectExtractor;
 import com.epam.ta.reportportal.ws.converter.PagedResourcesAssembler;
 import com.epam.ta.reportportal.ws.converter.converters.UserFilterConverter;
 import com.epam.ta.reportportal.ws.model.ErrorType;
-import com.epam.ta.reportportal.ws.model.OwnedEntityResource;
-import com.epam.ta.reportportal.ws.model.filter.UserFilterResource;
 import com.google.common.collect.Lists;
 import java.util.List;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -37,8 +37,6 @@
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
-import java.util.List;
-
 /**
  * @author Pavel Bortnik
  */
@@ -59,38 +57,45 @@ public void setFilterRepository(UserFilterRepository filterRepository) {
     this.filterRepository = filterRepository;
   }
 
-	@Override
-	public UserFilterResource getUserFilter(Long id, ReportPortalUser.ProjectDetails projectDetails) {
-		final UserFilter userFilter = filterRepository.findByIdAndProjectId(id, projectDetails.getProjectId())
-				.orElseThrow(() -> new ReportPortalException(ErrorType.USER_FILTER_NOT_FOUND_IN_PROJECT,
-						id,
-						projectDetails.getProjectName()
-				));
-		return UserFilterConverter.TO_FILTER_RESOURCE.apply(userFilter);
-	}
+  @Override
+  public UserFilterResource getUserFilter(Long id, ReportPortalUser.ProjectDetails projectDetails) {
+    final UserFilter userFilter =
+        filterRepository.findByIdAndProjectId(id, projectDetails.getProjectId()).orElseThrow(
+            () -> new ReportPortalException(ErrorType.USER_FILTER_NOT_FOUND_IN_PROJECT, id,
+                projectDetails.getProjectName()
+            ));
+    return UserFilterConverter.TO_FILTER_RESOURCE.apply(userFilter);
+  }
 
   @Override
-  public Iterable<UserFilterResource> getUserFilters(String projectName, Pageable pageable, Filter filter,
-      ReportPortalUser user) {
-    ReportPortalUser.ProjectDetails projectDetails = projectExtractor.extractProjectDetails(user,
-        projectName);
-    Page<UserFilter> userFilters = filterRepository.findByFilter(ProjectFilter.of(filter, projectDetails.getProjectId()), pageable);
-		return PagedResourcesAssembler.pageConverter(UserFilterConverter.TO_FILTER_RESOURCE).apply(userFilters);
+  public Iterable<UserFilterResource> getUserFilters(String projectName, Pageable pageable,
+      Filter filter, ReportPortalUser user) {
+    ReportPortalUser.ProjectDetails projectDetails =
+        projectExtractor.extractProjectDetails(user, projectName);
+    Page<UserFilter> userFilters =
+        filterRepository.findByFilter(ProjectFilter.of(filter, projectDetails.getProjectId()),
+            pageable
+        );
+    return PagedResourcesAssembler.pageConverter(UserFilterConverter.TO_FILTER_RESOURCE)
+        .apply(userFilters);
   }
 
   @Override
-  public Iterable<OwnedEntityResource> getFiltersNames(ReportPortalUser.ProjectDetails projectDetails, Pageable pageable, Filter filter,
-			ReportPortalUser user) {
-    final Page<UserFilter> userFilters = filterRepository.findByFilter(
-        ProjectFilter.of(filter, projectDetails.getProjectId()),
-        pageable
-    );
+  public Iterable<OwnedEntityResource> getFiltersNames(
+      ReportPortalUser.ProjectDetails projectDetails, Pageable pageable, Filter filter,
+      ReportPortalUser user) {
+    final Page<UserFilter> userFilters =
+        filterRepository.findByFilter(ProjectFilter.of(filter, projectDetails.getProjectId()),
+            pageable
+        );
     return PagedResourcesAssembler.pageConverter(UserFilterConverter.TO_OWNED_ENTITY_RESOURCE)
         .apply(userFilters);
   }
 
   @Override
-  public List<UserFilter> getFiltersById(Long[] ids, ReportPortalUser.ProjectDetails projectDetails, ReportPortalUser user) {
-		return filterRepository.findAllByIdInAndProjectId(Lists.newArrayList(ids), projectDetails.getProjectId());
-	}
+  public List<UserFilter> getFiltersById(Long[] ids, ReportPortalUser.ProjectDetails projectDetails,
+      ReportPortalUser user) {
+    return filterRepository.findAllByIdInAndProjectId(
+        Lists.newArrayList(ids), projectDetails.getProjectId());
+  }
 }
diff --git a/src/main/java/com/epam/ta/reportportal/core/filter/impl/SearchCriteriaServiceImpl.java b/src/main/java/com/epam/ta/reportportal/core/filter/impl/SearchCriteriaServiceImpl.java
index 02205d6242..f9c010d51f 100644
--- a/src/main/java/com/epam/ta/reportportal/core/filter/impl/SearchCriteriaServiceImpl.java
+++ b/src/main/java/com/epam/ta/reportportal/core/filter/impl/SearchCriteriaServiceImpl.java
@@ -25,12 +25,11 @@
 import com.epam.ta.reportportal.core.filter.predefined.PredefinedFilterType;
 import com.epam.ta.reportportal.core.filter.predefined.PredefinedFilters;
 import com.epam.ta.reportportal.exception.ReportPortalException;
-import com.epam.ta.reportportal.ws.model.SearchCriteria;
-import com.epam.ta.reportportal.ws.model.SearchCriteriaRQ;
+import com.epam.ta.reportportal.model.SearchCriteria;
+import com.epam.ta.reportportal.model.SearchCriteriaRQ;
 import com.google.common.collect.Lists;
 import java.util.List;
 import java.util.Optional;
-import java.util.Set;
 import java.util.stream.Collectors;
 import org.apache.commons.collections4.CollectionUtils;
 import org.jooq.Operator;
@@ -47,8 +46,8 @@ public class SearchCriteriaServiceImpl implements SearchCriteriaService {
   private static final String PREDEFINED_FILTER = "predefinedFilter";
 
   @Override
-  public Queryable createFilterBySearchCriteria(SearchCriteriaRQ searchCriteriaRQ,
-      Class<?> target, PredefinedFilterType predefinedFilterType) {
+  public Queryable createFilterBySearchCriteria(SearchCriteriaRQ searchCriteriaRQ, Class<?> target,
+      PredefinedFilterType predefinedFilterType) {
 
     Filter filter = new Filter(target, Lists.newArrayList());
 
@@ -60,26 +59,22 @@ public Queryable createFilterBySearchCriteria(SearchCriteriaRQ searchCriteriaRQ,
 
     Optional<SearchCriteria> predefinedFilter = getPredefinedFilterIfExist(searchCriteriaRQ);
 
-    return predefinedFilter.isPresent()
-        ? createCompositeFilter(predefinedFilterType, filter, predefinedFilter.get())
-        : filter;
+    return predefinedFilter.isPresent() ?
+        createCompositeFilter(predefinedFilterType, filter, predefinedFilter.get()) : filter;
   }
 
   private List<ConvertibleCondition> collectConditions(SearchCriteriaRQ searchCriteriaRQ) {
     return searchCriteriaRQ.getCriteriaList().stream()
         .filter(criteria -> !PREDEFINED_FILTER.equalsIgnoreCase(criteria.getFilterKey()))
-        .map(this::mapCriteriaToCondition)
-        .collect(Collectors.toList());
+        .map(this::mapCriteriaToCondition).collect(Collectors.toList());
   }
 
   private ConvertibleCondition mapCriteriaToCondition(SearchCriteria searchCriteria) {
-    return FilterOperation.fromString(searchCriteria.getOperation())
-        .map(operation -> operation.getConditionBuilder()
-            .withSearchCriteria(searchCriteria.getFilterKey())
-            .withValue(searchCriteria.getValue())
-            .build())
-        .orElseThrow(() -> new ReportPortalException(
-            String.format("Can not convert operation type %s.", searchCriteria.getOperation())));
+    return FilterOperation.fromString(searchCriteria.getOperation()).map(
+        operation -> operation.getConditionBuilder()
+            .withSearchCriteria(searchCriteria.getFilterKey()).withValue(searchCriteria.getValue())
+            .build()).orElseThrow(() -> new ReportPortalException(
+        String.format("Can not convert operation type %s.", searchCriteria.getOperation())));
   }
 
   private Optional<SearchCriteria> getPredefinedFilterIfExist(SearchCriteriaRQ searchCriteriaRQ) {
@@ -90,9 +85,9 @@ private Optional<SearchCriteria> getPredefinedFilterIfExist(SearchCriteriaRQ sea
 
   private CompositeFilter createCompositeFilter(PredefinedFilterType predefinedFilterType,
       Filter filter, SearchCriteria predefinedFilter) {
-    String[] params = {predefinedFilter.getValue()};
-    Queryable activityPredefinedFilter = PredefinedFilters
-        .buildFilter(predefinedFilterType, params);
+    String[] params = { predefinedFilter.getValue() };
+    Queryable activityPredefinedFilter =
+        PredefinedFilters.buildFilter(predefinedFilterType, params);
     return new CompositeFilter(Operator.AND, filter, activityPredefinedFilter);
   }
 
diff --git a/src/main/java/com/epam/ta/reportportal/core/filter/impl/UpdateUserFilterHandlerImpl.java b/src/main/java/com/epam/ta/reportportal/core/filter/impl/UpdateUserFilterHandlerImpl.java
index 83911724ef..0c4029774c 100644
--- a/src/main/java/com/epam/ta/reportportal/core/filter/impl/UpdateUserFilterHandlerImpl.java
+++ b/src/main/java/com/epam/ta/reportportal/core/filter/impl/UpdateUserFilterHandlerImpl.java
@@ -35,20 +35,16 @@
 import com.epam.ta.reportportal.entity.filter.ObjectType;
 import com.epam.ta.reportportal.entity.filter.UserFilter;
 import com.epam.ta.reportportal.exception.ReportPortalException;
+import com.epam.ta.reportportal.model.CollectionsRQ;
+import com.epam.ta.reportportal.model.EntryCreatedRS;
+import com.epam.ta.reportportal.model.activity.UserFilterActivityResource;
+import com.epam.ta.reportportal.model.filter.BulkUpdateFilterRQ;
+import com.epam.ta.reportportal.model.filter.UpdateUserFilterRQ;
 import com.epam.ta.reportportal.util.ProjectExtractor;
 import com.epam.ta.reportportal.ws.converter.builders.UserFilterBuilder;
-import com.epam.ta.reportportal.ws.model.CollectionsRQ;
-import com.epam.ta.reportportal.ws.model.EntryCreatedRS;
 import com.epam.ta.reportportal.ws.model.ErrorType;
 import com.epam.ta.reportportal.ws.model.OperationCompletionRS;
 import com.epam.ta.reportportal.ws.model.ValidationConstraints;
-import com.epam.ta.reportportal.ws.model.activity.UserFilterActivityResource;
-import com.epam.ta.reportportal.ws.model.filter.BulkUpdateFilterRQ;
-import com.epam.ta.reportportal.ws.model.filter.UpdateUserFilterRQ;
-import org.apache.commons.lang3.BooleanUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
 import java.util.List;
 import java.util.Optional;
 import java.util.function.Predicate;
@@ -59,84 +55,84 @@
 @Service
 public class UpdateUserFilterHandlerImpl implements UpdateUserFilterHandler {
 
-	private final static String KEY_AND_VALUE_DELIMITER = ":";
+  private final static String KEY_AND_VALUE_DELIMITER = ":";
 
-	private final static String ATTRIBUTES_DELIMITER = ",";
-	private final ProjectExtractor projectExtractor;
-	private final UserFilterRepository userFilterRepository;
-	private final MessageBus messageBus;
+  private final static String ATTRIBUTES_DELIMITER = ",";
+  private final ProjectExtractor projectExtractor;
+  private final UserFilterRepository userFilterRepository;
+  private final MessageBus messageBus;
 
-	@Autowired
-	public UpdateUserFilterHandlerImpl(ProjectExtractor projectExtractor, UserFilterRepository userFilterRepository,
+  @Autowired
+  public UpdateUserFilterHandlerImpl(ProjectExtractor projectExtractor,
+      UserFilterRepository userFilterRepository,
 
-			MessageBus messageBus) {
-		this.projectExtractor = projectExtractor;
-		this.userFilterRepository = userFilterRepository;
-		this.messageBus = messageBus;
-	}
+      MessageBus messageBus) {
+    this.projectExtractor = projectExtractor;
+    this.userFilterRepository = userFilterRepository;
+    this.messageBus = messageBus;
+  }
 
   @Override
   public EntryCreatedRS createFilter(UpdateUserFilterRQ createFilterRQ, String projectName,
       ReportPortalUser user) {
-    ReportPortalUser.ProjectDetails projectDetails = projectExtractor.extractProjectDetails(user,
-        projectName);
+    ReportPortalUser.ProjectDetails projectDetails =
+        projectExtractor.extractProjectDetails(user, projectName);
 
     validateFilterRq(createFilterRQ);
 
-		BusinessRule.expect(userFilterRepository.existsByNameAndOwnerAndProjectId(createFilterRQ.getName(),
-						user.getUsername(),
-						projectDetails.getProjectId()
-				), BooleanUtils::isFalse)
-				.verify(ErrorType.USER_FILTER_ALREADY_EXISTS, createFilterRQ.getName(), user.getUsername(), projectName);
+    BusinessRule.expect(
+            userFilterRepository.existsByNameAndOwnerAndProjectId(createFilterRQ.getName(),
+                user.getUsername(), projectDetails.getProjectId()
+            ), BooleanUtils::isFalse)
+        .verify(ErrorType.USER_FILTER_ALREADY_EXISTS, createFilterRQ.getName(), user.getUsername(),
+            projectName
+        );
 
     UserFilter filter = new UserFilterBuilder().addFilterRq(createFilterRQ)
-        .addProject(projectDetails.getProjectId())
-        .addOwner(user.getUsername())
-        .get();
-
-		userFilterRepository.save(filter);
-		messageBus.publishActivity(new FilterCreatedEvent(TO_ACTIVITY_RESOURCE.apply(filter), user.getUserId(), user.getUsername()));
-		return new EntryCreatedRS(filter.getId());
-	}
-
-	@Override
-	public OperationCompletionRS updateUserFilter(Long userFilterId, UpdateUserFilterRQ updateRQ,
-			ReportPortalUser.ProjectDetails projectDetails, ReportPortalUser user) {
-		validateFilterRq(updateRQ);
-		UserFilter userFilter = userFilterRepository.findByIdAndProjectId(userFilterId, projectDetails.getProjectId())
-				.orElseThrow(() -> new ReportPortalException(ErrorType.USER_FILTER_NOT_FOUND_IN_PROJECT,
-						userFilterId,
-						projectDetails.getProjectName()
-				));
-		expect(userFilter.getProject().getId(), Predicate.isEqual(projectDetails.getProjectId())).verify(USER_FILTER_NOT_FOUND,
-				userFilterId,
-				projectDetails.getProjectId(),
-				user.getUserId()
-		);
+        .addProject(projectDetails.getProjectId()).addOwner(user.getUsername()).get();
+
+    userFilterRepository.save(filter);
+    messageBus.publishActivity(
+        new FilterCreatedEvent(TO_ACTIVITY_RESOURCE.apply(filter), user.getUserId(),
+            user.getUsername()
+        ));
+    return new EntryCreatedRS(filter.getId());
+  }
+
+  @Override
+  public OperationCompletionRS updateUserFilter(Long userFilterId, UpdateUserFilterRQ updateRQ,
+      ReportPortalUser.ProjectDetails projectDetails, ReportPortalUser user) {
+    validateFilterRq(updateRQ);
+    UserFilter userFilter =
+        userFilterRepository.findByIdAndProjectId(userFilterId, projectDetails.getProjectId())
+            .orElseThrow(() -> new ReportPortalException(ErrorType.USER_FILTER_NOT_FOUND_IN_PROJECT,
+                userFilterId, projectDetails.getProjectName()
+            ));
+    expect(
+        userFilter.getProject().getId(), Predicate.isEqual(projectDetails.getProjectId())).verify(
+        USER_FILTER_NOT_FOUND, userFilterId, projectDetails.getProjectId(), user.getUserId());
 
     if (!userFilter.getName().equals(updateRQ.getName())) {
 
-			BusinessRule.expect(userFilterRepository.existsByNameAndOwnerAndProjectId(updateRQ.getName(),
-							userFilter.getOwner(),
-							projectDetails.getProjectId()
-					), BooleanUtils::isFalse)
-					.verify(ErrorType.USER_FILTER_ALREADY_EXISTS,
-							updateRQ.getName(),
-							userFilter.getOwner(),
-							projectDetails.getProjectName()
-					);
-		}
+      BusinessRule.expect(
+              userFilterRepository.existsByNameAndOwnerAndProjectId(updateRQ.getName(),
+                  userFilter.getOwner(), projectDetails.getProjectId()
+              ), BooleanUtils::isFalse)
+          .verify(ErrorType.USER_FILTER_ALREADY_EXISTS, updateRQ.getName(), userFilter.getOwner(),
+              projectDetails.getProjectName()
+          );
+    }
 
     UserFilterActivityResource before = TO_ACTIVITY_RESOURCE.apply(userFilter);
     UserFilter updated = new UserFilterBuilder(userFilter).addFilterRq(updateRQ).get();
 
-		messageBus.publishActivity(new FilterUpdatedEvent(before,
-				TO_ACTIVITY_RESOURCE.apply(updated),
-				user.getUserId(),
-				user.getUsername()
-		));
-		return new OperationCompletionRS("User filter with ID = '" + updated.getId() + "' successfully updated.");
-	}
+    messageBus.publishActivity(
+        new FilterUpdatedEvent(before, TO_ACTIVITY_RESOURCE.apply(updated), user.getUserId(),
+            user.getUsername()
+        ));
+    return new OperationCompletionRS(
+        "User filter with ID = '" + updated.getId() + "' successfully updated.");
+  }
 
   @Override
   public List<OperationCompletionRS> updateUserFilter(CollectionsRQ<BulkUpdateFilterRQ> updateRQ,
@@ -145,15 +141,14 @@ public List<OperationCompletionRS> updateUserFilter(CollectionsRQ<BulkUpdateFilt
   }
 
   /**
-	 * Validation of update filter rq
-	 *
-	 * @param updateFilerRq Request
-	 */
-	private void validateFilterRq(UpdateUserFilterRQ updateFilerRq) {
+   * Validation of update filter rq
+   *
+   * @param updateFilerRq Request
+   */
+  private void validateFilterRq(UpdateUserFilterRQ updateFilerRq) {
 
     FilterTarget filterTarget = FilterTarget.findByClass(
-        ObjectType.getObjectTypeByName(updateFilerRq.getObjectType())
-            .getClassObject());
+        ObjectType.getObjectTypeByName(updateFilerRq.getObjectType()).getClassObject());
 
     BusinessRule.expect(updateFilerRq.getConditions(), NOT_EMPTY_COLLECTION)
         .verify(ErrorType.BAD_REQUEST_ERROR, "Filter conditions should not be empty");
@@ -166,73 +161,76 @@ private void validateFilterRq(UpdateUserFilterRQ updateFilerRq) {
       CriteriaHolder criteriaHolder = filterTarget.getCriteriaByFilter(it.getFilteringField())
           .orElseThrow(() -> new ReportPortalException(ErrorType.INCORRECT_FILTER_PARAMETERS,
               Suppliers.formattedSupplier("Filter parameter '{}' is not defined",
-                  it.getFilteringField()).get()
+                  it.getFilteringField()
+              ).get()
           ));
 
-			Condition condition = Condition.findByMarker(it.getCondition())
-					.orElseThrow(() -> new ReportPortalException(ErrorType.INCORRECT_FILTER_PARAMETERS, it.getCondition()));
-			boolean isNegative = Condition.isNegative(it.getCondition());
-			String value = cutAttributesToMaxLength(it.getValue());
+      Condition condition = Condition.findByMarker(it.getCondition()).orElseThrow(
+          () -> new ReportPortalException(ErrorType.INCORRECT_FILTER_PARAMETERS,
+              it.getCondition()
+          ));
+      boolean isNegative = Condition.isNegative(it.getCondition());
+      String value = cutAttributesToMaxLength(it.getValue());
 
-			condition.validate(criteriaHolder, value, isNegative, ErrorType.INCORRECT_FILTER_PARAMETERS);
-			condition.castValue(criteriaHolder, value, ErrorType.INCORRECT_FILTER_PARAMETERS);
-			it.setValue(value);
-		});
+      condition.validate(criteriaHolder, value, isNegative, ErrorType.INCORRECT_FILTER_PARAMETERS);
+      condition.castValue(criteriaHolder, value, ErrorType.INCORRECT_FILTER_PARAMETERS);
+      it.setValue(value);
+    });
 
     //order conditions validation
-    updateFilerRq.getOrders()
-        .forEach(order -> BusinessRule.expect(
-                filterTarget.getCriteriaByFilter(order.getSortingColumnName()), Optional::isPresent)
-            .verify(ErrorType.INCORRECT_SORTING_PARAMETERS,
-                "Unable to find sort parameter '" + order.getSortingColumnName() + "'"
-            ));
+    updateFilerRq.getOrders().forEach(
+        order -> BusinessRule.expect(filterTarget.getCriteriaByFilter(order.getSortingColumnName()),
+            Optional::isPresent
+        ).verify(ErrorType.INCORRECT_SORTING_PARAMETERS,
+            "Unable to find sort parameter '" + order.getSortingColumnName() + "'"
+        ));
+  }
+
+  private String cutAttributesToMaxLength(String keyAndValue) {
+    if (keyAndValue == null || keyAndValue.isEmpty()) {
+      return keyAndValue;
+    }
+    String[] attributeArray = keyAndValue.split(ATTRIBUTES_DELIMITER);
+    if (attributeArray.length == 0) {
+      return cutAttributeToLength(keyAndValue, ValidationConstraints.MAX_ATTRIBUTE_LENGTH);
+    }
+    StringBuilder result = new StringBuilder();
+    for (int i = 0; i < attributeArray.length; i++) {
+      String attribute = attributeArray[i];
+      attribute = cutAttributeToLength(attribute, ValidationConstraints.MAX_ATTRIBUTE_LENGTH);
+      result.append(attribute);
+      if (i != attributeArray.length - 1) {
+        result.append(ATTRIBUTES_DELIMITER);
+      }
+    }
+    return result.toString();
   }
 
-	private String cutAttributesToMaxLength(String keyAndValue) {
-		if (keyAndValue == null || keyAndValue.isEmpty()) {
-			return keyAndValue;
-		}
-		String[] attributeArray = keyAndValue.split(ATTRIBUTES_DELIMITER);
-		if (attributeArray.length == 0) {
-			return cutAttributeToLength(keyAndValue, ValidationConstraints.MAX_ATTRIBUTE_LENGTH);
-		}
-		StringBuilder result = new StringBuilder();
-		for (int i = 0; i < attributeArray.length; i++) {
-			String attribute = attributeArray[i];
-			attribute = cutAttributeToLength(attribute, ValidationConstraints.MAX_ATTRIBUTE_LENGTH);
-			result.append(attribute);
-			if (i != attributeArray.length - 1){
-				result.append(ATTRIBUTES_DELIMITER);
-			}
-		}
-		return result.toString();
-	}
-
-	private String cutAttributeToLength(String attribute, int length){
-		String[] keyAndValueArray = attribute.split(KEY_AND_VALUE_DELIMITER);
-		if (keyAndValueArray.length == 0) {
-			attribute = cutStringToLength(attribute, length);
-		} else {
-			if (keyAndValueArray.length == 1) {
-				if (attribute.contains(KEY_AND_VALUE_DELIMITER)) {
-					attribute = cutStringToLength(keyAndValueArray[0], length) + KEY_AND_VALUE_DELIMITER;
-				} else {
-					attribute = cutStringToLength(attribute, length);
-				}
-			} else {
-				String key = cutStringToLength(keyAndValueArray[0], length);
-				String value = cutStringToLength(keyAndValueArray[1], length);
-				attribute = key + KEY_AND_VALUE_DELIMITER + value;
-			}
-		}
-		return attribute;
-	}
-
-	private String cutStringToLength(String string, int length) {
-		if (string.length() > length) {
-			string = string.substring(0, length);
-		}
-
-		return string;
-	}
+  private String cutAttributeToLength(String attribute, int length) {
+    String[] keyAndValueArray = attribute.split(KEY_AND_VALUE_DELIMITER);
+    if (keyAndValueArray.length == 0) {
+      attribute = cutStringToLength(attribute, length);
+    } else {
+      if (keyAndValueArray.length == 1) {
+        if (attribute.contains(KEY_AND_VALUE_DELIMITER)) {
+          attribute = cutStringToLength(keyAndValueArray[0], length) + KEY_AND_VALUE_DELIMITER;
+        } else {
+          attribute = cutStringToLength(attribute, length);
+        }
+      } else {
+        String key = cutStringToLength(keyAndValueArray[0], length);
+        String value = cutStringToLength(keyAndValueArray[1], length);
+        attribute = key + KEY_AND_VALUE_DELIMITER + value;
+      }
+    }
+    return attribute;
+  }
+
+  private String cutStringToLength(String string, int length) {
+    if (string.length() > length) {
+      string = string.substring(0, length);
+    }
+
+    return string;
+  }
 }
diff --git a/src/main/java/com/epam/ta/reportportal/core/imprt/ImportLaunchHandler.java b/src/main/java/com/epam/ta/reportportal/core/imprt/ImportLaunchHandler.java
index 9ff51786e5..613fdacc7d 100644
--- a/src/main/java/com/epam/ta/reportportal/core/imprt/ImportLaunchHandler.java
+++ b/src/main/java/com/epam/ta/reportportal/core/imprt/ImportLaunchHandler.java
@@ -13,11 +13,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package com.epam.ta.reportportal.core.imprt;
 
 import com.epam.ta.reportportal.commons.ReportPortalUser;
+import com.epam.ta.reportportal.model.launch.LaunchImportRQ;
 import com.epam.ta.reportportal.ws.model.OperationCompletionRS;
-import com.epam.ta.reportportal.ws.model.launch.LaunchImportRQ;
 import org.springframework.web.multipart.MultipartFile;
 
 /**
@@ -37,6 +38,5 @@ public interface ImportLaunchHandler {
    * @return OperationCompletionRS
    */
   OperationCompletionRS importLaunch(ReportPortalUser.ProjectDetails projectDetails,
-      ReportPortalUser user, String format, MultipartFile file, String baseUrl,
-      LaunchImportRQ rq);
+      ReportPortalUser user, String format, MultipartFile file, String baseUrl, LaunchImportRQ rq);
 }
\ No newline at end of file
diff --git a/src/main/java/com/epam/ta/reportportal/core/imprt/ImportLaunchHandlerImpl.java b/src/main/java/com/epam/ta/reportportal/core/imprt/ImportLaunchHandlerImpl.java
index e92d83e3fd..e9928b2295 100644
--- a/src/main/java/com/epam/ta/reportportal/core/imprt/ImportLaunchHandlerImpl.java
+++ b/src/main/java/com/epam/ta/reportportal/core/imprt/ImportLaunchHandlerImpl.java
@@ -31,11 +31,11 @@
 import com.epam.ta.reportportal.core.imprt.impl.ImportType;
 import com.epam.ta.reportportal.dao.LaunchRepository;
 import com.epam.ta.reportportal.exception.ReportPortalException;
+import com.epam.ta.reportportal.model.LaunchImportCompletionRS;
+import com.epam.ta.reportportal.model.LaunchImportData;
+import com.epam.ta.reportportal.model.launch.LaunchImportRQ;
 import com.epam.ta.reportportal.ws.model.ErrorType;
-import com.epam.ta.reportportal.ws.model.LaunchImportCompletionRS;
-import com.epam.ta.reportportal.ws.model.LaunchImportData;
 import com.epam.ta.reportportal.ws.model.OperationCompletionRS;
-import com.epam.ta.reportportal.ws.model.launch.LaunchImportRQ;
 import java.io.File;
 import java.io.IOException;
 import java.util.Optional;
@@ -53,7 +53,6 @@ public class ImportLaunchHandlerImpl implements ImportLaunchHandler {
   private final MessageBus messageBus;
   private final LaunchRepository launchRepository;
 
-
   @Autowired
   public ImportLaunchHandlerImpl(ImportStrategyFactory importStrategyFactory, MessageBus messageBus,
       LaunchRepository launchRepository) {
@@ -64,25 +63,24 @@ public ImportLaunchHandlerImpl(ImportStrategyFactory importStrategyFactory, Mess
 
   @Override
   public OperationCompletionRS importLaunch(ReportPortalUser.ProjectDetails projectDetails,
-      ReportPortalUser user, String format,
-      MultipartFile file, String baseUrl, LaunchImportRQ rq) {
+      ReportPortalUser user, String format, MultipartFile file, String baseUrl, LaunchImportRQ rq) {
 
     validate(file);
     rq = getBackCompatibleRq(rq);
 
-    ImportType type = ImportType.fromValue(format)
-        .orElseThrow(() -> new ReportPortalException(ErrorType.BAD_REQUEST_ERROR,
-            "Unknown import type - " + format));
+    ImportType type = ImportType.fromValue(format).orElseThrow(
+        () -> new ReportPortalException(ErrorType.BAD_REQUEST_ERROR,
+            "Unknown import type - " + format
+        ));
 
     File tempFile = transferToTempFile(file);
-    ImportStrategy strategy = importStrategyFactory.getImportStrategy(type,
-        file.getOriginalFilename());
+    ImportStrategy strategy =
+        importStrategyFactory.getImportStrategy(type, file.getOriginalFilename());
     String launchId = strategy.importLaunch(projectDetails, user, tempFile, baseUrl, rq);
-    messageBus.publishActivity(new ImportFinishedEvent(user.getUserId(),
-        user.getUsername(),
-        projectDetails.getProjectId(),
-        file.getOriginalFilename()
-    ));
+    messageBus.publishActivity(
+        new ImportFinishedEvent(user.getUserId(), user.getUsername(), projectDetails.getProjectId(),
+            file.getOriginalFilename()
+        ));
     return prepareLaunchImportResponse(launchId);
   }
 
@@ -93,20 +91,24 @@ private LaunchImportRQ getBackCompatibleRq(LaunchImportRQ rq) {
 
   private void validate(MultipartFile file) {
     expect(file.getOriginalFilename(), notNull()).verify(ErrorType.INCORRECT_REQUEST,
-        "File name should be not empty.");
+        "File name should be not empty."
+    );
 
     expect(file.getOriginalFilename(),
-        it -> it.endsWith(ZIP_EXTENSION) || it.endsWith(XML_EXTENSION)).verify(INCORRECT_REQUEST,
+        it -> it.endsWith(ZIP_EXTENSION) || it.endsWith(XML_EXTENSION)
+    ).verify(INCORRECT_REQUEST,
         "Should be a zip archive or an xml file " + file.getOriginalFilename()
     );
     expect(file.getSize(), size -> size <= MAX_FILE_SIZE).verify(INCORRECT_REQUEST,
-        "File size is more than 32 Mb.");
+        "File size is more than 32 Mb."
+    );
   }
 
   private File transferToTempFile(MultipartFile file) {
     try {
       File tmp = File.createTempFile(file.getOriginalFilename(),
-          "." + FilenameUtils.getExtension(file.getOriginalFilename()));
+          "." + FilenameUtils.getExtension(file.getOriginalFilename())
+      );
       file.transferTo(tmp);
       return tmp;
     } catch (IOException e) {
diff --git a/src/main/java/com/epam/ta/reportportal/core/imprt/impl/AbstractImportStrategy.java b/src/main/java/com/epam/ta/reportportal/core/imprt/impl/AbstractImportStrategy.java
index 9cc95fde08..96d76490c0 100644
--- a/src/main/java/com/epam/ta/reportportal/core/imprt/impl/AbstractImportStrategy.java
+++ b/src/main/java/com/epam/ta/reportportal/core/imprt/impl/AbstractImportStrategy.java
@@ -13,6 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package com.epam.ta.reportportal.core.imprt.impl;
 
 import static java.util.Optional.ofNullable;
@@ -24,10 +25,10 @@
 import com.epam.ta.reportportal.entity.enums.StatusEnum;
 import com.epam.ta.reportportal.entity.launch.Launch;
 import com.epam.ta.reportportal.exception.ReportPortalException;
+import com.epam.ta.reportportal.model.launch.LaunchImportRQ;
 import com.epam.ta.reportportal.ws.model.ErrorType;
 import com.epam.ta.reportportal.ws.model.FinishExecutionRQ;
 import com.epam.ta.reportportal.ws.model.attribute.ItemAttributesRQ;
-import com.epam.ta.reportportal.ws.model.launch.LaunchImportRQ;
 import com.epam.ta.reportportal.ws.model.launch.Mode;
 import com.epam.ta.reportportal.ws.model.launch.StartLaunchRQ;
 import com.google.common.collect.Sets;
@@ -90,16 +91,14 @@ protected String startLaunch(ReportPortalUser.ProjectDetails projectDetails,
     StartLaunchRQ startLaunchRQ = new StartLaunchRQ();
     startLaunchRQ.setStartTime(ofNullable(rq.getStartTime()).orElse(initialStartTime));
     startLaunchRQ.setName(ofNullable(rq.getName()).orElse(launchName));
-    ofNullable(rq.getDescription())
-        .ifPresent(startLaunchRQ::setDescription);
+    ofNullable(rq.getDescription()).ifPresent(startLaunchRQ::setDescription);
     startLaunchRQ.setMode(ofNullable(rq.getMode()).orElse(Mode.DEFAULT));
     startLaunchRQ.setAttributes(ofNullable(rq.getAttributes()).orElse(Sets.newHashSet()));
     return startLaunchHandler.startLaunch(user, projectDetails, startLaunchRQ).getId();
   }
 
   protected void finishLaunch(String launchId, ReportPortalUser.ProjectDetails projectDetails,
-      ReportPortalUser user,
-      ParseResults results, String baseUrl) {
+      ReportPortalUser user, ParseResults results, String baseUrl) {
     FinishExecutionRQ finishExecutionRQ = new FinishExecutionRQ();
     finishExecutionRQ.setEndTime(results.getEndTime());
     finishLaunchHandler.finishLaunch(launchId, finishExecutionRQ, projectDetails, user, baseUrl);
@@ -110,11 +109,10 @@ protected void finishLaunch(String launchId, ReportPortalUser.ProjectDetails pro
   }
 
   protected Boolean isSkippedNotIssue(Set<ItemAttributesRQ> attributes) {
-    return ofNullable(attributes).orElse(Collections.emptySet()).stream()
-        .filter(
+    return ofNullable(attributes).orElse(Collections.emptySet()).stream().filter(
             attribute -> SKIPPED_IS_NOT_ISSUE.equals(attribute.getKey()) && attribute.isSystem())
-        .findAny()
-        .filter(itemAttributesRQ -> Boolean.parseBoolean(itemAttributesRQ.getValue())).isPresent();
+        .findAny().filter(itemAttributesRQ -> Boolean.parseBoolean(itemAttributesRQ.getValue()))
+        .isPresent();
   }
 
   /**
diff --git a/src/main/java/com/epam/ta/reportportal/core/imprt/impl/ImportStrategy.java b/src/main/java/com/epam/ta/reportportal/core/imprt/impl/ImportStrategy.java
index 20c7e1911c..057f4a193d 100644
--- a/src/main/java/com/epam/ta/reportportal/core/imprt/impl/ImportStrategy.java
+++ b/src/main/java/com/epam/ta/reportportal/core/imprt/impl/ImportStrategy.java
@@ -16,7 +16,7 @@
 package com.epam.ta.reportportal.core.imprt.impl;
 
 import com.epam.ta.reportportal.commons.ReportPortalUser;
-import com.epam.ta.reportportal.ws.model.launch.LaunchImportRQ;
+import com.epam.ta.reportportal.model.launch.LaunchImportRQ;
 import java.io.File;
 
 /**
diff --git a/src/main/java/com/epam/ta/reportportal/core/imprt/impl/XmlImportStrategy.java b/src/main/java/com/epam/ta/reportportal/core/imprt/impl/XmlImportStrategy.java
index c1bd76a038..74370908b8 100644
--- a/src/main/java/com/epam/ta/reportportal/core/imprt/impl/XmlImportStrategy.java
+++ b/src/main/java/com/epam/ta/reportportal/core/imprt/impl/XmlImportStrategy.java
@@ -13,6 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package com.epam.ta.reportportal.core.imprt.impl;
 
 import static com.epam.ta.reportportal.core.imprt.FileExtensionConstant.XML_EXTENSION;
@@ -21,8 +22,8 @@
 import com.epam.ta.reportportal.commons.ReportPortalUser;
 import com.epam.ta.reportportal.core.imprt.impl.junit.XunitParseJob;
 import com.epam.ta.reportportal.exception.ReportPortalException;
+import com.epam.ta.reportportal.model.launch.LaunchImportRQ;
 import com.epam.ta.reportportal.ws.model.ErrorType;
-import com.epam.ta.reportportal.ws.model.launch.LaunchImportRQ;
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.InputStream;
@@ -59,11 +60,13 @@ private String processXmlFile(File xml, ReportPortalUser.ProjectDetails projectD
     String savedLaunchId = null;
     try (InputStream xmlStream = new FileInputStream(xml)) {
       String launchId = startLaunch(projectDetails, user,
-          xml.getName().substring(0, xml.getName().indexOf("." + XML_EXTENSION)), rq);
+          xml.getName().substring(0, xml.getName().indexOf("." + XML_EXTENSION)), rq
+      );
       savedLaunchId = launchId;
       XunitParseJob job = xmlParseJobProvider.get()
           .withParameters(projectDetails, launchId, user, xmlStream,
-              isSkippedNotIssue(rq.getAttributes()));
+              isSkippedNotIssue(rq.getAttributes())
+          );
       ParseResults parseResults = job.call();
       finishLaunch(launchId, projectDetails, user, parseResults, baseUrl);
       return launchId;
diff --git a/src/main/java/com/epam/ta/reportportal/core/imprt/impl/ZipImportStrategy.java b/src/main/java/com/epam/ta/reportportal/core/imprt/impl/ZipImportStrategy.java
index b6b83ac8b4..60d98d7635 100644
--- a/src/main/java/com/epam/ta/reportportal/core/imprt/impl/ZipImportStrategy.java
+++ b/src/main/java/com/epam/ta/reportportal/core/imprt/impl/ZipImportStrategy.java
@@ -13,6 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package com.epam.ta.reportportal.core.imprt.impl;
 
 import static com.epam.ta.reportportal.core.imprt.FileExtensionConstant.XML_EXTENSION;
@@ -22,8 +23,8 @@
 import com.epam.ta.reportportal.commons.ReportPortalUser;
 import com.epam.ta.reportportal.core.imprt.impl.junit.XunitParseJob;
 import com.epam.ta.reportportal.exception.ReportPortalException;
+import com.epam.ta.reportportal.model.launch.LaunchImportRQ;
 import com.epam.ta.reportportal.ws.model.ErrorType;
-import com.epam.ta.reportportal.ws.model.launch.LaunchImportRQ;
 import java.io.File;
 import java.io.IOException;
 import java.io.InputStream;
@@ -42,8 +43,8 @@
 public class ZipImportStrategy extends AbstractImportStrategy {
 
   private static final Predicate<ZipEntry> isFile = zipEntry -> !zipEntry.isDirectory();
-  private static final Predicate<ZipEntry> isXml = zipEntry -> zipEntry.getName()
-      .endsWith(XML_EXTENSION);
+  private static final Predicate<ZipEntry> isXml =
+      zipEntry -> zipEntry.getName().endsWith(XML_EXTENSION);
 
   @Autowired
   private Provider<XunitParseJob> xmlParseJobProvider;
@@ -68,12 +69,14 @@ private String processZipFile(File zip, ReportPortalUser.ProjectDetails projectD
     String savedLaunchId = null;
     try (ZipFile zipFile = new ZipFile(zip)) {
       String launchId = startLaunch(projectDetails, user,
-          zip.getName().substring(0, zip.getName().indexOf("." + ZIP_EXTENSION)), rq);
+          zip.getName().substring(0, zip.getName().indexOf("." + ZIP_EXTENSION)), rq
+      );
       savedLaunchId = launchId;
       CompletableFuture[] futures = zipFile.stream().filter(isFile.and(isXml)).map(zipEntry -> {
         XunitParseJob job = xmlParseJobProvider.get()
             .withParameters(projectDetails, launchId, user, getEntryStream(zipFile, zipEntry),
-                isSkippedNotIssue(rq.getAttributes()));
+                isSkippedNotIssue(rq.getAttributes())
+            );
         return CompletableFuture.supplyAsync(job::call, service);
       }).toArray(CompletableFuture[]::new);
       ParseResults parseResults = processResults(futures);
diff --git a/src/main/java/com/epam/ta/reportportal/core/integration/CreateIntegrationHandler.java b/src/main/java/com/epam/ta/reportportal/core/integration/CreateIntegrationHandler.java
index 707984f395..d6859e663c 100644
--- a/src/main/java/com/epam/ta/reportportal/core/integration/CreateIntegrationHandler.java
+++ b/src/main/java/com/epam/ta/reportportal/core/integration/CreateIntegrationHandler.java
@@ -18,9 +18,9 @@
 
 import com.epam.ta.reportportal.commons.ReportPortalUser;
 import com.epam.ta.reportportal.entity.integration.Integration;
-import com.epam.ta.reportportal.ws.model.EntryCreatedRS;
+import com.epam.ta.reportportal.model.EntryCreatedRS;
+import com.epam.ta.reportportal.model.integration.IntegrationRQ;
 import com.epam.ta.reportportal.ws.model.OperationCompletionRS;
-import com.epam.ta.reportportal.ws.model.integration.IntegrationRQ;
 
 /**
  * @author <a href="mailto:ivan_budayeu@epam.com">Ivan Budayeu</a>
diff --git a/src/main/java/com/epam/ta/reportportal/core/integration/GetIntegrationHandler.java b/src/main/java/com/epam/ta/reportportal/core/integration/GetIntegrationHandler.java
index e58315f011..ca13ff86d1 100644
--- a/src/main/java/com/epam/ta/reportportal/core/integration/GetIntegrationHandler.java
+++ b/src/main/java/com/epam/ta/reportportal/core/integration/GetIntegrationHandler.java
@@ -19,7 +19,7 @@
 import com.epam.ta.reportportal.commons.ReportPortalUser;
 import com.epam.ta.reportportal.entity.enums.IntegrationGroupEnum;
 import com.epam.ta.reportportal.entity.integration.Integration;
-import com.epam.ta.reportportal.ws.model.integration.IntegrationResource;
+import com.epam.ta.reportportal.model.integration.IntegrationResource;
 import java.util.List;
 import java.util.Optional;
 
diff --git a/src/main/java/com/epam/ta/reportportal/core/integration/impl/CreateIntegrationHandlerImpl.java b/src/main/java/com/epam/ta/reportportal/core/integration/impl/CreateIntegrationHandlerImpl.java
index 7bca6c9f23..e5075fac21 100644
--- a/src/main/java/com/epam/ta/reportportal/core/integration/impl/CreateIntegrationHandlerImpl.java
+++ b/src/main/java/com/epam/ta/reportportal/core/integration/impl/CreateIntegrationHandlerImpl.java
@@ -33,11 +33,11 @@
 import com.epam.ta.reportportal.entity.integration.IntegrationType;
 import com.epam.ta.reportportal.entity.project.Project;
 import com.epam.ta.reportportal.exception.ReportPortalException;
-import com.epam.ta.reportportal.ws.model.EntryCreatedRS;
+import com.epam.ta.reportportal.model.EntryCreatedRS;
+import com.epam.ta.reportportal.model.activity.IntegrationActivityResource;
+import com.epam.ta.reportportal.model.integration.IntegrationRQ;
 import com.epam.ta.reportportal.ws.model.ErrorType;
 import com.epam.ta.reportportal.ws.model.OperationCompletionRS;
-import com.epam.ta.reportportal.ws.model.activity.IntegrationActivityResource;
-import com.epam.ta.reportportal.ws.model.integration.IntegrationRQ;
 import java.util.Map;
 import org.apache.commons.lang3.BooleanUtils;
 import org.apache.commons.lang3.StringUtils;
@@ -65,11 +65,10 @@ public class CreateIntegrationHandlerImpl implements CreateIntegrationHandler {
   private final IntegrationService basicIntegrationService;
 
   @Autowired
-  public CreateIntegrationHandlerImpl(
-      @Qualifier("integrationServiceMapping") Map<String, IntegrationService> integrationServiceMapping,
+  public CreateIntegrationHandlerImpl(@Qualifier("integrationServiceMapping")
+  Map<String, IntegrationService> integrationServiceMapping,
       IntegrationRepository integrationRepository, ProjectRepository projectRepository,
-      ApplicationEventPublisher eventPublisher,
-      IntegrationTypeRepository integrationTypeRepository,
+      ApplicationEventPublisher eventPublisher, IntegrationTypeRepository integrationTypeRepository,
       @Qualifier("basicIntegrationServiceImpl") IntegrationService integrationService) {
     this.integrationServiceMapping = integrationServiceMapping;
     this.integrationRepository = integrationRepository;
@@ -84,17 +83,18 @@ public EntryCreatedRS createGlobalIntegration(IntegrationRQ createRequest, Strin
       ReportPortalUser user) {
     IntegrationType integrationType = integrationTypeRepository.findByName(pluginName)
         .orElseThrow(() -> new ReportPortalException(ErrorType.INTEGRATION_NOT_FOUND, pluginName));
-    IntegrationService integrationService = integrationServiceMapping.getOrDefault(
-        integrationType.getName(),
-        this.basicIntegrationService
-    );
+    IntegrationService integrationService =
+        integrationServiceMapping.getOrDefault(integrationType.getName(),
+            this.basicIntegrationService
+        );
 
-    String integrationName = ofNullable(createRequest.getName()).map(String::toLowerCase)
-        .map(name -> {
+    String integrationName =
+        ofNullable(createRequest.getName()).map(String::toLowerCase).map(name -> {
           validateGlobalIntegrationName(name, integrationType);
           return name;
         }).orElseThrow(() -> new ReportPortalException(ErrorType.INCORRECT_INTEGRATION_NAME,
-            "Integration name should be not null"));
+            "Integration name should be not null"
+        ));
     createRequest.setName(integrationName);
 
     Integration integration = integrationService.createIntegration(createRequest, integrationType);
@@ -109,8 +109,7 @@ public EntryCreatedRS createGlobalIntegration(IntegrationRQ createRequest, Strin
 
   @Override
   public EntryCreatedRS createProjectIntegration(String projectName, IntegrationRQ createRequest,
-      String pluginName,
-      ReportPortalUser user) {
+      String pluginName, ReportPortalUser user) {
 
     Project project = projectRepository.findByName(projectName)
         .orElseThrow(() -> new ReportPortalException(ErrorType.PROJECT_NOT_FOUND, projectName));
@@ -118,17 +117,18 @@ public EntryCreatedRS createProjectIntegration(String projectName, IntegrationRQ
     IntegrationType integrationType = integrationTypeRepository.findByName(pluginName)
         .orElseThrow(() -> new ReportPortalException(ErrorType.INTEGRATION_NOT_FOUND, pluginName));
 
-    IntegrationService integrationService = integrationServiceMapping.getOrDefault(
-        integrationType.getName(),
-        this.basicIntegrationService
-    );
+    IntegrationService integrationService =
+        integrationServiceMapping.getOrDefault(integrationType.getName(),
+            this.basicIntegrationService
+        );
 
-    String integrationName = ofNullable(createRequest.getName()).map(String::toLowerCase)
-        .map(name -> {
+    String integrationName =
+        ofNullable(createRequest.getName()).map(String::toLowerCase).map(name -> {
           validateProjectIntegrationName(name, integrationType, project);
           return name;
         }).orElseThrow(() -> new ReportPortalException(ErrorType.INCORRECT_INTEGRATION_NAME,
-            "Integration name should be not null"));
+            "Integration name should be not null"
+        ));
     createRequest.setName(integrationName);
 
     Integration integration = integrationService.createIntegration(createRequest, integrationType);
@@ -158,13 +158,13 @@ public OperationCompletionRS updateGlobalIntegration(Long id, IntegrationRQ upda
       updateRequest.setName(name);
     });
 
-    IntegrationService integrationService = integrationServiceMapping.getOrDefault(
-        integration.getType().getName(),
-        this.basicIntegrationService
-    );
+    IntegrationService integrationService =
+        integrationServiceMapping.getOrDefault(integration.getType().getName(),
+            this.basicIntegrationService
+        );
 
-    Integration updatedIntegration = integrationService.updateIntegration(integration,
-        updateRequest);
+    Integration updatedIntegration =
+        integrationService.updateIntegration(integration, updateRequest);
     integrationService.checkConnection(integration);
     integrationRepository.save(updatedIntegration);
 
@@ -193,12 +193,12 @@ public OperationCompletionRS updateProjectIntegration(Long id, String projectNam
       updateRequest.setName(name);
     });
 
-    IntegrationService integrationService = integrationServiceMapping.getOrDefault(
-        integration.getType().getName(),
-        this.basicIntegrationService
-    );
-    Integration updatedIntegration = integrationService.updateIntegration(integration,
-        updateRequest);
+    IntegrationService integrationService =
+        integrationServiceMapping.getOrDefault(integration.getType().getName(),
+            this.basicIntegrationService
+        );
+    Integration updatedIntegration =
+        integrationService.updateIntegration(integration, updateRequest);
     updatedIntegration.setProject(project);
     integrationService.checkConnection(integration);
 
@@ -215,17 +215,14 @@ private void validateGlobalIntegrationName(String integrationName,
     BusinessRule.expect(integrationName, StringUtils::isNotBlank)
         .verify(ErrorType.INCORRECT_INTEGRATION_NAME, "Integration name should be not empty");
     BusinessRule.expect(
-            integrationRepository.existsByNameAndTypeIdAndProjectIdIsNull(integrationName,
-                integrationType.getId()),
-            BooleanUtils::isFalse
+        integrationRepository.existsByNameAndTypeIdAndProjectIdIsNull(integrationName,
+            integrationType.getId()
+        ), BooleanUtils::isFalse).verify(ErrorType.INTEGRATION_ALREADY_EXISTS,
+        Suppliers.formattedSupplier(
+            "Global integration of type = '{}' with name = '{}' already exists",
+            integrationType.getName(), integrationName
         )
-        .verify(ErrorType.INTEGRATION_ALREADY_EXISTS,
-            Suppliers.formattedSupplier(
-                "Global integration of type = '{}' with name = '{}' already exists",
-                integrationType.getName(),
-                integrationName
-            )
-        );
+    );
   }
 
   private void validateProjectIntegrationName(String integrationName,
@@ -233,34 +230,28 @@ private void validateProjectIntegrationName(String integrationName,
     BusinessRule.expect(integrationName, StringUtils::isNotBlank)
         .verify(ErrorType.INCORRECT_INTEGRATION_NAME, "Integration name should be not empty");
     BusinessRule.expect(integrationRepository.existsByNameAndTypeIdAndProjectId(integrationName,
-            integrationType.getId(),
-            project.getId()
-        ), BooleanUtils::isFalse)
-        .verify(ErrorType.INTEGRATION_ALREADY_EXISTS,
-            Suppliers.formattedSupplier(
-                "Project integration of type = '{}' with name = '{}' already exists on project = '{}'",
-                integrationType.getName(),
-                integrationName,
-                project.getName()
-            )
-        );
+        integrationType.getId(), project.getId()
+    ), BooleanUtils::isFalse).verify(ErrorType.INTEGRATION_ALREADY_EXISTS,
+        Suppliers.formattedSupplier(
+            "Project integration of type = '{}' with name = '{}' already exists on project = '{}'",
+            integrationType.getName(), integrationName, project.getName()
+        )
+    );
   }
 
   private void publishUpdateActivity(ReportPortalUser user,
-      IntegrationActivityResource beforeUpdate,
-      Integration updatedIntegration) {
-    eventPublisher.publishEvent(new IntegrationUpdatedEvent(user.getUserId(),
-        user.getUsername(),
-        beforeUpdate,
-        TO_ACTIVITY_RESOURCE.apply(updatedIntegration)
-    ));
+      IntegrationActivityResource beforeUpdate, Integration updatedIntegration) {
+    eventPublisher.publishEvent(
+        new IntegrationUpdatedEvent(user.getUserId(), user.getUsername(), beforeUpdate,
+            TO_ACTIVITY_RESOURCE.apply(updatedIntegration)
+        ));
   }
 
   private void publishCreationActivity(Integration integration, ReportPortalUser user) {
-    eventPublisher.publishEvent(new IntegrationCreatedEvent(TO_ACTIVITY_RESOURCE.apply(integration),
-        user.getUserId(),
-        user.getUsername()
-    ));
+    eventPublisher.publishEvent(
+        new IntegrationCreatedEvent(TO_ACTIVITY_RESOURCE.apply(integration), user.getUserId(),
+            user.getUsername()
+        ));
   }
 
 }
diff --git a/src/main/java/com/epam/ta/reportportal/core/integration/impl/GetIntegrationHandlerImpl.java b/src/main/java/com/epam/ta/reportportal/core/integration/impl/GetIntegrationHandlerImpl.java
index d3c2e00305..887f3a205c 100644
--- a/src/main/java/com/epam/ta/reportportal/core/integration/impl/GetIntegrationHandlerImpl.java
+++ b/src/main/java/com/epam/ta/reportportal/core/integration/impl/GetIntegrationHandlerImpl.java
@@ -33,8 +33,8 @@
 import com.epam.ta.reportportal.entity.integration.IntegrationType;
 import com.epam.ta.reportportal.entity.project.Project;
 import com.epam.ta.reportportal.exception.ReportPortalException;
+import com.epam.ta.reportportal.model.integration.IntegrationResource;
 import com.epam.ta.reportportal.ws.model.ErrorType;
-import com.epam.ta.reportportal.ws.model.integration.IntegrationResource;
 import java.util.List;
 import java.util.Map;
 import java.util.Optional;
@@ -58,8 +58,8 @@ public class GetIntegrationHandlerImpl implements GetIntegrationHandler {
   private final GetBugTrackingSystemHandler getBugTrackingSystemHandler;
 
   @Autowired
-  public GetIntegrationHandlerImpl(
-      @Qualifier("integrationServiceMapping") Map<String, IntegrationService> integrationServiceMapping,
+  public GetIntegrationHandlerImpl(@Qualifier("integrationServiceMapping")
+  Map<String, IntegrationService> integrationServiceMapping,
       @Qualifier("basicIntegrationServiceImpl") IntegrationService integrationService,
       IntegrationRepository integrationRepository,
       IntegrationTypeRepository integrationTypeRepository, ProjectRepository projectRepository,
@@ -76,18 +76,16 @@ public GetIntegrationHandlerImpl(
   public IntegrationResource getProjectIntegrationById(Long integrationId, String projectName) {
     Project project = projectRepository.findByName(projectName)
         .orElseThrow(() -> new ReportPortalException(ErrorType.PROJECT_NOT_FOUND, projectName));
-    Integration integration = integrationRepository.findByIdAndProjectId(integrationId,
-            project.getId())
-        .orElseThrow(
+    Integration integration =
+        integrationRepository.findByIdAndProjectId(integrationId, project.getId()).orElseThrow(
             () -> new ReportPortalException(ErrorType.INTEGRATION_NOT_FOUND, integrationId));
     return TO_INTEGRATION_RESOURCE.apply(integration);
   }
 
   @Override
   public IntegrationResource getGlobalIntegrationById(Long integrationId) {
-    Integration integration = integrationRepository.findGlobalById(integrationId)
-        .orElseThrow(
-            () -> new ReportPortalException(ErrorType.INTEGRATION_NOT_FOUND, integrationId));
+    Integration integration = integrationRepository.findGlobalById(integrationId).orElseThrow(
+        () -> new ReportPortalException(ErrorType.INTEGRATION_NOT_FOUND, integrationId));
     return TO_INTEGRATION_RESOURCE.apply(integration);
   }
 
@@ -95,14 +93,14 @@ public IntegrationResource getGlobalIntegrationById(Long integrationId) {
   public Optional<Integration> getEnabledByProjectIdOrGlobalAndIntegrationGroup(Long projectId,
       IntegrationGroupEnum integrationGroup) {
 
-    List<Long> integrationTypeIds = integrationTypeRepository.findAllByIntegrationGroup(
-            integrationGroup)
-        .stream()
-        .map(IntegrationType::getId)
-        .collect(Collectors.toList());
+    List<Long> integrationTypeIds =
+        integrationTypeRepository.findAllByIntegrationGroup(integrationGroup).stream()
+            .map(IntegrationType::getId).collect(Collectors.toList());
 
-    List<Integration> integrations = integrationRepository.findAllByProjectIdAndInIntegrationTypeIds(
-        projectId, integrationTypeIds);
+    List<Integration> integrations =
+        integrationRepository.findAllByProjectIdAndInIntegrationTypeIds(projectId,
+            integrationTypeIds
+        );
 
     if (!CollectionUtils.isEmpty(integrations)) {
 
@@ -121,22 +119,25 @@ public Optional<Integration> getEnabledByProjectIdOrGlobalAndIntegrationGroup(Lo
   public Integration getEnabledBtsIntegration(ReportPortalUser.ProjectDetails projectDetails,
       String url, String btsProject) {
 
-    Project project = projectRepository.findById(projectDetails.getProjectId())
-        .orElseThrow(() -> new ReportPortalException(ErrorType.PROJECT_NOT_FOUND,
-            projectDetails.getProjectName()));
-
-    Integration integration = getBugTrackingSystemHandler.getEnabledProjectIntegration(
-            projectDetails, url, btsProject)
-        .orElseGet(() -> {
-          Integration globalIntegration = getBugTrackingSystemHandler.getEnabledGlobalIntegration(
-                  url, btsProject)
-              .orElseThrow(() -> new ReportPortalException(ErrorType.INTEGRATION_NOT_FOUND, url));
-
-          IntegrationValidator.validateProjectLevelIntegrationConstraints(project,
-              globalIntegration);
-
-          return globalIntegration;
-        });
+    Project project = projectRepository.findById(projectDetails.getProjectId()).orElseThrow(
+        () -> new ReportPortalException(ErrorType.PROJECT_NOT_FOUND,
+            projectDetails.getProjectName()
+        ));
+
+    Integration integration =
+        getBugTrackingSystemHandler.getEnabledProjectIntegration(projectDetails, url, btsProject)
+            .orElseGet(() -> {
+              Integration globalIntegration =
+                  getBugTrackingSystemHandler.getEnabledGlobalIntegration(url, btsProject)
+                      .orElseThrow(
+                          () -> new ReportPortalException(ErrorType.INTEGRATION_NOT_FOUND, url));
+
+              IntegrationValidator.validateProjectLevelIntegrationConstraints(project,
+                  globalIntegration
+              );
+
+              return globalIntegration;
+            });
     validateIntegration(integration);
     return integration;
   }
@@ -145,21 +146,25 @@ public Integration getEnabledBtsIntegration(ReportPortalUser.ProjectDetails proj
   public Integration getEnabledBtsIntegration(ReportPortalUser.ProjectDetails projectDetails,
       Long integrationId) {
 
-    Project project = projectRepository.findById(projectDetails.getProjectId())
-        .orElseThrow(() -> new ReportPortalException(ErrorType.PROJECT_NOT_FOUND,
-            projectDetails.getProjectName()));
-
-    Integration integration = getBugTrackingSystemHandler.getEnabledProjectIntegration(
-        projectDetails, integrationId).orElseGet(() -> {
-      Integration globalIntegration = getBugTrackingSystemHandler.getEnabledGlobalIntegration(
-              integrationId)
-          .orElseThrow(
-              () -> new ReportPortalException(ErrorType.INTEGRATION_NOT_FOUND, integrationId));
-
-      IntegrationValidator.validateProjectLevelIntegrationConstraints(project, globalIntegration);
-
-      return globalIntegration;
-    });
+    Project project = projectRepository.findById(projectDetails.getProjectId()).orElseThrow(
+        () -> new ReportPortalException(ErrorType.PROJECT_NOT_FOUND,
+            projectDetails.getProjectName()
+        ));
+
+    Integration integration =
+        getBugTrackingSystemHandler.getEnabledProjectIntegration(projectDetails, integrationId)
+            .orElseGet(() -> {
+              Integration globalIntegration =
+                  getBugTrackingSystemHandler.getEnabledGlobalIntegration(integrationId)
+                      .orElseThrow(() -> new ReportPortalException(ErrorType.INTEGRATION_NOT_FOUND,
+                          integrationId
+                      ));
+
+              IntegrationValidator.validateProjectLevelIntegrationConstraints(
+                  project, globalIntegration);
+
+              return globalIntegration;
+            });
     validateIntegration(integration);
     return integration;
   }
@@ -167,9 +172,8 @@ public Integration getEnabledBtsIntegration(ReportPortalUser.ProjectDetails proj
   @Override
   public Integration getEnabledBtsIntegration(Long integrationId) {
 
-    Integration globalIntegration = getBugTrackingSystemHandler.getEnabledGlobalIntegration(
-            integrationId)
-        .orElseThrow(
+    Integration globalIntegration =
+        getBugTrackingSystemHandler.getEnabledGlobalIntegration(integrationId).orElseThrow(
             () -> new ReportPortalException(ErrorType.INTEGRATION_NOT_FOUND, integrationId));
 
     return globalIntegration;
@@ -185,10 +189,8 @@ public List<IntegrationResource> getGlobalIntegrations() {
   public List<IntegrationResource> getGlobalIntegrations(String pluginName) {
     IntegrationType integrationType = integrationTypeRepository.findByName(pluginName)
         .orElseThrow(() -> new ReportPortalException(ErrorType.INTEGRATION_NOT_FOUND, pluginName));
-    return integrationRepository.findAllGlobalByType(integrationType)
-        .stream()
-        .map(TO_INTEGRATION_RESOURCE)
-        .collect(Collectors.toList());
+    return integrationRepository.findAllGlobalByType(integrationType).stream()
+        .map(TO_INTEGRATION_RESOURCE).collect(Collectors.toList());
   }
 
   @Override
@@ -206,10 +208,8 @@ public List<IntegrationResource> getProjectIntegrations(String pluginName, Strin
     IntegrationType integrationType = integrationTypeRepository.findByName(pluginName)
         .orElseThrow(() -> new ReportPortalException(ErrorType.INTEGRATION_NOT_FOUND, pluginName));
     return integrationRepository.findAllByProjectIdAndTypeOrderByCreationDateDesc(project.getId(),
-            integrationType)
-        .stream()
-        .map(TO_INTEGRATION_RESOURCE)
-        .collect(Collectors.toList());
+        integrationType
+    ).stream().map(TO_INTEGRATION_RESOURCE).collect(Collectors.toList());
   }
 
   @Override
@@ -217,36 +217,33 @@ public boolean testConnection(Long integrationId, String projectName) {
     Project project = projectRepository.findByName(projectName)
         .orElseThrow(() -> new ReportPortalException(ErrorType.PROJECT_NOT_FOUND, projectName));
 
-    Integration integration = integrationRepository.findByIdAndProjectId(integrationId,
-            project.getId())
-        .orElseGet(() -> integrationRepository.findGlobalById(integrationId)
-            .orElseThrow(
+    Integration integration =
+        integrationRepository.findByIdAndProjectId(integrationId, project.getId()).orElseGet(
+            () -> integrationRepository.findGlobalById(integrationId).orElseThrow(
                 () -> new ReportPortalException(ErrorType.INTEGRATION_NOT_FOUND, integrationId)));
 
-    IntegrationService integrationService = integrationServiceMapping.getOrDefault(
-        integration.getType().getName(),
-        this.basicIntegrationService
-    );
+    IntegrationService integrationService =
+        integrationServiceMapping.getOrDefault(integration.getType().getName(),
+            this.basicIntegrationService
+        );
     return integrationService.checkConnection(integration);
   }
 
   @Override
   public boolean testConnection(Long integrationId) {
-    Integration integration = integrationRepository.findGlobalById(integrationId)
-        .orElseThrow(
-            () -> new ReportPortalException(ErrorType.INTEGRATION_NOT_FOUND, integrationId));
+    Integration integration = integrationRepository.findGlobalById(integrationId).orElseThrow(
+        () -> new ReportPortalException(ErrorType.INTEGRATION_NOT_FOUND, integrationId));
 
-    IntegrationService integrationService = integrationServiceMapping.getOrDefault(
-        integration.getType().getName(),
-        this.basicIntegrationService
-    );
+    IntegrationService integrationService =
+        integrationServiceMapping.getOrDefault(integration.getType().getName(),
+            this.basicIntegrationService
+        );
     return integrationService.checkConnection(integration);
   }
 
   private Optional<Integration> getGlobalIntegrationByIntegrationTypeIds(
       List<Long> integrationTypeIds) {
-    return integrationRepository.findAllGlobalInIntegrationTypeIds(integrationTypeIds)
-        .stream()
+    return integrationRepository.findAllGlobalInIntegrationTypeIds(integrationTypeIds).stream()
         .filter(integration -> integration.getType().isEnabled() && integration.isEnabled())
         .findFirst();
   }
@@ -255,13 +252,14 @@ private void validateIntegration(Integration integration) {
     BusinessRule.expect(integration, i -> integration.getType().isEnabled())
         .verify(ErrorType.UNABLE_INTERACT_WITH_INTEGRATION,
             Suppliers.formattedSupplier("'{}' type integrations are disabled by Administrator",
-                    integration.getType().getName())
-                .get()
+                integration.getType().getName()
+            ).get()
         );
     BusinessRule.expect(integration, Integration::isEnabled)
         .verify(ErrorType.UNABLE_INTERACT_WITH_INTEGRATION,
             Suppliers.formattedSupplier("Integration with ID = '{}' is disabled",
-                integration.getId()).get()
+                integration.getId()
+            ).get()
         );
   }
 }
diff --git a/src/main/java/com/epam/ta/reportportal/core/integration/plugin/CreatePluginHandler.java b/src/main/java/com/epam/ta/reportportal/core/integration/plugin/CreatePluginHandler.java
index d3b6e30433..8f2d6c78c2 100644
--- a/src/main/java/com/epam/ta/reportportal/core/integration/plugin/CreatePluginHandler.java
+++ b/src/main/java/com/epam/ta/reportportal/core/integration/plugin/CreatePluginHandler.java
@@ -17,7 +17,7 @@
 package com.epam.ta.reportportal.core.integration.plugin;
 
 import com.epam.ta.reportportal.commons.ReportPortalUser;
-import com.epam.ta.reportportal.ws.model.EntryCreatedRS;
+import com.epam.ta.reportportal.model.EntryCreatedRS;
 import org.springframework.web.multipart.MultipartFile;
 
 /**
@@ -25,12 +25,12 @@
  */
 public interface CreatePluginHandler {
 
-	/**
-	 * Upload and start up the plugin
-	 *
-	 * @param pluginFile Plugin file
-	 * @param user User that uploaded plugin
-	 * @return {@link EntryCreatedRS} with the newly created {@link com.epam.ta.reportportal.entity.integration.IntegrationType#id}
-	 */
-	EntryCreatedRS uploadPlugin(MultipartFile pluginFile, ReportPortalUser user);
+  /**
+   * Upload and start up the plugin
+   *
+   * @param pluginFile Plugin file
+   * @param user       User that uploaded plugin
+   * @return {@link EntryCreatedRS} with the newly created {@link com.epam.ta.reportportal.entity.integration.IntegrationType#id}
+   */
+  EntryCreatedRS uploadPlugin(MultipartFile pluginFile, ReportPortalUser user);
 }
diff --git a/src/main/java/com/epam/ta/reportportal/core/integration/plugin/GetPluginHandler.java b/src/main/java/com/epam/ta/reportportal/core/integration/plugin/GetPluginHandler.java
index 0e3eaece79..e2e16d8357 100644
--- a/src/main/java/com/epam/ta/reportportal/core/integration/plugin/GetPluginHandler.java
+++ b/src/main/java/com/epam/ta/reportportal/core/integration/plugin/GetPluginHandler.java
@@ -16,7 +16,7 @@
 
 package com.epam.ta.reportportal.core.integration.plugin;
 
-import com.epam.ta.reportportal.ws.model.integration.IntegrationTypeResource;
+import com.epam.ta.reportportal.model.integration.IntegrationTypeResource;
 import java.util.List;
 
 /**
diff --git a/src/main/java/com/epam/ta/reportportal/core/integration/plugin/UpdatePluginHandler.java b/src/main/java/com/epam/ta/reportportal/core/integration/plugin/UpdatePluginHandler.java
index 6b1b3dffe0..b4b237c4de 100644
--- a/src/main/java/com/epam/ta/reportportal/core/integration/plugin/UpdatePluginHandler.java
+++ b/src/main/java/com/epam/ta/reportportal/core/integration/plugin/UpdatePluginHandler.java
@@ -17,8 +17,8 @@
 package com.epam.ta.reportportal.core.integration.plugin;
 
 import com.epam.ta.reportportal.commons.ReportPortalUser;
+import com.epam.ta.reportportal.model.integration.UpdatePluginStateRQ;
 import com.epam.ta.reportportal.ws.model.OperationCompletionRS;
-import com.epam.ta.reportportal.ws.model.integration.UpdatePluginStateRQ;
 
 /**
  * @author <a href="mailto:ivan_budayeu@epam.com">Ivan Budayeu</a>
diff --git a/src/main/java/com/epam/ta/reportportal/core/integration/plugin/impl/CreatePluginHandlerImpl.java b/src/main/java/com/epam/ta/reportportal/core/integration/plugin/impl/CreatePluginHandlerImpl.java
index ed9ff309cf..f1530ae489 100644
--- a/src/main/java/com/epam/ta/reportportal/core/integration/plugin/impl/CreatePluginHandlerImpl.java
+++ b/src/main/java/com/epam/ta/reportportal/core/integration/plugin/impl/CreatePluginHandlerImpl.java
@@ -23,9 +23,9 @@
 import com.epam.ta.reportportal.core.plugin.Pf4jPluginBox;
 import com.epam.ta.reportportal.entity.integration.IntegrationType;
 import com.epam.ta.reportportal.exception.ReportPortalException;
-import com.epam.ta.reportportal.ws.model.EntryCreatedRS;
+import com.epam.ta.reportportal.model.EntryCreatedRS;
+import com.epam.ta.reportportal.model.activity.PluginActivityResource;
 import com.epam.ta.reportportal.ws.model.ErrorType;
-import com.epam.ta.reportportal.ws.model.activity.PluginActivityResource;
 import java.io.IOException;
 import java.io.InputStream;
 import org.apache.commons.lang3.StringUtils;
diff --git a/src/main/java/com/epam/ta/reportportal/core/integration/plugin/impl/DeletePluginHandlerImpl.java b/src/main/java/com/epam/ta/reportportal/core/integration/plugin/impl/DeletePluginHandlerImpl.java
index caedb340e0..174ee91307 100644
--- a/src/main/java/com/epam/ta/reportportal/core/integration/plugin/impl/DeletePluginHandlerImpl.java
+++ b/src/main/java/com/epam/ta/reportportal/core/integration/plugin/impl/DeletePluginHandlerImpl.java
@@ -27,9 +27,9 @@
 import com.epam.ta.reportportal.entity.enums.ReservedIntegrationTypeEnum;
 import com.epam.ta.reportportal.entity.integration.IntegrationType;
 import com.epam.ta.reportportal.exception.ReportPortalException;
+import com.epam.ta.reportportal.model.activity.PluginActivityResource;
 import com.epam.ta.reportportal.ws.model.ErrorType;
 import com.epam.ta.reportportal.ws.model.OperationCompletionRS;
-import com.epam.ta.reportportal.ws.model.activity.PluginActivityResource;
 import java.util.Optional;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.ApplicationEventPublisher;
diff --git a/src/main/java/com/epam/ta/reportportal/core/integration/plugin/impl/GetPluginHandlerImpl.java b/src/main/java/com/epam/ta/reportportal/core/integration/plugin/impl/GetPluginHandlerImpl.java
index 1a0080020f..9a09b0cbec 100644
--- a/src/main/java/com/epam/ta/reportportal/core/integration/plugin/impl/GetPluginHandlerImpl.java
+++ b/src/main/java/com/epam/ta/reportportal/core/integration/plugin/impl/GetPluginHandlerImpl.java
@@ -18,8 +18,8 @@
 
 import com.epam.ta.reportportal.core.integration.plugin.GetPluginHandler;
 import com.epam.ta.reportportal.dao.IntegrationTypeRepository;
+import com.epam.ta.reportportal.model.integration.IntegrationTypeResource;
 import com.epam.ta.reportportal.ws.converter.converters.IntegrationTypeConverter;
-import com.epam.ta.reportportal.ws.model.integration.IntegrationTypeResource;
 import java.util.List;
 import java.util.stream.Collectors;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -42,17 +42,13 @@ public GetPluginHandlerImpl(IntegrationTypeRepository integrationTypeRepository)
 
   @Override
   public List<IntegrationTypeResource> getPlugins() {
-    return integrationTypeRepository.findAllByOrderByCreationDate()
-        .stream()
-        .map(IntegrationTypeConverter.TO_RESOURCE)
-        .collect(Collectors.toList());
+    return integrationTypeRepository.findAllByOrderByCreationDate().stream()
+        .map(IntegrationTypeConverter.TO_RESOURCE).collect(Collectors.toList());
   }
 
   @Override
   public List<IntegrationTypeResource> getPublicPlugins() {
-    return integrationTypeRepository.findAllByAccessType(ACCESS_TYPE_PUBLIC_NAME)
-        .stream()
-        .map(IntegrationTypeConverter.TO_RESOURCE)
-        .collect(Collectors.toList());
+    return integrationTypeRepository.findAllByAccessType(ACCESS_TYPE_PUBLIC_NAME).stream()
+        .map(IntegrationTypeConverter.TO_RESOURCE).collect(Collectors.toList());
   }
 }
diff --git a/src/main/java/com/epam/ta/reportportal/core/integration/plugin/impl/UpdatePluginHandlerImpl.java b/src/main/java/com/epam/ta/reportportal/core/integration/plugin/impl/UpdatePluginHandlerImpl.java
index 34171e6231..620bf87c98 100644
--- a/src/main/java/com/epam/ta/reportportal/core/integration/plugin/impl/UpdatePluginHandlerImpl.java
+++ b/src/main/java/com/epam/ta/reportportal/core/integration/plugin/impl/UpdatePluginHandlerImpl.java
@@ -26,10 +26,10 @@
 import com.epam.ta.reportportal.entity.enums.ReservedIntegrationTypeEnum;
 import com.epam.ta.reportportal.entity.integration.IntegrationType;
 import com.epam.ta.reportportal.exception.ReportPortalException;
+import com.epam.ta.reportportal.model.activity.PluginActivityResource;
+import com.epam.ta.reportportal.model.integration.UpdatePluginStateRQ;
 import com.epam.ta.reportportal.ws.model.ErrorType;
 import com.epam.ta.reportportal.ws.model.OperationCompletionRS;
-import com.epam.ta.reportportal.ws.model.activity.PluginActivityResource;
-import com.epam.ta.reportportal.ws.model.integration.UpdatePluginStateRQ;
 import org.apache.commons.lang3.BooleanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.ApplicationEventPublisher;
diff --git a/src/main/java/com/epam/ta/reportportal/core/integration/util/BasicIntegrationServiceImpl.java b/src/main/java/com/epam/ta/reportportal/core/integration/util/BasicIntegrationServiceImpl.java
index fb79c653f6..b592c27f0b 100644
--- a/src/main/java/com/epam/ta/reportportal/core/integration/util/BasicIntegrationServiceImpl.java
+++ b/src/main/java/com/epam/ta/reportportal/core/integration/util/BasicIntegrationServiceImpl.java
@@ -28,8 +28,8 @@
 import com.epam.ta.reportportal.entity.integration.IntegrationParams;
 import com.epam.ta.reportportal.entity.integration.IntegrationType;
 import com.epam.ta.reportportal.exception.ReportPortalException;
+import com.epam.ta.reportportal.model.integration.IntegrationRQ;
 import com.epam.ta.reportportal.ws.converter.builders.IntegrationBuilder;
-import com.epam.ta.reportportal.ws.model.integration.IntegrationRQ;
 import java.time.LocalDateTime;
 import java.util.Map;
 import java.util.Optional;
@@ -60,19 +60,18 @@ public BasicIntegrationServiceImpl(IntegrationRepository integrationRepository,
   @Override
   public Integration createIntegration(IntegrationRQ integrationRq,
       IntegrationType integrationType) {
-    return new IntegrationBuilder().withCreationDate(LocalDateTime.now())
-        .withType(integrationType)
-        .withEnabled(integrationRq.getEnabled())
-        .withName(integrationRq.getName())
-        .withParams(new IntegrationParams(
-            retrieveCreateParams(integrationType.getName(), integrationRq.getIntegrationParams())))
-        .get();
+    return new IntegrationBuilder().withCreationDate(LocalDateTime.now()).withType(integrationType)
+        .withEnabled(integrationRq.getEnabled()).withName(integrationRq.getName()).withParams(
+            new IntegrationParams(retrieveCreateParams(integrationType.getName(),
+                integrationRq.getIntegrationParams()
+            ))).get();
   }
 
   @Override
   public Integration updateIntegration(Integration integration, IntegrationRQ integrationRQ) {
     Map<String, Object> validParams = retrieveUpdatedParams(integration.getType().getName(),
-        integrationRQ.getIntegrationParams());
+        integrationRQ.getIntegrationParams()
+    );
     IntegrationParams combinedParams = getCombinedParams(integration, validParams);
     integration.setParams(combinedParams);
     ofNullable(integrationRQ.getEnabled()).ifPresent(integration::setEnabled);
@@ -83,8 +82,8 @@ public Integration updateIntegration(Integration integration, IntegrationRQ inte
   @Override
   public Map<String, Object> retrieveCreateParams(String integrationType,
       Map<String, Object> integrationParams) {
-    final Optional<CommonPluginCommand<?>> pluginCommand = getCommonCommand(integrationType,
-        RETRIEVE_CREATE_PARAMS);
+    final Optional<CommonPluginCommand<?>> pluginCommand =
+        getCommonCommand(integrationType, RETRIEVE_CREATE_PARAMS);
     if (pluginCommand.isPresent()) {
       return (Map<String, Object>) pluginCommand.get().executeCommand(integrationParams);
     }
@@ -94,8 +93,8 @@ public Map<String, Object> retrieveCreateParams(String integrationType,
   @Override
   public Map<String, Object> retrieveUpdatedParams(String integrationType,
       Map<String, Object> integrationParams) {
-    final Optional<CommonPluginCommand<?>> pluginCommand = getCommonCommand(integrationType,
-        RETRIEVE_UPDATED_PARAMS);
+    final Optional<CommonPluginCommand<?>> pluginCommand =
+        getCommonCommand(integrationType, RETRIEVE_UPDATED_PARAMS);
     if (pluginCommand.isPresent()) {
       return (Map<String, Object>) pluginCommand.get().executeCommand(integrationParams);
     }
@@ -104,8 +103,8 @@ public Map<String, Object> retrieveUpdatedParams(String integrationType,
 
   @Override
   public boolean checkConnection(Integration integration) {
-    final Optional<PluginCommand<?>> pluginCommand = getIntegrationCommand(
-        integration.getType().getName(), TEST_CONNECTION_COMMAND);
+    final Optional<PluginCommand<?>> pluginCommand =
+        getIntegrationCommand(integration.getType().getName(), TEST_CONNECTION_COMMAND);
     if (pluginCommand.isPresent()) {
       return (Boolean) pluginCommand.get()
           .executeCommand(integration, integration.getParams().getParams());
@@ -114,21 +113,21 @@ public boolean checkConnection(Integration integration) {
   }
 
   private Optional<PluginCommand<?>> getIntegrationCommand(String integration, String commandName) {
-    ReportPortalExtensionPoint pluginInstance = pluginBox.getInstance(integration,
-            ReportPortalExtensionPoint.class)
-        .orElseThrow(
+    ReportPortalExtensionPoint pluginInstance =
+        pluginBox.getInstance(integration, ReportPortalExtensionPoint.class).orElseThrow(
             () -> new ReportPortalException(BAD_REQUEST_ERROR, "Plugin for {} isn't installed",
-                integration));
+                integration
+            ));
     return ofNullable(pluginInstance.getIntegrationCommand(commandName));
   }
 
   private Optional<CommonPluginCommand<?>> getCommonCommand(String integration,
       String commandName) {
-    ReportPortalExtensionPoint pluginInstance = pluginBox.getInstance(integration,
-            ReportPortalExtensionPoint.class)
-        .orElseThrow(
+    ReportPortalExtensionPoint pluginInstance =
+        pluginBox.getInstance(integration, ReportPortalExtensionPoint.class).orElseThrow(
             () -> new ReportPortalException(BAD_REQUEST_ERROR, "Plugin for {} isn't installed",
-                integration));
+                integration
+            ));
     return ofNullable(pluginInstance.getCommonCommand(commandName));
   }
 
diff --git a/src/main/java/com/epam/ta/reportportal/core/integration/util/IntegrationService.java b/src/main/java/com/epam/ta/reportportal/core/integration/util/IntegrationService.java
index 8aa41b60e7..10f44ea624 100644
--- a/src/main/java/com/epam/ta/reportportal/core/integration/util/IntegrationService.java
+++ b/src/main/java/com/epam/ta/reportportal/core/integration/util/IntegrationService.java
@@ -18,7 +18,7 @@
 
 import com.epam.ta.reportportal.entity.integration.Integration;
 import com.epam.ta.reportportal.entity.integration.IntegrationType;
-import com.epam.ta.reportportal.ws.model.integration.IntegrationRQ;
+import com.epam.ta.reportportal.model.integration.IntegrationRQ;
 import java.util.Map;
 
 /**
diff --git a/src/main/java/com/epam/ta/reportportal/core/item/ExternalTicketHandler.java b/src/main/java/com/epam/ta/reportportal/core/item/ExternalTicketHandler.java
index 98d67d87ad..1e55836014 100644
--- a/src/main/java/com/epam/ta/reportportal/core/item/ExternalTicketHandler.java
+++ b/src/main/java/com/epam/ta/reportportal/core/item/ExternalTicketHandler.java
@@ -18,8 +18,8 @@
 
 import com.epam.ta.reportportal.entity.item.TestItem;
 import com.epam.ta.reportportal.entity.item.issue.IssueEntity;
+import com.epam.ta.reportportal.model.item.UnlinkExternalIssueRQ;
 import com.epam.ta.reportportal.ws.model.issue.Issue;
-import com.epam.ta.reportportal.ws.model.item.UnlinkExternalIssueRQ;
 import java.util.List;
 import java.util.Set;
 
diff --git a/src/main/java/com/epam/ta/reportportal/core/item/GetTestItemHandler.java b/src/main/java/com/epam/ta/reportportal/core/item/GetTestItemHandler.java
index a85cdc9a22..5a3b8d757c 100644
--- a/src/main/java/com/epam/ta/reportportal/core/item/GetTestItemHandler.java
+++ b/src/main/java/com/epam/ta/reportportal/core/item/GetTestItemHandler.java
@@ -24,7 +24,7 @@
 import com.epam.ta.reportportal.entity.filter.UserFilter;
 import com.epam.ta.reportportal.entity.item.TestItem;
 import com.epam.ta.reportportal.entity.launch.Launch;
-import com.epam.ta.reportportal.ws.model.TestItemResource;
+import com.epam.ta.reportportal.model.TestItemResource;
 import com.epam.ta.reportportal.ws.model.statistics.StatisticsResource;
 import java.util.List;
 import java.util.Map;
@@ -64,9 +64,8 @@ TestItemResource getTestItem(String testItemId, ReportPortalUser.ProjectDetails
    * @return {@link Iterable} of the {@link TestItemResource}
    */
   Iterable<TestItemResource> getTestItems(Queryable filter, Pageable pageable,
-      ReportPortalUser.ProjectDetails projectDetails,
-      ReportPortalUser user, @Nullable Long launchId, @Nullable Long filterId, boolean isLatest,
-      int launchesLimit);
+      ReportPortalUser.ProjectDetails projectDetails, ReportPortalUser user,
+      @Nullable Long launchId, @Nullable Long filterId, boolean isLatest, int launchesLimit);
 
   /**
    * Gets {@link TestItem} instances
@@ -78,8 +77,8 @@ Iterable<TestItemResource> getTestItems(Queryable filter, Pageable pageable,
    * @return {@link Iterable} of the {@link TestItemResource}
    */
   Iterable<TestItemResource> getTestItemsByProvider(Queryable filter, Pageable pageable,
-      ReportPortalUser.ProjectDetails projectDetails,
-      ReportPortalUser user, Map<String, String> params);
+      ReportPortalUser.ProjectDetails projectDetails, ReportPortalUser user,
+      Map<String, String> params);
 
   /**
    * Gets accumulated statistics of items by data provider
@@ -125,8 +124,7 @@ StatisticsResource getStatisticsByProvider(Queryable filter,
    * @return {@link List} of the {@link ItemAttribute#getKey()}
    */
   List<String> getAttributeKeys(Long launchFilterId, boolean isLatest, int launchesLimit,
-      ReportPortalUser.ProjectDetails projectDetails,
-      String keyPart);
+      ReportPortalUser.ProjectDetails projectDetails, String keyPart);
 
   /**
    * Get specified attribute keys
diff --git a/src/main/java/com/epam/ta/reportportal/core/item/UpdateTestItemHandler.java b/src/main/java/com/epam/ta/reportportal/core/item/UpdateTestItemHandler.java
index 8cb6dcbac9..492a27277c 100644
--- a/src/main/java/com/epam/ta/reportportal/core/item/UpdateTestItemHandler.java
+++ b/src/main/java/com/epam/ta/reportportal/core/item/UpdateTestItemHandler.java
@@ -17,12 +17,12 @@
 package com.epam.ta.reportportal.core.item;
 
 import com.epam.ta.reportportal.commons.ReportPortalUser;
+import com.epam.ta.reportportal.model.issue.DefineIssueRQ;
+import com.epam.ta.reportportal.model.item.ExternalIssueRQ;
+import com.epam.ta.reportportal.model.item.UpdateTestItemRQ;
 import com.epam.ta.reportportal.ws.model.BulkInfoUpdateRQ;
 import com.epam.ta.reportportal.ws.model.OperationCompletionRS;
-import com.epam.ta.reportportal.ws.model.issue.DefineIssueRQ;
 import com.epam.ta.reportportal.ws.model.issue.Issue;
-import com.epam.ta.reportportal.ws.model.item.ExternalIssueRQ;
-import com.epam.ta.reportportal.ws.model.item.UpdateTestItemRQ;
 import java.util.List;
 
 /**
@@ -53,8 +53,7 @@ List<Issue> defineTestItemsIssues(ReportPortalUser.ProjectDetails projectDetails
    * @return OperationCompletionRS
    */
   OperationCompletionRS updateTestItem(ReportPortalUser.ProjectDetails projectDetails, Long itemId,
-      UpdateTestItemRQ rq,
-      ReportPortalUser user);
+      UpdateTestItemRQ rq, ReportPortalUser user);
 
   /**
    * Add or remove external system issue link directly to the
@@ -66,8 +65,7 @@ OperationCompletionRS updateTestItem(ReportPortalUser.ProjectDetails projectDeta
    * @return {@link List} of the {@link OperationCompletionRS}
    */
   List<OperationCompletionRS> processExternalIssues(ExternalIssueRQ request,
-      ReportPortalUser.ProjectDetails projectDetails,
-      ReportPortalUser user);
+      ReportPortalUser.ProjectDetails projectDetails, ReportPortalUser user);
 
   /**
    * Resets items issue to default state
diff --git a/src/main/java/com/epam/ta/reportportal/core/item/history/ITestItemsHistoryService.java b/src/main/java/com/epam/ta/reportportal/core/item/history/ITestItemsHistoryService.java
index 5df86ae3cb..a7cc1659e1 100644
--- a/src/main/java/com/epam/ta/reportportal/core/item/history/ITestItemsHistoryService.java
+++ b/src/main/java/com/epam/ta/reportportal/core/item/history/ITestItemsHistoryService.java
@@ -18,7 +18,7 @@
 
 import com.epam.ta.reportportal.entity.item.TestItem;
 import com.epam.ta.reportportal.entity.launch.Launch;
-import com.epam.ta.reportportal.ws.model.TestItemHistoryElement;
+import com.epam.ta.reportportal.model.TestItemHistoryElement;
 import java.util.List;
 
 /**
diff --git a/src/main/java/com/epam/ta/reportportal/core/item/history/TestItemsHistoryHandler.java b/src/main/java/com/epam/ta/reportportal/core/item/history/TestItemsHistoryHandler.java
index 0b6ccb81cd..a201d226f0 100644
--- a/src/main/java/com/epam/ta/reportportal/core/item/history/TestItemsHistoryHandler.java
+++ b/src/main/java/com/epam/ta/reportportal/core/item/history/TestItemsHistoryHandler.java
@@ -19,7 +19,7 @@
 import com.epam.ta.reportportal.commons.ReportPortalUser;
 import com.epam.ta.reportportal.commons.querygen.Queryable;
 import com.epam.ta.reportportal.core.item.impl.history.param.HistoryRequestParams;
-import com.epam.ta.reportportal.ws.model.TestItemHistoryElement;
+import com.epam.ta.reportportal.model.TestItemHistoryElement;
 import org.springframework.data.domain.Pageable;
 
 /**
@@ -41,7 +41,7 @@ public interface TestItemsHistoryHandler {
    * @return {@link Iterable} of {@link TestItemHistoryElement}
    */
   Iterable<TestItemHistoryElement> getItemsHistory(ReportPortalUser.ProjectDetails projectDetails,
-      Queryable filter, Pageable pageable,
-      HistoryRequestParams historyRequestParams, ReportPortalUser user);
+      Queryable filter, Pageable pageable, HistoryRequestParams historyRequestParams,
+      ReportPortalUser user);
 
 }
\ No newline at end of file
diff --git a/src/main/java/com/epam/ta/reportportal/core/item/impl/ExternalTicketHandlerImpl.java b/src/main/java/com/epam/ta/reportportal/core/item/impl/ExternalTicketHandlerImpl.java
index 03377e97ba..05c06dc779 100644
--- a/src/main/java/com/epam/ta/reportportal/core/item/impl/ExternalTicketHandlerImpl.java
+++ b/src/main/java/com/epam/ta/reportportal/core/item/impl/ExternalTicketHandlerImpl.java
@@ -25,9 +25,9 @@
 import com.epam.ta.reportportal.entity.bts.Ticket;
 import com.epam.ta.reportportal.entity.item.TestItem;
 import com.epam.ta.reportportal.entity.item.issue.IssueEntity;
+import com.epam.ta.reportportal.model.item.UnlinkExternalIssueRQ;
 import com.epam.ta.reportportal.ws.converter.converters.TicketConverter;
 import com.epam.ta.reportportal.ws.model.issue.Issue;
-import com.epam.ta.reportportal.ws.model.item.UnlinkExternalIssueRQ;
 import java.time.Instant;
 import java.time.LocalDateTime;
 import java.time.ZoneOffset;
@@ -90,11 +90,10 @@ private List<Ticket> collectExistedTickets(Collection<Issue.ExternalSystemIssue>
     if (CollectionUtils.isEmpty(externalIssues)) {
       return Collections.emptyList();
     }
-    List<Ticket> existedTickets = ticketRepository.findByTicketIdIn(externalIssues.stream()
-        .map(Issue.ExternalSystemIssue::getTicketId)
-        .collect(toList()));
-    List<String> existedTicketsIds = existedTickets.stream().map(Ticket::getTicketId)
-        .collect(toList());
+    List<Ticket> existedTickets = ticketRepository.findByTicketIdIn(
+        externalIssues.stream().map(Issue.ExternalSystemIssue::getTicketId).collect(toList()));
+    List<String> existedTicketsIds =
+        existedTickets.stream().map(Ticket::getTicketId).collect(toList());
     externalIssues.removeIf(it -> existedTicketsIds.contains(it.getTicketId()));
     return existedTickets;
   }
@@ -126,9 +125,8 @@ private Set<Ticket> collectTickets(Collection<Issue.ExternalSystemIssue> externa
       }
       ticket.setSubmitter(username);
       ticket.setSubmitDate(ofNullable(it.getSubmitDate()).map(
-          millis -> LocalDateTime.ofInstant(Instant.ofEpochMilli(millis),
-              ZoneOffset.UTC
-          )).orElse(LocalDateTime.now()));
+              millis -> LocalDateTime.ofInstant(Instant.ofEpochMilli(millis), ZoneOffset.UTC))
+          .orElse(LocalDateTime.now()));
       return ticket;
     }).collect(toSet());
   }
diff --git a/src/main/java/com/epam/ta/reportportal/core/item/impl/FinishTestItemHandlerImpl.java b/src/main/java/com/epam/ta/reportportal/core/item/impl/FinishTestItemHandlerImpl.java
index 986cbab87c..f40ff73621 100644
--- a/src/main/java/com/epam/ta/reportportal/core/item/impl/FinishTestItemHandlerImpl.java
+++ b/src/main/java/com/epam/ta/reportportal/core/item/impl/FinishTestItemHandlerImpl.java
@@ -68,11 +68,11 @@
 import com.epam.ta.reportportal.entity.user.UserRole;
 import com.epam.ta.reportportal.exception.ReportPortalException;
 import com.epam.ta.reportportal.jooq.enums.JStatusEnum;
+import com.epam.ta.reportportal.model.activity.TestItemActivityResource;
 import com.epam.ta.reportportal.ws.converter.builders.TestItemBuilder;
 import com.epam.ta.reportportal.ws.converter.converters.IssueConverter;
 import com.epam.ta.reportportal.ws.model.FinishTestItemRQ;
 import com.epam.ta.reportportal.ws.model.OperationCompletionRS;
-import com.epam.ta.reportportal.ws.model.activity.TestItemActivityResource;
 import com.epam.ta.reportportal.ws.model.issue.Issue;
 import com.google.common.collect.Lists;
 import java.util.ArrayList;
diff --git a/src/main/java/com/epam/ta/reportportal/core/item/impl/GetTestItemHandlerImpl.java b/src/main/java/com/epam/ta/reportportal/core/item/impl/GetTestItemHandlerImpl.java
index 75e583a81b..16fd9804d7 100644
--- a/src/main/java/com/epam/ta/reportportal/core/item/impl/GetTestItemHandlerImpl.java
+++ b/src/main/java/com/epam/ta/reportportal/core/item/impl/GetTestItemHandlerImpl.java
@@ -16,6 +16,14 @@
 
 package com.epam.ta.reportportal.core.item.impl;
 
+import static com.epam.ta.reportportal.commons.querygen.constant.GeneralCriteriaConstant.CRITERIA_ID;
+import static com.epam.ta.reportportal.commons.querygen.constant.GeneralCriteriaConstant.CRITERIA_PROJECT_ID;
+import static com.epam.ta.reportportal.commons.querygen.constant.LaunchCriteriaConstant.CRITERIA_LAUNCH_MODE;
+import static com.epam.ta.reportportal.commons.validation.BusinessRule.expect;
+import static com.epam.ta.reportportal.entity.project.ProjectRole.OPERATOR;
+import static com.epam.ta.reportportal.ws.model.ErrorType.ACCESS_DENIED;
+import static java.util.stream.Collectors.toList;
+
 import com.epam.ta.reportportal.commons.Predicates;
 import com.epam.ta.reportportal.commons.ReportPortalUser;
 import com.epam.ta.reportportal.commons.querygen.Condition;
@@ -40,6 +48,7 @@
 import com.epam.ta.reportportal.entity.project.ProjectRole;
 import com.epam.ta.reportportal.entity.user.UserRole;
 import com.epam.ta.reportportal.exception.ReportPortalException;
+import com.epam.ta.reportportal.model.TestItemResource;
 import com.epam.ta.reportportal.ws.converter.PagedResourcesAssembler;
 import com.epam.ta.reportportal.ws.converter.converters.StatisticsConverter;
 import com.epam.ta.reportportal.ws.converter.converters.TestItemConverter;
@@ -47,27 +56,21 @@
 import com.epam.ta.reportportal.ws.converter.utils.ResourceUpdaterProvider;
 import com.epam.ta.reportportal.ws.converter.utils.item.content.TestItemUpdaterContent;
 import com.epam.ta.reportportal.ws.model.ErrorType;
-import com.epam.ta.reportportal.ws.model.TestItemResource;
 import com.epam.ta.reportportal.ws.model.statistics.StatisticsResource;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
+import java.util.Map;
+import java.util.Optional;
+import java.util.function.Predicate;
+import java.util.stream.Collectors;
+import javax.annotation.Nullable;
 import org.apache.commons.lang3.tuple.Pair;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
 import org.springframework.stereotype.Service;
 
-import javax.annotation.Nullable;
-import java.util.*;
-import java.util.function.Predicate;
-import java.util.stream.Collectors;
-
-import static com.epam.ta.reportportal.commons.querygen.constant.GeneralCriteriaConstant.CRITERIA_ID;
-import static com.epam.ta.reportportal.commons.querygen.constant.GeneralCriteriaConstant.CRITERIA_PROJECT_ID;
-import static com.epam.ta.reportportal.commons.querygen.constant.LaunchCriteriaConstant.CRITERIA_LAUNCH_MODE;
-import static com.epam.ta.reportportal.commons.validation.BusinessRule.expect;
-import static com.epam.ta.reportportal.entity.project.ProjectRole.OPERATOR;
-import static com.epam.ta.reportportal.ws.model.ErrorType.ACCESS_DENIED;
-import static java.util.stream.Collectors.toList;
-
 /**
  * GET operations for {@link TestItem}<br>
  * Default implementation
@@ -78,253 +81,256 @@
 @Service
 class GetTestItemHandlerImpl implements GetTestItemHandler {
 
-	public static final String PROVIDER_TYPE_PARAM = "providerType";
-
-	private final TestItemRepository testItemRepository;
-
-	private final TestItemService testItemService;
-
-	private final LaunchAccessValidator launchAccessValidator;
-
-	private final ItemAttributeRepository itemAttributeRepository;
-
-	private final List<ResourceUpdaterProvider<TestItemUpdaterContent, TestItemResource>> resourceUpdaterProviders;
-
-	private final TicketRepository ticketRepository;
-
-	private final UserFilterRepository filterRepository;
-
-	@Autowired
-	private Map<DataProviderType, DataProviderHandler> testItemDataProviders;
-
-	@Autowired
-	public GetTestItemHandlerImpl(TestItemRepository testItemRepository, TestItemService testItemService,
-			LaunchAccessValidator launchAccessValidator, ItemAttributeRepository itemAttributeRepository,
-			List<ResourceUpdaterProvider<TestItemUpdaterContent, TestItemResource>> resourceUpdaterProviders,
-			TicketRepository ticketRepository, UserFilterRepository filterRepository) {
-		this.testItemRepository = testItemRepository;
-		this.testItemService = testItemService;
-		this.launchAccessValidator = launchAccessValidator;
-		this.itemAttributeRepository = itemAttributeRepository;
-		this.resourceUpdaterProviders = resourceUpdaterProviders;
-		this.ticketRepository = ticketRepository;
-		this.filterRepository = filterRepository;
-	}
-
-	@Override
-	public TestItemResource getTestItem(String testItemId, ReportPortalUser.ProjectDetails projectDetails, ReportPortalUser user) {
-		TestItem testItem;
-		try {
-			testItem = testItemRepository.findById(Long.parseLong(testItemId))
-					.orElseThrow(() -> new ReportPortalException(ErrorType.TEST_ITEM_NOT_FOUND, testItemId));
-		} catch (NumberFormatException e) {
-			testItem = testItemRepository.findByUuid(testItemId)
-					.orElseThrow(() -> new ReportPortalException(ErrorType.TEST_ITEM_NOT_FOUND, testItemId));
-		}
-
-		Launch launch = testItemService.getEffectiveLaunch(testItem);
-		launchAccessValidator.validate(launch.getId(), projectDetails, user);
-
-		List<ResourceUpdater<TestItemResource>> resourceUpdaters = getResourceUpdaters(projectDetails.getProjectId(),
-				Collections.singletonList(testItem)
-		);
-		TestItemResource testItemResource = TestItemConverter.TO_RESOURCE.apply(testItem);
-		resourceUpdaters.forEach(updater -> updater.updateResource(testItemResource));
-		return testItemResource;
-	}
-
-	@Override
-	public Iterable<TestItemResource> getTestItems(Queryable filter, Pageable pageable, ReportPortalUser.ProjectDetails projectDetails,
-			ReportPortalUser user, @Nullable Long launchId, @Nullable Long filterId, boolean isLatest, int launchesLimit) {
-
-		Optional<Long> launchIdOptional = Optional.ofNullable(launchId);
-		Optional<Long> filterIdOptional = Optional.ofNullable(filterId);
-
-		Page<TestItem> testItemPage = filterIdOptional.map(launchFilterId -> {
-			validateProjectRole(projectDetails, user);
-			return getItemsWithLaunchesFiltering(filter, pageable, projectDetails, launchFilterId, isLatest, launchesLimit);
-		}).orElseGet(() -> launchIdOptional.map(id -> {
-			launchAccessValidator.validate(id, projectDetails, user);
-			return testItemRepository.findByFilter(filter, pageable);
-		}).orElseThrow(() -> new ReportPortalException(ErrorType.BAD_REQUEST_ERROR, "Neither launch nor filter id specified.")));
-
-		return PagedResourcesAssembler.<TestItem, TestItemResource>pageMultiConverter(items -> {
-			List<ResourceUpdater<TestItemResource>> resourceUpdaters = getResourceUpdaters(projectDetails.getProjectId(),
-					testItemPage.getContent()
-			);
-			return items.stream().map(item -> {
-				TestItemResource testItemResource = TestItemConverter.TO_RESOURCE.apply(item);
-				resourceUpdaters.forEach(updater -> updater.updateResource(testItemResource));
-				return testItemResource;
-			}).collect(toList());
-		}).apply(testItemPage);
-	}
-
-	@Override
-	public Iterable<TestItemResource> getTestItemsByProvider(Queryable filter, Pageable pageable,
-			ReportPortalUser.ProjectDetails projectDetails, ReportPortalUser user, Map<String, String> params) {
-		DataProviderType dataProviderType = DataProviderType.findByName(params.get(PROVIDER_TYPE_PARAM))
-				.orElseThrow(() -> new ReportPortalException(ErrorType.BAD_REQUEST_ERROR,
-						"Test item data provider base is not specified. Allowed data provider {}",
-						DataProviderType.values()
-				));
-
-		Page<TestItem> testItemPage = testItemDataProviders.get(dataProviderType)
-				.getTestItems(filter, pageable, projectDetails, user, params);
-
-		return PagedResourcesAssembler.<TestItem, TestItemResource>pageMultiConverter(items -> {
-			List<ResourceUpdater<TestItemResource>> resourceUpdaters = getResourceUpdaters(projectDetails.getProjectId(),
-					testItemPage.getContent()
-			);
-			return items.stream().map(item -> {
-				TestItemResource testItemResource = TestItemConverter.TO_RESOURCE.apply(item);
-				resourceUpdaters.forEach(updater -> updater.updateResource(testItemResource));
-				return testItemResource;
-			}).collect(toList());
-		}).apply(testItemPage);
-	}
-
-	@Override
-	public StatisticsResource getStatisticsByProvider(Queryable filter, ReportPortalUser.ProjectDetails projectDetails,
-			ReportPortalUser reportPortalUser, Map<String, String> params) {
-		DataProviderType dataProviderType = DataProviderType.findByName(params.get(PROVIDER_TYPE_PARAM))
-				.orElseThrow(() -> new ReportPortalException(ErrorType.BAD_REQUEST_ERROR,
-						"Test item data provider base is not specified. Allowed data provider {}",
-						DataProviderType.values()
-				));
-		return StatisticsConverter.TO_RESOURCE.apply(testItemDataProviders.get(dataProviderType)
-				.accumulateStatistics(filter, projectDetails, reportPortalUser, params));
-	}
-
-	protected void validateProjectRole(ReportPortalUser.ProjectDetails projectDetails, ReportPortalUser user) {
-		if (user.getUserRole() != UserRole.ADMINISTRATOR) {
-			expect(projectDetails.getProjectRole() == OPERATOR, Predicate.isEqual(false)).verify(ACCESS_DENIED);
-		}
-	}
-
-	private Page<TestItem> getItemsWithLaunchesFiltering(Queryable testItemFilter, Pageable testItemPageable,
-			ReportPortalUser.ProjectDetails projectDetails, Long launchFilterId, boolean isLatest, int launchesLimit) {
-
-		UserFilter userFilter = filterRepository.findByIdAndProjectId(launchFilterId, projectDetails.getProjectId())
-				.orElseThrow(() -> new ReportPortalException(ErrorType.USER_FILTER_NOT_FOUND_IN_PROJECT,
-						launchFilterId,
-						projectDetails.getProjectName()
-				));
-
-		Pair<Queryable, Pageable> queryablePair = DefaultLaunchFilterProvider.createDefaultLaunchQueryablePair(projectDetails,
-				userFilter,
-				launchesLimit
-		);
-
-		return testItemRepository.findByFilter(isLatest,
-				queryablePair.getKey(),
-				testItemFilter,
-				queryablePair.getValue(),
-				testItemPageable
-		);
-	}
-
-	private List<ResourceUpdater<TestItemResource>> getResourceUpdaters(Long projectId, List<TestItem> testItems) {
-		return resourceUpdaterProviders.stream()
-				.map(retriever -> retriever.retrieve(TestItemUpdaterContent.of(projectId, testItems)))
-				.collect(toList());
-
-	}
-
-	@Override
-	public List<String> getTicketIds(Long launchId, String term) {
-		BusinessRule.expect(term.length() > 2, Predicates.equalTo(true)).verify(ErrorType.INCORRECT_FILTER_PARAMETERS,
-				Suppliers.formattedSupplier("Length of the filtering string '{}' is less than 3 symbols", term)
-		);
-		return ticketRepository.findByLaunchIdAndTerm(launchId, term);
-	}
-
-	@Override
-	public List<String> getTicketIds(ReportPortalUser.ProjectDetails projectDetails, String term) {
-		BusinessRule.expect(term.length() > 0, Predicates.equalTo(true)).verify(ErrorType.INCORRECT_FILTER_PARAMETERS,
-				Suppliers.formattedSupplier("Length of the filtering string '{}' is less than 1 symbols", term)
-		);
-		return ticketRepository.findByProjectIdAndTerm(projectDetails.getProjectId(), term);
-	}
-
-	@Override
-	public List<String> getAttributeKeys(Long launchFilterId, boolean isLatest, int launchesLimit,
-			ReportPortalUser.ProjectDetails projectDetails, String keyPart) {
-
-		UserFilter userFilter = filterRepository.findByIdAndProjectId(launchFilterId, projectDetails.getProjectId())
-				.orElseThrow(() -> new ReportPortalException(ErrorType.USER_FILTER_NOT_FOUND_IN_PROJECT,
-						launchFilterId,
-						projectDetails.getProjectName()
-				));
-
-		Pair<Queryable, Pageable> queryablePair = DefaultLaunchFilterProvider.createDefaultLaunchQueryablePair(projectDetails,
-				userFilter,
-				launchesLimit
-		);
-		return itemAttributeRepository.findAllKeysByLaunchFilter(queryablePair.getKey(),
-				queryablePair.getValue(),
-				isLatest,
-				keyPart,
-				false
-		);
-	}
-
-	@Override
-	public List<String> getAttributeKeys(Long launchId, String value) {
-		return itemAttributeRepository.findTestItemAttributeKeys(launchId, value, false);
-	}
-
-	@Override
-	public List<String> getAttributeValues(Long launchId, String key, String value) {
-		return itemAttributeRepository.findTestItemAttributeValues(launchId, key, value, false);
-	}
-
-	@Override
-	public List<String> getAttributeKeys(ReportPortalUser.ProjectDetails projectDetails, String launchName, String keyPart) {
-		return itemAttributeRepository.findTestItemKeysByProjectIdAndLaunchName(projectDetails.getProjectId(), launchName, keyPart, false);
-	}
-
-	@Override
-	public List<String> getAttributeValues(ReportPortalUser.ProjectDetails projectDetails, String launchName, String key,
-			String valuePart) {
-		return itemAttributeRepository.findTestItemValuesByProjectIdAndLaunchName(
-				projectDetails.getProjectId(),
-				launchName,
-				key,
-				valuePart,
-				false
-		);
-	}
-
-	@Override
-	public List<TestItemResource> getTestItems(Long[] ids, ReportPortalUser.ProjectDetails projectDetails, ReportPortalUser user) {
-		List<TestItem> items;
-		if (user.getUserRole() != UserRole.ADMINISTRATOR) {
-			items = testItemRepository.findByFilter(getItemsFilter(ids, projectDetails));
-		} else {
-			items = testItemRepository.findAllById(Arrays.asList(ids));
-		}
-		List<ResourceUpdater<TestItemResource>> resourceUpdaters = getResourceUpdaters(projectDetails.getProjectId(), items);
-		return items.stream().map(item -> {
-			TestItemResource testItemResource = TestItemConverter.TO_RESOURCE.apply(item);
-			resourceUpdaters.forEach(updater -> updater.updateResource(testItemResource));
-			return testItemResource;
-		}).collect(toList());
-	}
-
-	private Filter getItemsFilter(Long[] ids, ReportPortalUser.ProjectDetails projectDetails) {
-		final Filter filter = Filter.builder()
-				.withTarget(TestItem.class)
-				.withCondition(FilterCondition.builder().eq(CRITERIA_PROJECT_ID, String.valueOf(projectDetails.getProjectId())).build())
-				.withCondition(FilterCondition.builder()
-						.withSearchCriteria(CRITERIA_ID)
-						.withCondition(Condition.IN)
-						.withValue(Arrays.stream(ids).map(Object::toString).collect(Collectors.joining(",")))
-						.build())
-				.build();
-		return projectDetails.getProjectRole() != ProjectRole.OPERATOR ?
-				filter :
-				filter.withCondition(FilterCondition.builder().eq(CRITERIA_LAUNCH_MODE, LaunchModeEnum.DEFAULT.name()).build());
-	}
+  public static final String PROVIDER_TYPE_PARAM = "providerType";
+
+  private final TestItemRepository testItemRepository;
+
+  private final TestItemService testItemService;
+
+  private final LaunchAccessValidator launchAccessValidator;
+
+  private final ItemAttributeRepository itemAttributeRepository;
+
+  private final List<ResourceUpdaterProvider<TestItemUpdaterContent, TestItemResource>>
+      resourceUpdaterProviders;
+
+  private final TicketRepository ticketRepository;
+
+  private final UserFilterRepository filterRepository;
+
+  @Autowired
+  private Map<DataProviderType, DataProviderHandler> testItemDataProviders;
+
+  @Autowired
+  public GetTestItemHandlerImpl(TestItemRepository testItemRepository,
+      TestItemService testItemService, LaunchAccessValidator launchAccessValidator,
+      ItemAttributeRepository itemAttributeRepository,
+      List<ResourceUpdaterProvider<TestItemUpdaterContent, TestItemResource>> resourceUpdaterProviders,
+      TicketRepository ticketRepository, UserFilterRepository filterRepository) {
+    this.testItemRepository = testItemRepository;
+    this.testItemService = testItemService;
+    this.launchAccessValidator = launchAccessValidator;
+    this.itemAttributeRepository = itemAttributeRepository;
+    this.resourceUpdaterProviders = resourceUpdaterProviders;
+    this.ticketRepository = ticketRepository;
+    this.filterRepository = filterRepository;
+  }
+
+  @Override
+  public TestItemResource getTestItem(String testItemId,
+      ReportPortalUser.ProjectDetails projectDetails, ReportPortalUser user) {
+    TestItem testItem;
+    try {
+      testItem = testItemRepository.findById(Long.parseLong(testItemId))
+          .orElseThrow(() -> new ReportPortalException(ErrorType.TEST_ITEM_NOT_FOUND, testItemId));
+    } catch (NumberFormatException e) {
+      testItem = testItemRepository.findByUuid(testItemId)
+          .orElseThrow(() -> new ReportPortalException(ErrorType.TEST_ITEM_NOT_FOUND, testItemId));
+    }
+
+    Launch launch = testItemService.getEffectiveLaunch(testItem);
+    launchAccessValidator.validate(launch.getId(), projectDetails, user);
+
+    List<ResourceUpdater<TestItemResource>> resourceUpdaters =
+        getResourceUpdaters(projectDetails.getProjectId(), Collections.singletonList(testItem));
+    TestItemResource testItemResource = TestItemConverter.TO_RESOURCE.apply(testItem);
+    resourceUpdaters.forEach(updater -> updater.updateResource(testItemResource));
+    return testItemResource;
+  }
+
+  @Override
+  public Iterable<TestItemResource> getTestItems(Queryable filter, Pageable pageable,
+      ReportPortalUser.ProjectDetails projectDetails, ReportPortalUser user,
+      @Nullable Long launchId, @Nullable Long filterId, boolean isLatest, int launchesLimit) {
+
+    Optional<Long> launchIdOptional = Optional.ofNullable(launchId);
+    Optional<Long> filterIdOptional = Optional.ofNullable(filterId);
+
+    Page<TestItem> testItemPage = filterIdOptional.map(launchFilterId -> {
+      validateProjectRole(projectDetails, user);
+      return getItemsWithLaunchesFiltering(
+          filter, pageable, projectDetails, launchFilterId, isLatest, launchesLimit);
+    }).orElseGet(() -> launchIdOptional.map(id -> {
+      launchAccessValidator.validate(id, projectDetails, user);
+      return testItemRepository.findByFilter(filter, pageable);
+    }).orElseThrow(() -> new ReportPortalException(ErrorType.BAD_REQUEST_ERROR,
+        "Neither launch nor filter id specified."
+    )));
+
+    return PagedResourcesAssembler.<TestItem, TestItemResource>pageMultiConverter(items -> {
+      List<ResourceUpdater<TestItemResource>> resourceUpdaters =
+          getResourceUpdaters(projectDetails.getProjectId(), testItemPage.getContent());
+      return items.stream().map(item -> {
+        TestItemResource testItemResource = TestItemConverter.TO_RESOURCE.apply(item);
+        resourceUpdaters.forEach(updater -> updater.updateResource(testItemResource));
+        return testItemResource;
+      }).collect(toList());
+    }).apply(testItemPage);
+  }
+
+  @Override
+  public Iterable<TestItemResource> getTestItemsByProvider(Queryable filter, Pageable pageable,
+      ReportPortalUser.ProjectDetails projectDetails, ReportPortalUser user,
+      Map<String, String> params) {
+    DataProviderType dataProviderType = DataProviderType.findByName(params.get(PROVIDER_TYPE_PARAM))
+        .orElseThrow(() -> new ReportPortalException(
+            ErrorType.BAD_REQUEST_ERROR,
+            "Test item data provider base is not specified. Allowed data provider {}",
+            DataProviderType.values()
+        ));
+
+    Page<TestItem> testItemPage = testItemDataProviders.get(dataProviderType)
+        .getTestItems(filter, pageable, projectDetails, user, params);
+
+    return PagedResourcesAssembler.<TestItem, TestItemResource>pageMultiConverter(items -> {
+      List<ResourceUpdater<TestItemResource>> resourceUpdaters =
+          getResourceUpdaters(projectDetails.getProjectId(), testItemPage.getContent());
+      return items.stream().map(item -> {
+        TestItemResource testItemResource = TestItemConverter.TO_RESOURCE.apply(item);
+        resourceUpdaters.forEach(updater -> updater.updateResource(testItemResource));
+        return testItemResource;
+      }).collect(toList());
+    }).apply(testItemPage);
+  }
+
+  @Override
+  public StatisticsResource getStatisticsByProvider(Queryable filter,
+      ReportPortalUser.ProjectDetails projectDetails, ReportPortalUser reportPortalUser,
+      Map<String, String> params) {
+    DataProviderType dataProviderType = DataProviderType.findByName(params.get(PROVIDER_TYPE_PARAM))
+        .orElseThrow(() -> new ReportPortalException(
+            ErrorType.BAD_REQUEST_ERROR,
+            "Test item data provider base is not specified. Allowed data provider {}",
+            DataProviderType.values()
+        ));
+    return StatisticsConverter.TO_RESOURCE.apply(testItemDataProviders.get(dataProviderType)
+        .accumulateStatistics(filter, projectDetails, reportPortalUser, params));
+  }
+
+  protected void validateProjectRole(ReportPortalUser.ProjectDetails projectDetails,
+      ReportPortalUser user) {
+    if (user.getUserRole() != UserRole.ADMINISTRATOR) {
+      expect(projectDetails.getProjectRole() == OPERATOR, Predicate.isEqual(false)).verify(
+          ACCESS_DENIED);
+    }
+  }
+
+  private Page<TestItem> getItemsWithLaunchesFiltering(Queryable testItemFilter,
+      Pageable testItemPageable, ReportPortalUser.ProjectDetails projectDetails,
+      Long launchFilterId, boolean isLatest, int launchesLimit) {
+
+    UserFilter userFilter =
+        filterRepository.findByIdAndProjectId(launchFilterId, projectDetails.getProjectId())
+            .orElseThrow(() -> new ReportPortalException(ErrorType.USER_FILTER_NOT_FOUND_IN_PROJECT,
+                launchFilterId, projectDetails.getProjectName()
+            ));
+
+    Pair<Queryable, Pageable> queryablePair =
+        DefaultLaunchFilterProvider.createDefaultLaunchQueryablePair(projectDetails, userFilter,
+            launchesLimit
+        );
+
+    return testItemRepository.findByFilter(isLatest, queryablePair.getKey(), testItemFilter,
+        queryablePair.getValue(), testItemPageable
+    );
+  }
+
+  private List<ResourceUpdater<TestItemResource>> getResourceUpdaters(Long projectId,
+      List<TestItem> testItems) {
+    return resourceUpdaterProviders.stream()
+        .map(retriever -> retriever.retrieve(TestItemUpdaterContent.of(projectId, testItems)))
+        .collect(toList());
+
+  }
+
+  @Override
+  public List<String> getTicketIds(Long launchId, String term) {
+    BusinessRule.expect(term.length() > 2, Predicates.equalTo(true))
+        .verify(ErrorType.INCORRECT_FILTER_PARAMETERS, Suppliers.formattedSupplier(
+            "Length of the filtering string '{}' is less than 3 symbols", term));
+    return ticketRepository.findByLaunchIdAndTerm(launchId, term);
+  }
+
+  @Override
+  public List<String> getTicketIds(ReportPortalUser.ProjectDetails projectDetails, String term) {
+    BusinessRule.expect(term.length() > 0, Predicates.equalTo(true))
+        .verify(ErrorType.INCORRECT_FILTER_PARAMETERS, Suppliers.formattedSupplier(
+            "Length of the filtering string '{}' is less than 1 symbols", term));
+    return ticketRepository.findByProjectIdAndTerm(projectDetails.getProjectId(), term);
+  }
+
+  @Override
+  public List<String> getAttributeKeys(Long launchFilterId, boolean isLatest, int launchesLimit,
+      ReportPortalUser.ProjectDetails projectDetails, String keyPart) {
+
+    UserFilter userFilter =
+        filterRepository.findByIdAndProjectId(launchFilterId, projectDetails.getProjectId())
+            .orElseThrow(() -> new ReportPortalException(ErrorType.USER_FILTER_NOT_FOUND_IN_PROJECT,
+                launchFilterId, projectDetails.getProjectName()
+            ));
+
+    Pair<Queryable, Pageable> queryablePair =
+        DefaultLaunchFilterProvider.createDefaultLaunchQueryablePair(projectDetails, userFilter,
+            launchesLimit
+        );
+    return itemAttributeRepository.findAllKeysByLaunchFilter(queryablePair.getKey(),
+        queryablePair.getValue(), isLatest, keyPart, false
+    );
+  }
+
+  @Override
+  public List<String> getAttributeKeys(Long launchId, String value) {
+    return itemAttributeRepository.findTestItemAttributeKeys(launchId, value, false);
+  }
+
+  @Override
+  public List<String> getAttributeValues(Long launchId, String key, String value) {
+    return itemAttributeRepository.findTestItemAttributeValues(launchId, key, value, false);
+  }
+
+  @Override
+  public List<String> getAttributeKeys(ReportPortalUser.ProjectDetails projectDetails,
+      String launchName, String keyPart) {
+    return itemAttributeRepository.findTestItemKeysByProjectIdAndLaunchName(
+        projectDetails.getProjectId(), launchName, keyPart, false);
+  }
+
+  @Override
+  public List<String> getAttributeValues(ReportPortalUser.ProjectDetails projectDetails,
+      String launchName, String key, String valuePart) {
+    return itemAttributeRepository.findTestItemValuesByProjectIdAndLaunchName(
+        projectDetails.getProjectId(), launchName, key, valuePart, false);
+  }
+
+  @Override
+  public List<TestItemResource> getTestItems(Long[] ids,
+      ReportPortalUser.ProjectDetails projectDetails, ReportPortalUser user) {
+    List<TestItem> items;
+    if (user.getUserRole() != UserRole.ADMINISTRATOR) {
+      items = testItemRepository.findByFilter(getItemsFilter(ids, projectDetails));
+    } else {
+      items = testItemRepository.findAllById(Arrays.asList(ids));
+    }
+    List<ResourceUpdater<TestItemResource>> resourceUpdaters =
+        getResourceUpdaters(projectDetails.getProjectId(), items);
+    return items.stream().map(item -> {
+      TestItemResource testItemResource = TestItemConverter.TO_RESOURCE.apply(item);
+      resourceUpdaters.forEach(updater -> updater.updateResource(testItemResource));
+      return testItemResource;
+    }).collect(toList());
+  }
+
+  private Filter getItemsFilter(Long[] ids, ReportPortalUser.ProjectDetails projectDetails) {
+    final Filter filter = Filter.builder().withTarget(TestItem.class).withCondition(
+            FilterCondition.builder()
+                .eq(CRITERIA_PROJECT_ID, String.valueOf(projectDetails.getProjectId())).build())
+        .withCondition(
+            FilterCondition.builder().withSearchCriteria(CRITERIA_ID).withCondition(Condition.IN)
+                .withValue(
+                    Arrays.stream(ids).map(Object::toString).collect(Collectors.joining(",")))
+                .build()).build();
+    return projectDetails.getProjectRole() != ProjectRole.OPERATOR ? filter : filter.withCondition(
+        FilterCondition.builder().eq(CRITERIA_LAUNCH_MODE, LaunchModeEnum.DEFAULT.name()).build());
+  }
 
 }
diff --git a/src/main/java/com/epam/ta/reportportal/core/item/impl/UpdateTestItemHandlerImpl.java b/src/main/java/com/epam/ta/reportportal/core/item/impl/UpdateTestItemHandlerImpl.java
index e6f0742223..bc5848c94c 100644
--- a/src/main/java/com/epam/ta/reportportal/core/item/impl/UpdateTestItemHandlerImpl.java
+++ b/src/main/java/com/epam/ta/reportportal/core/item/impl/UpdateTestItemHandlerImpl.java
@@ -61,6 +61,13 @@
 import com.epam.ta.reportportal.entity.project.ProjectRole;
 import com.epam.ta.reportportal.entity.user.UserRole;
 import com.epam.ta.reportportal.exception.ReportPortalException;
+import com.epam.ta.reportportal.model.activity.TestItemActivityResource;
+import com.epam.ta.reportportal.model.issue.DefineIssueRQ;
+import com.epam.ta.reportportal.model.issue.IssueDefinition;
+import com.epam.ta.reportportal.model.item.ExternalIssueRQ;
+import com.epam.ta.reportportal.model.item.LinkExternalIssueRQ;
+import com.epam.ta.reportportal.model.item.UnlinkExternalIssueRQ;
+import com.epam.ta.reportportal.model.item.UpdateTestItemRQ;
 import com.epam.ta.reportportal.util.ItemInfoUtils;
 import com.epam.ta.reportportal.ws.converter.builders.IssueEntityBuilder;
 import com.epam.ta.reportportal.ws.converter.builders.TestItemBuilder;
@@ -69,14 +76,7 @@
 import com.epam.ta.reportportal.ws.model.BulkInfoUpdateRQ;
 import com.epam.ta.reportportal.ws.model.ErrorType;
 import com.epam.ta.reportportal.ws.model.OperationCompletionRS;
-import com.epam.ta.reportportal.ws.model.activity.TestItemActivityResource;
-import com.epam.ta.reportportal.ws.model.issue.DefineIssueRQ;
 import com.epam.ta.reportportal.ws.model.issue.Issue;
-import com.epam.ta.reportportal.ws.model.issue.IssueDefinition;
-import com.epam.ta.reportportal.ws.model.item.ExternalIssueRQ;
-import com.epam.ta.reportportal.ws.model.item.LinkExternalIssueRQ;
-import com.epam.ta.reportportal.ws.model.item.UnlinkExternalIssueRQ;
-import com.epam.ta.reportportal.ws.model.item.UpdateTestItemRQ;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
diff --git a/src/main/java/com/epam/ta/reportportal/core/item/impl/history/TestItemsHistoryHandlerImpl.java b/src/main/java/com/epam/ta/reportportal/core/item/impl/history/TestItemsHistoryHandlerImpl.java
index 2540a28565..f84870a0de 100644
--- a/src/main/java/com/epam/ta/reportportal/core/item/impl/history/TestItemsHistoryHandlerImpl.java
+++ b/src/main/java/com/epam/ta/reportportal/core/item/impl/history/TestItemsHistoryHandlerImpl.java
@@ -42,13 +42,13 @@
 import com.epam.ta.reportportal.entity.item.TestItem;
 import com.epam.ta.reportportal.entity.item.history.TestItemHistory;
 import com.epam.ta.reportportal.exception.ReportPortalException;
+import com.epam.ta.reportportal.model.TestItemHistoryElement;
+import com.epam.ta.reportportal.model.TestItemResource;
 import com.epam.ta.reportportal.ws.converter.PagedResourcesAssembler;
 import com.epam.ta.reportportal.ws.converter.converters.TestItemConverter;
 import com.epam.ta.reportportal.ws.converter.utils.ResourceUpdater;
 import com.epam.ta.reportportal.ws.converter.utils.ResourceUpdaterProvider;
 import com.epam.ta.reportportal.ws.converter.utils.item.content.TestItemUpdaterContent;
-import com.epam.ta.reportportal.ws.model.TestItemHistoryElement;
-import com.epam.ta.reportportal.ws.model.TestItemResource;
 import com.google.common.collect.Lists;
 import java.util.List;
 import java.util.Map;
@@ -76,7 +76,8 @@ public class TestItemsHistoryHandlerImpl implements TestItemsHistoryHandler {
 
   private final TestItemRepository testItemRepository;
   private final HistoryProviderFactory historyProviderFactory;
-  private final List<ResourceUpdaterProvider<TestItemUpdaterContent, TestItemResource>> resourceUpdaterProviders;
+  private final List<ResourceUpdaterProvider<TestItemUpdaterContent, TestItemResource>>
+      resourceUpdaterProviders;
 
   @Autowired
   public TestItemsHistoryHandlerImpl(TestItemRepository testItemRepository,
@@ -89,41 +90,33 @@ public TestItemsHistoryHandlerImpl(TestItemRepository testItemRepository,
 
   @Override
   public Iterable<TestItemHistoryElement> getItemsHistory(
-      ReportPortalUser.ProjectDetails projectDetails, Queryable filter,
-      Pageable pageable, HistoryRequestParams historyRequestParams, ReportPortalUser user) {
+      ReportPortalUser.ProjectDetails projectDetails, Queryable filter, Pageable pageable,
+      HistoryRequestParams historyRequestParams, ReportPortalUser user) {
 
     validateHistoryDepth(historyRequestParams.getHistoryDepth());
 
-    CompositeFilter itemHistoryFilter = new CompositeFilter(Operator.AND,
-        filter,
-        Filter.builder()
-            .withTarget(filter.getTarget().getClazz())
-            .withCondition(FilterCondition.builder()
-                .eq(CRITERIA_PROJECT_ID, String.valueOf(projectDetails.getProjectId()))
-                .build())
+    CompositeFilter itemHistoryFilter = new CompositeFilter(Operator.AND, filter,
+        Filter.builder().withTarget(filter.getTarget().getClazz()).withCondition(
+                FilterCondition.builder()
+                    .eq(CRITERIA_PROJECT_ID, String.valueOf(projectDetails.getProjectId())).build())
             .withCondition(
                 FilterCondition.builder().eq(CRITERIA_LAUNCH_MODE, LaunchModeEnum.DEFAULT.name())
-                    .build())
-            .withCondition(
-                FilterCondition.builder().eq(CRITERIA_HAS_STATS, String.valueOf(Boolean.TRUE))
-                    .build())
+                    .build()).withCondition(
+                FilterCondition.builder().eq(CRITERIA_HAS_STATS, String.valueOf(Boolean.TRUE)).build())
             .build()
     );
 
-    Page<TestItemHistory> testItemHistoryPage = historyProviderFactory.getProvider(
-            historyRequestParams)
-        .orElseThrow(() -> new ReportPortalException(UNABLE_LOAD_TEST_ITEM_HISTORY,
-            "Unable to find suitable history baseline provider"
-        ))
-        .provide(itemHistoryFilter, pageable, historyRequestParams, projectDetails, user,
-            !oldHistory);
-
-    return buildHistoryElements(
-        oldHistory ? TestItemResource::getUniqueId
-            : testItemResource -> String.valueOf(testItemResource.getTestCaseHash()),
-        testItemHistoryPage,
-        projectDetails.getProjectId(),
-        pageable
+    Page<TestItemHistory> testItemHistoryPage =
+        historyProviderFactory.getProvider(historyRequestParams).orElseThrow(
+            () -> new ReportPortalException(UNABLE_LOAD_TEST_ITEM_HISTORY,
+                "Unable to find suitable history baseline provider"
+            )).provide(itemHistoryFilter, pageable, historyRequestParams, projectDetails, user,
+            !oldHistory
+        );
+
+    return buildHistoryElements(oldHistory ? TestItemResource::getUniqueId :
+            testItemResource -> String.valueOf(testItemResource.getTestCaseHash()), testItemHistoryPage,
+        projectDetails.getProjectId(), pageable
     );
 
   }
@@ -132,11 +125,9 @@ private void validateHistoryDepth(int historyDepth) {
     Predicate<Integer> greaterThan = t -> t > MIN_HISTORY_DEPTH_BOUND;
     Predicate<Integer> lessThan = t -> t < MAX_HISTORY_DEPTH_BOUND;
     String historyDepthMessage = Suppliers.formattedSupplier(
-            "Items history depth should be greater than '{}' and lower than '{}'",
-            MIN_HISTORY_DEPTH_BOUND,
-            MAX_HISTORY_DEPTH_BOUND
-        )
-        .get();
+        "Items history depth should be greater than '{}' and lower than '{}'",
+        MIN_HISTORY_DEPTH_BOUND, MAX_HISTORY_DEPTH_BOUND
+    ).get();
     BusinessRule.expect(historyDepth, greaterThan.and(lessThan))
         .verify(UNABLE_LOAD_TEST_ITEM_HISTORY, historyDepthMessage);
   }
@@ -145,13 +136,12 @@ private Iterable<TestItemHistoryElement> buildHistoryElements(
       Function<TestItemResource, String> groupingFunction,
       Page<TestItemHistory> testItemHistoryPage, Long projectId, Pageable pageable) {
 
-    List<TestItem> testItems = testItemRepository.findAllById(testItemHistoryPage.getContent()
-        .stream()
-        .flatMap(history -> history.getItemIds().stream())
-        .collect(toList()));
+    List<TestItem> testItems = testItemRepository.findAllById(
+        testItemHistoryPage.getContent().stream().flatMap(history -> history.getItemIds().stream())
+            .collect(toList()));
 
-    List<ResourceUpdater<TestItemResource>> resourceUpdaters = getResourceUpdaters(projectId,
-        testItems);
+    List<ResourceUpdater<TestItemResource>> resourceUpdaters =
+        getResourceUpdaters(projectId, testItems);
 
     Map<String, Map<Long, TestItemResource>> itemsMapping = testItems.stream().map(item -> {
       TestItemResource testItemResource = TestItemConverter.TO_RESOURCE.apply(item);
@@ -159,25 +149,19 @@ private Iterable<TestItemHistoryElement> buildHistoryElements(
       return testItemResource;
     }).collect(groupingBy(groupingFunction, toMap(TestItemResource::getItemId, res -> res)));
 
-    List<TestItemHistoryElement> testItemHistoryElements = testItemHistoryPage.getContent()
-        .stream()
+    List<TestItemHistoryElement> testItemHistoryElements = testItemHistoryPage.getContent().stream()
         .map(history -> ofNullable(itemsMapping.get(history.getGroupingField())).map(mapping -> {
           TestItemHistoryElement historyResource = new TestItemHistoryElement();
           historyResource.setGroupingField(history.getGroupingField());
           List<TestItemResource> resources = Lists.newArrayList();
-          ofNullable(history.getItemIds()).ifPresent(
-              itemIds -> itemIds.forEach(itemId -> ofNullable(mapping.get(itemId)).ifPresent(
-                  resources::add)));
+          ofNullable(history.getItemIds()).ifPresent(itemIds -> itemIds.forEach(
+              itemId -> ofNullable(mapping.get(itemId)).ifPresent(resources::add)));
           historyResource.setResources(resources);
           return historyResource;
-        }))
-        .filter(Optional::isPresent)
-        .map(Optional::get)
-        .collect(toList());
+        })).filter(Optional::isPresent).map(Optional::get).collect(toList());
 
-    return PagedResourcesAssembler.<TestItemHistoryElement>pageConverter()
-        .apply(PageableExecutionUtils.getPage(testItemHistoryElements,
-            pageable,
+    return PagedResourcesAssembler.<TestItemHistoryElement>pageConverter().apply(
+        PageableExecutionUtils.getPage(testItemHistoryElements, pageable,
             testItemHistoryPage::getTotalElements
         ));
 
diff --git a/src/main/java/com/epam/ta/reportportal/core/item/impl/merge/strategy/AbstractLaunchMergeStrategy.java b/src/main/java/com/epam/ta/reportportal/core/item/impl/merge/strategy/AbstractLaunchMergeStrategy.java
index 30c5adb73c..610d56528c 100644
--- a/src/main/java/com/epam/ta/reportportal/core/item/impl/merge/strategy/AbstractLaunchMergeStrategy.java
+++ b/src/main/java/com/epam/ta/reportportal/core/item/impl/merge/strategy/AbstractLaunchMergeStrategy.java
@@ -41,10 +41,10 @@
 import com.epam.ta.reportportal.entity.launch.Launch;
 import com.epam.ta.reportportal.entity.project.Project;
 import com.epam.ta.reportportal.exception.ReportPortalException;
+import com.epam.ta.reportportal.model.launch.MergeLaunchesRQ;
 import com.epam.ta.reportportal.ws.converter.builders.LaunchBuilder;
 import com.epam.ta.reportportal.ws.model.ErrorType;
 import com.epam.ta.reportportal.ws.model.attribute.ItemAttributeResource;
-import com.epam.ta.reportportal.ws.model.launch.MergeLaunchesRQ;
 import com.epam.ta.reportportal.ws.model.launch.Mode;
 import com.epam.ta.reportportal.ws.model.launch.StartLaunchRQ;
 import com.google.common.collect.Sets;
@@ -69,9 +69,8 @@ public abstract class AbstractLaunchMergeStrategy implements LaunchMergeStrategy
   private final TestItemUniqueIdGenerator identifierGenerator;
 
   protected AbstractLaunchMergeStrategy(LaunchRepository launchRepository,
-      TestItemRepository testItemRepository,
-      LogRepository logRepository, AttachmentRepository attachmentRepository,
-      TestItemUniqueIdGenerator identifierGenerator) {
+      TestItemRepository testItemRepository, LogRepository logRepository,
+      AttachmentRepository attachmentRepository, TestItemUniqueIdGenerator identifierGenerator) {
     this.launchRepository = launchRepository;
     this.testItemRepository = testItemRepository;
     this.logRepository = logRepository;
@@ -80,13 +79,13 @@ protected AbstractLaunchMergeStrategy(LaunchRepository launchRepository,
   }
 
   protected Launch createNewLaunch(ReportPortalUser.ProjectDetails projectDetails,
-      ReportPortalUser user, MergeLaunchesRQ rq,
-      List<Launch> launchesList) {
-    Launch newLaunch = createResultedLaunch(projectDetails.getProjectId(), user.getUserId(), rq,
-        launchesList);
+      ReportPortalUser user, MergeLaunchesRQ rq, List<Launch> launchesList) {
+    Launch newLaunch =
+        createResultedLaunch(projectDetails.getProjectId(), user.getUserId(), rq, launchesList);
     boolean isNameChanged = !newLaunch.getName().equals(launchesList.get(0).getName());
     updateChildrenOfLaunches(newLaunch, rq.getLaunches(), rq.isExtendSuitesDescription(),
-        isNameChanged);
+        isNameChanged
+    );
 
     return newLaunch;
   }
@@ -102,38 +101,28 @@ protected Launch createNewLaunch(ReportPortalUser.ProjectDetails projectDetails,
    */
   private Launch createResultedLaunch(Long projectId, Long userId, MergeLaunchesRQ mergeLaunchesRQ,
       List<Launch> launches) {
-    Date startTime = ofNullable(mergeLaunchesRQ.getStartTime()).orElse(
-        EntityUtils.TO_DATE.apply(launches.stream()
-            .min(Comparator.comparing(Launch::getStartTime))
-            .orElseThrow(
+    Date startTime = ofNullable(mergeLaunchesRQ.getStartTime()).orElse(EntityUtils.TO_DATE.apply(
+        launches.stream().min(Comparator.comparing(Launch::getStartTime)).orElseThrow(
                 () -> new ReportPortalException(ErrorType.BAD_REQUEST_ERROR, "Invalid launches"))
             .getStartTime()));
-    Date endTime = ofNullable(mergeLaunchesRQ.getEndTime()).orElse(
-        EntityUtils.TO_DATE.apply(launches.stream()
-            .max(Comparator.comparing(Launch::getEndTime))
-            .orElseThrow(
+    Date endTime = ofNullable(mergeLaunchesRQ.getEndTime()).orElse(EntityUtils.TO_DATE.apply(
+        launches.stream().max(Comparator.comparing(Launch::getEndTime)).orElseThrow(
                 () -> new ReportPortalException(ErrorType.BAD_REQUEST_ERROR, "Invalid launches"))
             .getEndTime()));
     expect(endTime, time -> !time.before(startTime)).verify(FINISH_TIME_EARLIER_THAN_START_TIME,
-        TO_LOCAL_DATE_TIME.apply(endTime),
-        startTime,
-        projectId
+        TO_LOCAL_DATE_TIME.apply(endTime), startTime, projectId
     );
 
     StartLaunchRQ startRQ = new StartLaunchRQ();
     startRQ.setMode(ofNullable(mergeLaunchesRQ.getMode()).orElse(Mode.DEFAULT));
-    startRQ.setDescription(ofNullable(mergeLaunchesRQ.getDescription()).orElse(launches.stream()
-        .map(Launch::getDescription)
-        .collect(joining("\n\n"))));
+    startRQ.setDescription(ofNullable(mergeLaunchesRQ.getDescription()).orElse(
+        launches.stream().map(Launch::getDescription).collect(joining("\n\n"))));
     startRQ.setName(ofNullable(mergeLaunchesRQ.getName()).orElse(
         "Merged: " + launches.stream().map(Launch::getName).distinct().collect(joining(", "))));
     startRQ.setStartTime(startTime);
-    Launch launch = new LaunchBuilder().addStartRQ(startRQ)
-        .addProject(projectId)
-        .addStatus(IN_PROGRESS.name())
-        .addUserId(userId)
-        .addEndTime(endTime)
-        .get();
+    Launch launch =
+        new LaunchBuilder().addStartRQ(startRQ).addProject(projectId).addStatus(IN_PROGRESS.name())
+            .addUserId(userId).addEndTime(endTime).get();
     launch.setHasRetries(launches.stream().anyMatch(Launch::isHasRetries));
 
     launchRepository.save(launch);
@@ -157,22 +146,17 @@ private void mergeAttributes(Set<ItemAttributeResource> attributesFromRq,
     Set<ItemAttribute> mergedAttributes = Sets.newHashSet();
 
     if (attributesFromRq == null) {
-      mergedAttributes.addAll(launchesToMerge.stream()
-          .map(Launch::getAttributes)
-          .flatMap(Collection::stream)
-          .peek(it -> it.setLaunch(resultedLaunch))
-          .collect(Collectors.toSet()));
+      mergedAttributes.addAll(
+          launchesToMerge.stream().map(Launch::getAttributes).flatMap(Collection::stream)
+              .peek(it -> it.setLaunch(resultedLaunch)).collect(Collectors.toSet()));
     } else {
-      mergedAttributes.addAll(launchesToMerge.stream()
-          .map(Launch::getAttributes)
-          .flatMap(Collection::stream)
-          .filter(ItemAttribute::isSystem)
-          .peek(it -> it.setLaunch(resultedLaunch))
-          .collect(Collectors.toSet()));
-      mergedAttributes.addAll(attributesFromRq.stream()
-          .map(FROM_RESOURCE)
-          .peek(attr -> attr.setLaunch(resultedLaunch))
-          .collect(Collectors.toSet()));
+      mergedAttributes.addAll(
+          launchesToMerge.stream().map(Launch::getAttributes).flatMap(Collection::stream)
+              .filter(ItemAttribute::isSystem).peek(it -> it.setLaunch(resultedLaunch))
+              .collect(Collectors.toSet()));
+      mergedAttributes.addAll(
+          attributesFromRq.stream().map(FROM_RESOURCE).peek(attr -> attr.setLaunch(resultedLaunch))
+              .collect(Collectors.toSet()));
     }
     resultedLaunch.setAttributes(mergedAttributes);
   }
@@ -190,7 +174,8 @@ private void updateChildrenOfLaunches(Launch newLaunch, Set<Long> launches,
     List<TestItem> testItems = launches.stream().peek(id -> {
       logRepository.updateLaunchIdByLaunchId(id, newLaunch.getId());
       attachmentRepository.updateLaunchIdByProjectIdAndLaunchId(newLaunch.getProjectId(), id,
-          newLaunch.getId());
+          newLaunch.getId()
+      );
     }).flatMap(id -> {
       Launch launch = launchRepository.findById(id)
           .orElseThrow(() -> new ReportPortalException(ErrorType.LAUNCH_NOT_FOUND, id));
@@ -199,15 +184,16 @@ private void updateChildrenOfLaunches(Launch newLaunch, Set<Long> launches,
         if (isNameChanged && identifierGenerator.validate(testItem.getUniqueId())) {
           testItem.setUniqueId(
               identifierGenerator.generate(testItem, IdentityUtil.getParentIds(testItem),
-                  newLaunch));
+                  newLaunch
+              ));
         }
         if (testItem.getType().sameLevel(TestItemTypeEnum.SUITE)) {
           // Add launch reference description for top level items
           Supplier<String> newDescription = Suppliers.formattedSupplier(
               ((null != testItem.getDescription()) ? testItem.getDescription() : "") + (
-                  extendDescription ?
-                      "\r\n@launch '{} #{}'" :
-                      ""), launch.getName(), launch.getNumber());
+                  extendDescription ? "\r\n@launch '{} #{}'" : ""), launch.getName(),
+              launch.getNumber()
+          );
           testItem.setDescription(newDescription.get());
         }
       });
diff --git a/src/main/java/com/epam/ta/reportportal/core/item/impl/merge/strategy/BasicLaunchMergeStrategy.java b/src/main/java/com/epam/ta/reportportal/core/item/impl/merge/strategy/BasicLaunchMergeStrategy.java
index c38fb183e2..dd2cb27a35 100644
--- a/src/main/java/com/epam/ta/reportportal/core/item/impl/merge/strategy/BasicLaunchMergeStrategy.java
+++ b/src/main/java/com/epam/ta/reportportal/core/item/impl/merge/strategy/BasicLaunchMergeStrategy.java
@@ -23,7 +23,7 @@
 import com.epam.ta.reportportal.dao.LogRepository;
 import com.epam.ta.reportportal.dao.TestItemRepository;
 import com.epam.ta.reportportal.entity.launch.Launch;
-import com.epam.ta.reportportal.ws.model.launch.MergeLaunchesRQ;
+import com.epam.ta.reportportal.model.launch.MergeLaunchesRQ;
 import java.util.List;
 
 /**
@@ -34,19 +34,18 @@ public class BasicLaunchMergeStrategy extends AbstractLaunchMergeStrategy {
   private final StatisticsCalculationFactory statisticsCalculationFactory;
 
   public BasicLaunchMergeStrategy(LaunchRepository launchRepository,
-      TestItemRepository testItemRepository,
-      LogRepository logRepository, AttachmentRepository attachmentRepository,
-      TestItemUniqueIdGenerator identifierGenerator,
+      TestItemRepository testItemRepository, LogRepository logRepository,
+      AttachmentRepository attachmentRepository, TestItemUniqueIdGenerator identifierGenerator,
       StatisticsCalculationFactory statisticsCalculationFactory) {
     super(launchRepository, testItemRepository, logRepository, attachmentRepository,
-        identifierGenerator);
+        identifierGenerator
+    );
     this.statisticsCalculationFactory = statisticsCalculationFactory;
   }
 
   @Override
   public Launch mergeLaunches(ReportPortalUser.ProjectDetails projectDetails, ReportPortalUser user,
-      MergeLaunchesRQ rq,
-      List<Launch> launchesList) {
+      MergeLaunchesRQ rq, List<Launch> launchesList) {
 
     Launch newLaunch = createNewLaunch(projectDetails, user, rq, launchesList);
 
diff --git a/src/main/java/com/epam/ta/reportportal/core/item/impl/merge/strategy/DeepLaunchMergeStrategy.java b/src/main/java/com/epam/ta/reportportal/core/item/impl/merge/strategy/DeepLaunchMergeStrategy.java
index 5eeb57ecf9..00a488d917 100644
--- a/src/main/java/com/epam/ta/reportportal/core/item/impl/merge/strategy/DeepLaunchMergeStrategy.java
+++ b/src/main/java/com/epam/ta/reportportal/core/item/impl/merge/strategy/DeepLaunchMergeStrategy.java
@@ -23,7 +23,7 @@
 import com.epam.ta.reportportal.dao.LogRepository;
 import com.epam.ta.reportportal.dao.TestItemRepository;
 import com.epam.ta.reportportal.entity.launch.Launch;
-import com.epam.ta.reportportal.ws.model.launch.MergeLaunchesRQ;
+import com.epam.ta.reportportal.model.launch.MergeLaunchesRQ;
 import java.util.List;
 
 /**
@@ -35,13 +35,13 @@ public DeepLaunchMergeStrategy(LaunchRepository launchRepository,
       TestItemRepository testItemRepository, LogRepository logRepository,
       AttachmentRepository attachmentRepository, TestItemUniqueIdGenerator identifierGenerator) {
     super(launchRepository, testItemRepository, logRepository, attachmentRepository,
-        identifierGenerator);
+        identifierGenerator
+    );
   }
 
   @Override
   public Launch mergeLaunches(ReportPortalUser.ProjectDetails projectDetails, ReportPortalUser user,
-      MergeLaunchesRQ rq,
-      List<Launch> launchesList) {
+      MergeLaunchesRQ rq, List<Launch> launchesList) {
 
     Launch newLaunch = createNewLaunch(projectDetails, user, rq, launchesList);
     launchRepository.mergeLaunchTestItems(newLaunch.getId());
diff --git a/src/main/java/com/epam/ta/reportportal/core/item/impl/status/AbstractStatusChangingStrategy.java b/src/main/java/com/epam/ta/reportportal/core/item/impl/status/AbstractStatusChangingStrategy.java
index 0fe5d2600f..989b9076eb 100644
--- a/src/main/java/com/epam/ta/reportportal/core/item/impl/status/AbstractStatusChangingStrategy.java
+++ b/src/main/java/com/epam/ta/reportportal/core/item/impl/status/AbstractStatusChangingStrategy.java
@@ -47,8 +47,8 @@
 import com.epam.ta.reportportal.entity.launch.Launch;
 import com.epam.ta.reportportal.entity.project.Project;
 import com.epam.ta.reportportal.exception.ReportPortalException;
+import com.epam.ta.reportportal.model.activity.TestItemActivityResource;
 import com.epam.ta.reportportal.ws.model.ErrorType;
-import com.epam.ta.reportportal.ws.model.activity.TestItemActivityResource;
 import com.google.common.collect.Lists;
 import java.util.Collections;
 import java.util.List;
diff --git a/src/main/java/com/epam/ta/reportportal/core/item/impl/status/ChangeStatusHandlerImpl.java b/src/main/java/com/epam/ta/reportportal/core/item/impl/status/ChangeStatusHandlerImpl.java
index 9d4eef2b72..02fab7fd4e 100644
--- a/src/main/java/com/epam/ta/reportportal/core/item/impl/status/ChangeStatusHandlerImpl.java
+++ b/src/main/java/com/epam/ta/reportportal/core/item/impl/status/ChangeStatusHandlerImpl.java
@@ -34,7 +34,7 @@
 import com.epam.ta.reportportal.entity.item.issue.IssueEntity;
 import com.epam.ta.reportportal.entity.launch.Launch;
 import com.epam.ta.reportportal.jooq.enums.JStatusEnum;
-import com.epam.ta.reportportal.ws.model.activity.TestItemActivityResource;
+import com.epam.ta.reportportal.model.activity.TestItemActivityResource;
 import com.google.common.collect.Lists;
 import java.util.Map;
 import java.util.Optional;
@@ -55,8 +55,8 @@ public class ChangeStatusHandlerImpl implements ChangeStatusHandler {
 
   @Autowired
   public ChangeStatusHandlerImpl(TestItemRepository testItemRepository,
-      IssueEntityRepository issueEntityRepository,
-      MessageBus messageBus, LaunchRepository launchRepository,
+      IssueEntityRepository issueEntityRepository, MessageBus messageBus,
+      LaunchRepository launchRepository,
       Map<StatusEnum, StatusChangingStrategy> statusChangingStrategyMapping) {
     this.testItemRepository = testItemRepository;
     this.issueEntityRepository = issueEntityRepository;
@@ -77,11 +77,10 @@ public void changeParentStatus(TestItem childItem, Long projectId, ReportPortalU
         if (parent.getItemResults().getStatus() != resolvedStatus) {
           TestItemActivityResource before = TO_ACTIVITY_RESOURCE.apply(parent, projectId);
           changeStatus(parent, resolvedStatus, user);
-          messageBus.publishActivity(new TestItemStatusChangedEvent(before,
-              TO_ACTIVITY_RESOURCE.apply(parent, projectId),
-              user.getUserId(),
-              user.getUsername()
-          ));
+          messageBus.publishActivity(
+              new TestItemStatusChangedEvent(before, TO_ACTIVITY_RESOURCE.apply(parent, projectId),
+                  user.getUserId(), user.getUsername()
+              ));
           changeParentStatus(parent, projectId, user);
         }
 
@@ -94,23 +93,23 @@ private boolean isParentStatusUpdateRequired(TestItem parent) {
         && parent.getItemResults().getStatus() != PASSED
         && parent.getItemResults().getStatus() != FAILED
         && !testItemRepository.hasItemsInStatusByParent(parent.getItemId(), parent.getPath(),
-        StatusEnum.IN_PROGRESS.name());
+        StatusEnum.IN_PROGRESS.name()
+    );
   }
 
   private StatusEnum resolveStatus(Long itemId) {
     return
         testItemRepository.hasDescendantsNotInStatus(itemId, StatusEnum.PASSED.name(), INFO.name(),
-            WARN.name()) ?
-            FAILED :
-            PASSED;
+            WARN.name()
+        ) ? FAILED : PASSED;
   }
 
   private void changeStatus(TestItem parent, StatusEnum resolvedStatus, ReportPortalUser user) {
     if (parent.isHasChildren() || !parent.isHasStats()) {
       parent.getItemResults().setStatus(resolvedStatus);
     } else {
-      Optional<StatusChangingStrategy> statusChangingStrategy = ofNullable(
-          statusChangingStrategyMapping.get(resolvedStatus));
+      Optional<StatusChangingStrategy> statusChangingStrategy =
+          ofNullable(statusChangingStrategyMapping.get(resolvedStatus));
       if (statusChangingStrategy.isPresent()) {
         statusChangingStrategy.get().changeStatus(parent, resolvedStatus, user, false);
       } else {
@@ -124,11 +123,10 @@ private void changeStatus(TestItem parent, StatusEnum resolvedStatus, ReportPort
   public void changeLaunchStatus(Launch launch) {
     if (launch.getStatus() != StatusEnum.IN_PROGRESS) {
       if (!launchRepository.hasItemsInStatuses(launch.getId(),
-          Lists.newArrayList(JStatusEnum.IN_PROGRESS))) {
+          Lists.newArrayList(JStatusEnum.IN_PROGRESS)
+      )) {
         StatusEnum launchStatus = launchRepository.hasRootItemsWithStatusNotEqual(launch.getId(),
-            StatusEnum.PASSED.name(),
-            INFO.name(),
-            WARN.name()
+            StatusEnum.PASSED.name(), INFO.name(), WARN.name()
         ) ? FAILED : PASSED;
         launch.setStatus(launchStatus);
       }
diff --git a/src/main/java/com/epam/ta/reportportal/core/item/merge/LaunchMergeStrategy.java b/src/main/java/com/epam/ta/reportportal/core/item/merge/LaunchMergeStrategy.java
index aa786bbf44..714d02ec2c 100644
--- a/src/main/java/com/epam/ta/reportportal/core/item/merge/LaunchMergeStrategy.java
+++ b/src/main/java/com/epam/ta/reportportal/core/item/merge/LaunchMergeStrategy.java
@@ -18,7 +18,7 @@
 
 import com.epam.ta.reportportal.commons.ReportPortalUser;
 import com.epam.ta.reportportal.entity.launch.Launch;
-import com.epam.ta.reportportal.ws.model.launch.MergeLaunchesRQ;
+import com.epam.ta.reportportal.model.launch.MergeLaunchesRQ;
 import java.util.List;
 
 /**
@@ -27,6 +27,5 @@
 public interface LaunchMergeStrategy {
 
   Launch mergeLaunches(ReportPortalUser.ProjectDetails projectDetails, ReportPortalUser user,
-      MergeLaunchesRQ rq,
-      List<Launch> launchesList);
+      MergeLaunchesRQ rq, List<Launch> launchesList);
 }
diff --git a/src/main/java/com/epam/ta/reportportal/core/launch/DeleteLaunchHandler.java b/src/main/java/com/epam/ta/reportportal/core/launch/DeleteLaunchHandler.java
index 3f65e87a77..6e29be827b 100644
--- a/src/main/java/com/epam/ta/reportportal/core/launch/DeleteLaunchHandler.java
+++ b/src/main/java/com/epam/ta/reportportal/core/launch/DeleteLaunchHandler.java
@@ -17,8 +17,8 @@
 package com.epam.ta.reportportal.core.launch;
 
 import com.epam.ta.reportportal.commons.ReportPortalUser;
-import com.epam.ta.reportportal.ws.model.DeleteBulkRQ;
-import com.epam.ta.reportportal.ws.model.DeleteBulkRS;
+import com.epam.ta.reportportal.model.DeleteBulkRQ;
+import com.epam.ta.reportportal.model.DeleteBulkRS;
 import com.epam.ta.reportportal.ws.model.OperationCompletionRS;
 
 /**
diff --git a/src/main/java/com/epam/ta/reportportal/core/launch/FinishLaunchHandler.java b/src/main/java/com/epam/ta/reportportal/core/launch/FinishLaunchHandler.java
index a7108fb717..5c0b719e05 100644
--- a/src/main/java/com/epam/ta/reportportal/core/launch/FinishLaunchHandler.java
+++ b/src/main/java/com/epam/ta/reportportal/core/launch/FinishLaunchHandler.java
@@ -18,8 +18,8 @@
 
 import com.epam.ta.reportportal.commons.ReportPortalUser;
 import com.epam.ta.reportportal.entity.launch.Launch;
+import com.epam.ta.reportportal.model.launch.FinishLaunchRS;
 import com.epam.ta.reportportal.ws.model.FinishExecutionRQ;
-import com.epam.ta.reportportal.ws.model.launch.FinishLaunchRS;
 
 /**
  * {@link FinishExecutionRQ} request handler
@@ -40,7 +40,6 @@ public interface FinishLaunchHandler {
    * @return FinishLaunchRS
    */
   FinishLaunchRS finishLaunch(String launchId, FinishExecutionRQ finishLaunchRQ,
-      ReportPortalUser.ProjectDetails projectDetails,
-      ReportPortalUser user, String baseUrl);
+      ReportPortalUser.ProjectDetails projectDetails, ReportPortalUser user, String baseUrl);
 
 }
\ No newline at end of file
diff --git a/src/main/java/com/epam/ta/reportportal/core/launch/MergeLaunchHandler.java b/src/main/java/com/epam/ta/reportportal/core/launch/MergeLaunchHandler.java
index c6026baab4..fe895aadae 100644
--- a/src/main/java/com/epam/ta/reportportal/core/launch/MergeLaunchHandler.java
+++ b/src/main/java/com/epam/ta/reportportal/core/launch/MergeLaunchHandler.java
@@ -17,8 +17,8 @@
 package com.epam.ta.reportportal.core.launch;
 
 import com.epam.ta.reportportal.commons.ReportPortalUser;
+import com.epam.ta.reportportal.model.launch.MergeLaunchesRQ;
 import com.epam.ta.reportportal.ws.model.launch.LaunchResource;
-import com.epam.ta.reportportal.ws.model.launch.MergeLaunchesRQ;
 
 /**
  * Merge launches handler in common one
diff --git a/src/main/java/com/epam/ta/reportportal/core/launch/StopLaunchHandler.java b/src/main/java/com/epam/ta/reportportal/core/launch/StopLaunchHandler.java
index 3a85ce26b1..5ed167fda8 100644
--- a/src/main/java/com/epam/ta/reportportal/core/launch/StopLaunchHandler.java
+++ b/src/main/java/com/epam/ta/reportportal/core/launch/StopLaunchHandler.java
@@ -17,7 +17,7 @@
 package com.epam.ta.reportportal.core.launch;
 
 import com.epam.ta.reportportal.commons.ReportPortalUser;
-import com.epam.ta.reportportal.ws.model.BulkRQ;
+import com.epam.ta.reportportal.model.BulkRQ;
 import com.epam.ta.reportportal.ws.model.FinishExecutionRQ;
 import com.epam.ta.reportportal.ws.model.OperationCompletionRS;
 import java.util.List;
@@ -37,8 +37,7 @@ public interface StopLaunchHandler {
    * @return OperationCompletionRS
    */
   OperationCompletionRS stopLaunch(Long launchId, FinishExecutionRQ finishLaunchRQ,
-      ReportPortalUser.ProjectDetails projectDetails,
-      ReportPortalUser user);
+      ReportPortalUser.ProjectDetails projectDetails, ReportPortalUser user);
 
   /**
    * Bulk stop launches operation.
@@ -49,6 +48,5 @@ OperationCompletionRS stopLaunch(Long launchId, FinishExecutionRQ finishLaunchRQ
    * @return OperationCompletionsRS
    */
   List<OperationCompletionRS> stopLaunch(BulkRQ<Long, FinishExecutionRQ> bulkRQ,
-      ReportPortalUser.ProjectDetails projectDetails,
-      ReportPortalUser user);
+      ReportPortalUser.ProjectDetails projectDetails, ReportPortalUser user);
 }
diff --git a/src/main/java/com/epam/ta/reportportal/core/launch/UpdateLaunchHandler.java b/src/main/java/com/epam/ta/reportportal/core/launch/UpdateLaunchHandler.java
index 152b24a579..487812963f 100644
--- a/src/main/java/com/epam/ta/reportportal/core/launch/UpdateLaunchHandler.java
+++ b/src/main/java/com/epam/ta/reportportal/core/launch/UpdateLaunchHandler.java
@@ -17,12 +17,12 @@
 package com.epam.ta.reportportal.core.launch;
 
 import com.epam.ta.reportportal.commons.ReportPortalUser;
+import com.epam.ta.reportportal.model.BulkRQ;
+import com.epam.ta.reportportal.model.launch.AnalyzeLaunchRQ;
+import com.epam.ta.reportportal.model.launch.UpdateLaunchRQ;
+import com.epam.ta.reportportal.model.launch.cluster.CreateClustersRQ;
 import com.epam.ta.reportportal.ws.model.BulkInfoUpdateRQ;
-import com.epam.ta.reportportal.ws.model.BulkRQ;
 import com.epam.ta.reportportal.ws.model.OperationCompletionRS;
-import com.epam.ta.reportportal.ws.model.launch.AnalyzeLaunchRQ;
-import com.epam.ta.reportportal.ws.model.launch.UpdateLaunchRQ;
-import com.epam.ta.reportportal.ws.model.launch.cluster.CreateClustersRQ;
 import java.util.List;
 
 /**
diff --git a/src/main/java/com/epam/ta/reportportal/core/launch/cluster/GetClusterHandlerImpl.java b/src/main/java/com/epam/ta/reportportal/core/launch/cluster/GetClusterHandlerImpl.java
index 3bc0b38bc9..c8734e03a9 100644
--- a/src/main/java/com/epam/ta/reportportal/core/launch/cluster/GetClusterHandlerImpl.java
+++ b/src/main/java/com/epam/ta/reportportal/core/launch/cluster/GetClusterHandlerImpl.java
@@ -61,8 +61,8 @@ public Cluster getById(Long id) {
   public Iterable<ClusterInfoResource> getResources(Launch launch, Pageable pageable) {
 
     final Pageable pageableWithSort = applySort(pageable);
-    final Page<Cluster> clusters = clusterRepository.findAllByLaunchId(launch.getId(),
-        pageableWithSort);
+    final Page<Cluster> clusters =
+        clusterRepository.findAllByLaunchId(launch.getId(), pageableWithSort);
 
     return getClusterResources(clusters, launch.getId());
   }
@@ -73,8 +73,8 @@ private Pageable applySort(Pageable pageable) {
   }
 
   private Iterable<ClusterInfoResource> getClusterResources(Page<Cluster> clusters, Long launchId) {
-    final com.epam.ta.reportportal.ws.model.Page<ClusterInfoResource> clustersPage = PagedResourcesAssembler.pageConverter(
-        TO_CLUSTER_INFO).apply(clusters);
+    final com.epam.ta.reportportal.model.Page<ClusterInfoResource> clustersPage =
+        PagedResourcesAssembler.pageConverter(TO_CLUSTER_INFO).apply(clusters);
     eventPublisher.publishEvent(new GetClusterResourcesEvent(clustersPage.getContent(), launchId));
     return clustersPage;
   }
diff --git a/src/main/java/com/epam/ta/reportportal/core/launch/cluster/UniqueErrorAnalysisStarter.java b/src/main/java/com/epam/ta/reportportal/core/launch/cluster/UniqueErrorAnalysisStarter.java
index b5726506d9..2546a02289 100644
--- a/src/main/java/com/epam/ta/reportportal/core/launch/cluster/UniqueErrorAnalysisStarter.java
+++ b/src/main/java/com/epam/ta/reportportal/core/launch/cluster/UniqueErrorAnalysisStarter.java
@@ -21,8 +21,8 @@
 
 import com.epam.ta.reportportal.core.launch.cluster.config.ClusterEntityContext;
 import com.epam.ta.reportportal.core.launch.cluster.config.GenerateClustersConfig;
+import com.epam.ta.reportportal.model.project.UniqueErrorConfig;
 import com.epam.ta.reportportal.ws.model.project.AnalyzerConfig;
-import com.epam.ta.reportportal.ws.model.project.UniqueErrorConfig;
 import java.util.Map;
 import org.apache.commons.collections4.CollectionUtils;
 
diff --git a/src/main/java/com/epam/ta/reportportal/core/launch/impl/DeleteLaunchHandlerImpl.java b/src/main/java/com/epam/ta/reportportal/core/launch/impl/DeleteLaunchHandlerImpl.java
index a1509b40f9..f0408037a0 100644
--- a/src/main/java/com/epam/ta/reportportal/core/launch/impl/DeleteLaunchHandlerImpl.java
+++ b/src/main/java/com/epam/ta/reportportal/core/launch/impl/DeleteLaunchHandlerImpl.java
@@ -41,12 +41,12 @@
 import com.epam.ta.reportportal.entity.launch.Launch;
 import com.epam.ta.reportportal.entity.user.UserRole;
 import com.epam.ta.reportportal.exception.ReportPortalException;
-import com.epam.ta.reportportal.ws.model.DeleteBulkRQ;
-import com.epam.ta.reportportal.ws.model.DeleteBulkRS;
+import com.epam.ta.reportportal.model.DeleteBulkRQ;
+import com.epam.ta.reportportal.model.DeleteBulkRS;
+import com.epam.ta.reportportal.model.activity.LaunchActivityResource;
 import com.epam.ta.reportportal.ws.model.ErrorRS;
 import com.epam.ta.reportportal.ws.model.ErrorType;
 import com.epam.ta.reportportal.ws.model.OperationCompletionRS;
-import com.epam.ta.reportportal.ws.model.activity.LaunchActivityResource;
 import com.google.api.client.util.Maps;
 import com.google.common.collect.Lists;
 import java.util.List;
@@ -87,9 +87,8 @@ public class DeleteLaunchHandlerImpl implements DeleteLaunchHandler {
 
   @Autowired
   public DeleteLaunchHandlerImpl(ContentRemover<Launch> launchContentRemover,
-      LaunchRepository launchRepository, MessageBus messageBus,
-      LogIndexer logIndexer, AttachmentRepository attachmentRepository,
-      ApplicationEventPublisher eventPublisher,
+      LaunchRepository launchRepository, MessageBus messageBus, LogIndexer logIndexer,
+      AttachmentRepository attachmentRepository, ApplicationEventPublisher eventPublisher,
       ElementsCounterService elementsCounterService, LogService logService) {
     this.launchContentRemover = launchContentRemover;
     this.launchRepository = launchRepository;
@@ -106,8 +105,8 @@ public OperationCompletionRS deleteLaunch(Long launchId,
     Launch launch = launchRepository.findById(launchId)
         .orElseThrow(() -> new ReportPortalException(ErrorType.LAUNCH_NOT_FOUND, launchId));
     validate(launch, user, projectDetails);
-    final Long numberOfLaunchElements = elementsCounterService.countNumberOfLaunchElements(
-        launchId);
+    final Long numberOfLaunchElements =
+        elementsCounterService.countNumberOfLaunchElements(launchId);
 
     logIndexer.indexLaunchesRemove(projectDetails.getProjectId(), Lists.newArrayList(launchId));
     launchContentRemover.remove(launch);
@@ -117,7 +116,8 @@ public OperationCompletionRS deleteLaunch(Long launchId,
 
     messageBus.publishActivity(
         new LaunchDeletedEvent(TO_ACTIVITY_RESOURCE.apply(launch), user.getUserId(),
-            user.getUsername()));
+            user.getUsername()
+        ));
     eventPublisher.publishEvent(
         new ElementsDeletedEvent(launchId, launch.getProjectId(), numberOfLaunchElements));
     return new OperationCompletionRS("Launch with ID = '" + launchId + "' successfully deleted.");
@@ -136,8 +136,8 @@ public DeleteBulkRS deleteLaunches(DeleteBulkRQ deleteBulkRQ,
         Launch launch = optionalLaunch.get();
         try {
           validate(launch, user, projectDetails);
-          Long numberOfLaunchElements = elementsCounterService.countNumberOfLaunchElements(
-              launch.getId());
+          Long numberOfLaunchElements =
+              elementsCounterService.countNumberOfLaunchElements(launch.getId());
           toDelete.put(launch, numberOfLaunchElements);
           launchIds.add(id);
         } catch (ReportPortalException ex) {
@@ -162,7 +162,8 @@ public DeleteBulkRS deleteLaunches(DeleteBulkRQ deleteBulkRQ,
           new LaunchDeletedEvent(launchActivity, user.getUserId(), user.getUsername()));
       eventPublisher.publishEvent(
           new ElementsDeletedEvent(entry.getKey().getId(), entry.getKey().getProjectId(),
-              entry.getValue()));
+              entry.getValue()
+          ));
     });
 
     return new DeleteBulkRS(launchIds, notFound, exceptions.stream().map(ex -> {
@@ -190,12 +191,14 @@ private void validate(Launch launch, ReportPortalUser user,
       expect(launch.getProjectId(), equalTo(projectDetails.getProjectId())).verify(
           FORBIDDEN_OPERATION,
           formattedSupplier("Target launch '{}' not under specified project '{}'", launch.getId(),
-              projectDetails.getProjectId())
+              projectDetails.getProjectId()
+          )
       );
       /* Only PROJECT_MANAGER roles could delete launches */
       if (projectDetails.getProjectRole().lowerThan(PROJECT_MANAGER)) {
         expect(user.getUserId(), Predicate.isEqual(launch.getUserId())).verify(ACCESS_DENIED,
-            "You are not launch owner.");
+            "You are not launch owner."
+        );
       }
     }
   }
diff --git a/src/main/java/com/epam/ta/reportportal/core/launch/impl/FinishLaunchHandlerAsyncImpl.java b/src/main/java/com/epam/ta/reportportal/core/launch/impl/FinishLaunchHandlerAsyncImpl.java
index 04221771f3..0460ef054b 100644
--- a/src/main/java/com/epam/ta/reportportal/core/launch/impl/FinishLaunchHandlerAsyncImpl.java
+++ b/src/main/java/com/epam/ta/reportportal/core/launch/impl/FinishLaunchHandlerAsyncImpl.java
@@ -20,9 +20,9 @@
 
 import com.epam.ta.reportportal.commons.ReportPortalUser;
 import com.epam.ta.reportportal.core.launch.FinishLaunchHandler;
+import com.epam.ta.reportportal.model.launch.FinishLaunchRS;
 import com.epam.ta.reportportal.util.ReportingQueueService;
 import com.epam.ta.reportportal.ws.model.FinishExecutionRQ;
-import com.epam.ta.reportportal.ws.model.launch.FinishLaunchRS;
 import com.epam.ta.reportportal.ws.rabbit.MessageHeaders;
 import com.epam.ta.reportportal.ws.rabbit.RequestType;
 import java.util.Map;
@@ -47,8 +47,7 @@ public class FinishLaunchHandlerAsyncImpl implements FinishLaunchHandler {
 
   @Override
   public FinishLaunchRS finishLaunch(String launchId, FinishExecutionRQ request,
-      ReportPortalUser.ProjectDetails projectDetails,
-      ReportPortalUser user, String baseUrl) {
+      ReportPortalUser.ProjectDetails projectDetails, ReportPortalUser user, String baseUrl) {
 
     // todo: may be problem - no access to repository, so no possibility to validateRoles() here
     amqpTemplate.convertAndSend(EXCHANGE_REPORTING,
@@ -60,7 +59,8 @@ public FinishLaunchRS finishLaunch(String launchId, FinishExecutionRQ request,
           headers.put(MessageHeaders.LAUNCH_ID, launchId);
           headers.put(MessageHeaders.BASE_URL, baseUrl);
           return message;
-        });
+        }
+    );
 
     FinishLaunchRS response = new FinishLaunchRS();
     response.setId(launchId);
diff --git a/src/main/java/com/epam/ta/reportportal/core/launch/impl/FinishLaunchHandlerImpl.java b/src/main/java/com/epam/ta/reportportal/core/launch/impl/FinishLaunchHandlerImpl.java
index 4e1d71a82a..be6d10999f 100644
--- a/src/main/java/com/epam/ta/reportportal/core/launch/impl/FinishLaunchHandlerImpl.java
+++ b/src/main/java/com/epam/ta/reportportal/core/launch/impl/FinishLaunchHandlerImpl.java
@@ -32,9 +32,9 @@
 import com.epam.ta.reportportal.entity.enums.StatusEnum;
 import com.epam.ta.reportportal.entity.launch.Launch;
 import com.epam.ta.reportportal.exception.ReportPortalException;
+import com.epam.ta.reportportal.model.launch.FinishLaunchRS;
 import com.epam.ta.reportportal.ws.converter.builders.LaunchBuilder;
 import com.epam.ta.reportportal.ws.model.FinishExecutionRQ;
-import com.epam.ta.reportportal.ws.model.launch.FinishLaunchRS;
 import java.util.Optional;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
@@ -59,7 +59,8 @@ public class FinishLaunchHandlerImpl implements FinishLaunchHandler {
 
   @Autowired
   public FinishLaunchHandlerImpl(LaunchRepository launchRepository,
-      @Qualifier("finishLaunchHierarchyHandler") FinishHierarchyHandler<Launch> finishHierarchyHandler,
+      @Qualifier("finishLaunchHierarchyHandler")
+      FinishHierarchyHandler<Launch> finishHierarchyHandler,
       ApplicationEventPublisher eventPublisher) {
     this.launchRepository = launchRepository;
     this.finishHierarchyHandler = finishHierarchyHandler;
@@ -68,8 +69,7 @@ public FinishLaunchHandlerImpl(LaunchRepository launchRepository,
 
   @Override
   public FinishLaunchRS finishLaunch(String launchId, FinishExecutionRQ finishLaunchRQ,
-      ReportPortalUser.ProjectDetails projectDetails,
-      ReportPortalUser user, String baseUrl) {
+      ReportPortalUser.ProjectDetails projectDetails, ReportPortalUser user, String baseUrl) {
     Launch launch = launchRepository.findByUuid(launchId)
         .orElseThrow(() -> new ReportPortalException(LAUNCH_NOT_FOUND, launchId));
 
@@ -80,30 +80,24 @@ public FinishLaunchRS finishLaunch(String launchId, FinishExecutionRQ finishLaun
 
     Long id = launch.getId();
 
-    final int finishedCount = finishHierarchyHandler.finishDescendants(launch,
-        status.orElse(StatusEnum.INTERRUPTED),
-        finishLaunchRQ.getEndTime(),
-        user,
-        projectDetails
-    );
+    final int finishedCount =
+        finishHierarchyHandler.finishDescendants(launch, status.orElse(StatusEnum.INTERRUPTED),
+            finishLaunchRQ.getEndTime(), user, projectDetails
+        );
     if (finishedCount > 0) {
-      launch.setStatus(launchRepository.hasRootItemsWithStatusNotEqual(id,
-          StatusEnum.PASSED.name(),
-          StatusEnum.INFO.name(),
-          StatusEnum.WARN.name()
+      launch.setStatus(launchRepository.hasRootItemsWithStatusNotEqual(id, StatusEnum.PASSED.name(),
+          StatusEnum.INFO.name(), StatusEnum.WARN.name()
       ) ? FAILED : PASSED);
     } else {
-      launch.setStatus(status.orElseGet(() -> launchRepository.hasRootItemsWithStatusNotEqual(id,
-          StatusEnum.PASSED.name(),
-          StatusEnum.INFO.name(),
-          StatusEnum.WARN.name()
-      ) ? FAILED : PASSED));
+      launch.setStatus(status.orElseGet(() ->
+          launchRepository.hasRootItemsWithStatusNotEqual(id, StatusEnum.PASSED.name(),
+              StatusEnum.INFO.name(), StatusEnum.WARN.name()
+          ) ? FAILED : PASSED));
     }
 
     launch = new LaunchBuilder(launch).addDescription(
             buildDescription(launch.getDescription(), finishLaunchRQ.getDescription()))
-        .addAttributes(finishLaunchRQ.getAttributes())
-        .addEndTime(finishLaunchRQ.getEndTime())
+        .addAttributes(finishLaunchRQ.getAttributes()).addEndTime(finishLaunchRQ.getEndTime())
         .get();
 
     eventPublisher.publishEvent(
@@ -114,14 +108,15 @@ public FinishLaunchRS finishLaunch(String launchId, FinishExecutionRQ finishLaun
     response.setId(launch.getUuid());
     response.setNumber(launch.getNumber());
     response.setLink(generateLaunchLink(baseUrl, projectDetails.getProjectName(),
-        String.valueOf(launch.getId())));
+        String.valueOf(launch.getId())
+    ));
     return response;
   }
 
   private String buildDescription(String existDescription, String fromRequestDescription) {
     if (null != existDescription) {
-      return null != fromRequestDescription ? existDescription + " " + fromRequestDescription
-          : existDescription;
+      return null != fromRequestDescription ? existDescription + " " + fromRequestDescription :
+          existDescription;
     } else {
       return null;
     }
diff --git a/src/main/java/com/epam/ta/reportportal/core/launch/impl/GetLaunchHandlerImpl.java b/src/main/java/com/epam/ta/reportportal/core/launch/impl/GetLaunchHandlerImpl.java
index 28d2093850..666232300e 100644
--- a/src/main/java/com/epam/ta/reportportal/core/launch/impl/GetLaunchHandlerImpl.java
+++ b/src/main/java/com/epam/ta/reportportal/core/launch/impl/GetLaunchHandlerImpl.java
@@ -41,7 +41,6 @@
 import static com.epam.ta.reportportal.ws.model.ErrorType.INCORRECT_FILTER_PARAMETERS;
 import static com.epam.ta.reportportal.ws.model.ErrorType.LAUNCH_NOT_FOUND;
 import static com.epam.ta.reportportal.ws.model.ValidationConstraints.MAX_LAUNCH_NAME_LENGTH;
-import static com.epam.ta.reportportal.ws.model.ValidationConstraints.MIN_LAUNCH_NAME_LENGTH;
 import static com.epam.ta.reportportal.ws.model.launch.Mode.DEBUG;
 import static com.epam.ta.reportportal.ws.model.launch.Mode.DEFAULT;
 import static java.util.Collections.singletonMap;
@@ -126,14 +125,12 @@ public class GetLaunchHandlerImpl implements GetLaunchHandler {
 
   @Autowired
   public GetLaunchHandlerImpl(GetClusterHandler getClusterHandler,
-      LaunchRepository launchRepository,
-      TestItemRepository testItemRepository, ItemAttributeRepository itemAttributeRepository,
-      ProjectRepository projectRepository,
+      LaunchRepository launchRepository, TestItemRepository testItemRepository,
+      ItemAttributeRepository itemAttributeRepository, ProjectRepository projectRepository,
       WidgetContentRepository widgetContentRepository, UserRepository userRepository,
       JasperDataProvider dataProvider,
       @Qualifier("launchJasperReportHandler") GetJasperReportHandler<Launch> jasperReportHandler,
-      LaunchConverter launchConverter,
-      ApplicationEventPublisher applicationEventPublisher) {
+      LaunchConverter launchConverter, ApplicationEventPublisher applicationEventPublisher) {
     this.getClusterHandler = getClusterHandler;
     this.launchRepository = launchRepository;
     this.testItemRepository = testItemRepository;
@@ -177,8 +174,8 @@ public LaunchResource getLaunchByProjectName(String projectName, Pageable pageab
     Project project = projectRepository.findByName(projectName)
         .orElseThrow(() -> new ReportPortalException(ErrorType.PROJECT_NOT_FOUND, projectName));
 
-    Page<Launch> launches = launchRepository.findByFilter(ProjectFilter.of(filter, project.getId()),
-        pageable);
+    Page<Launch> launches =
+        launchRepository.findByFilter(ProjectFilter.of(filter, project.getId()), pageable);
     expect(launches, notNull()).verify(LAUNCH_NOT_FOUND);
     return getLaunchResource(launches.iterator().next());
   }
@@ -192,16 +189,16 @@ private LaunchResource getLaunchResource(Launch launch) {
 
   @Override
   public Iterable<LaunchResource> getProjectLaunches(ReportPortalUser.ProjectDetails projectDetails,
-      Filter filter, Pageable pageable,
-      String userName) {
+      Filter filter, Pageable pageable, String userName) {
     validateModeConditions(filter);
-    Project project = projectRepository.findById(projectDetails.getProjectId())
-        .orElseThrow(() -> new ReportPortalException(ErrorType.PROJECT_NOT_FOUND,
-            projectDetails.getProjectId()));
+    Project project = projectRepository.findById(projectDetails.getProjectId()).orElseThrow(
+        () -> new ReportPortalException(ErrorType.PROJECT_NOT_FOUND,
+            projectDetails.getProjectId()
+        ));
 
     filter = addLaunchCommonCriteria(DEFAULT, filter);
-    Page<Launch> launches = launchRepository.findByFilter(ProjectFilter.of(filter, project.getId()),
-        pageable);
+    Page<Launch> launches =
+        launchRepository.findByFilter(ProjectFilter.of(filter, project.getId()), pageable);
     return getLaunchResources(launches);
   }
 
@@ -214,8 +211,10 @@ public Iterable<LaunchResource> getDebugLaunches(ReportPortalUser.ProjectDetails
       Filter filter, Pageable pageable) {
     validateModeConditions(filter);
     filter = addLaunchCommonCriteria(DEBUG, filter);
-    Page<Launch> launches = launchRepository.findByFilter(
-        ProjectFilter.of(filter, projectDetails.getProjectId()), pageable);
+    Page<Launch> launches =
+        launchRepository.findByFilter(ProjectFilter.of(filter, projectDetails.getProjectId()),
+            pageable
+        );
     return getLaunchResources(launches);
   }
 
@@ -223,14 +222,16 @@ public Iterable<LaunchResource> getDebugLaunches(ReportPortalUser.ProjectDetails
   public List<String> getAttributeKeys(ReportPortalUser.ProjectDetails projectDetails,
       String value) {
     return itemAttributeRepository.findLaunchAttributeKeys(projectDetails.getProjectId(), value,
-        false);
+        false
+    );
   }
 
   @Override
   public List<String> getAttributeValues(ReportPortalUser.ProjectDetails projectDetails, String key,
       String value) {
     return itemAttributeRepository.findLaunchAttributeValues(projectDetails.getProjectId(), key,
-        value, false);
+        value, false
+    );
   }
 
   @Override
@@ -239,14 +240,15 @@ public Iterable<LaunchResource> getLatestLaunches(ReportPortalUser.ProjectDetail
 
     validateModeConditions(filter);
 
-    Project project = projectRepository.findById(projectDetails.getProjectId())
-        .orElseThrow(() -> new ReportPortalException(ErrorType.PROJECT_NOT_FOUND,
-            projectDetails.getProjectId()));
+    Project project = projectRepository.findById(projectDetails.getProjectId()).orElseThrow(
+        () -> new ReportPortalException(ErrorType.PROJECT_NOT_FOUND,
+            projectDetails.getProjectId()
+        ));
 
     filter = addLaunchCommonCriteria(DEFAULT, filter);
 
-    Page<Launch> launches = launchRepository.findAllLatestByFilter(
-        ProjectFilter.of(filter, project.getId()), pageable);
+    Page<Launch> launches =
+        launchRepository.findAllLatestByFilter(ProjectFilter.of(filter, project.getId()), pageable);
     return getLaunchResources(launches);
   }
 
@@ -264,8 +266,8 @@ public boolean hasItemsWithIssues(Launch launch) {
   }
 
   private Iterable<LaunchResource> getLaunchResources(Page<Launch> launches) {
-    final com.epam.ta.reportportal.ws.model.Page<LaunchResource> launchResourcePage = PagedResourcesAssembler.pageConverter(
-        launchConverter.TO_RESOURCE).apply(launches);
+    final com.epam.ta.reportportal.model.Page<LaunchResource> launchResourcePage =
+        PagedResourcesAssembler.pageConverter(launchConverter.TO_RESOURCE).apply(launches);
     applicationEventPublisher.publishEvent(
         new GetLaunchResourceCollectionEvent(launchResourcePage.getContent()));
     return launchResourcePage;
@@ -275,15 +277,12 @@ private Iterable<LaunchResource> getLaunchResources(Page<Launch> launches) {
   public List<String> getLaunchNames(ReportPortalUser.ProjectDetails projectDetails, String value) {
     expect(value.length() <= MAX_LAUNCH_NAME_LENGTH, equalTo(true)).verify(
         INCORRECT_FILTER_PARAMETERS,
-        formattedSupplier("Length of the launch name string '{}' more than {} symbols",
-            value,
+        formattedSupplier("Length of the launch name string '{}' more than {} symbols", value,
             MAX_LAUNCH_NAME_LENGTH
         )
     );
     return launchRepository.getLaunchNamesByModeExcludedByStatus(projectDetails.getProjectId(),
-        value,
-        LaunchModeEnum.DEFAULT,
-        StatusEnum.IN_PROGRESS
+        value, LaunchModeEnum.DEFAULT, StatusEnum.IN_PROGRESS
     );
   }
 
@@ -294,8 +293,8 @@ public List<String> getOwners(ReportPortalUser.ProjectDetails projectDetails, St
         formattedSupplier("Length of the filtering string '{}' is less than 3 symbols", value)
     );
 
-    LaunchModeEnum launchMode = LaunchModeEnum.findByName(mode)
-        .orElseThrow(() -> new ReportPortalException(ErrorType.INCORRECT_FILTER_PARAMETERS,
+    LaunchModeEnum launchMode = LaunchModeEnum.findByName(mode).orElseThrow(
+        () -> new ReportPortalException(ErrorType.INCORRECT_FILTER_PARAMETERS,
             formattedSupplier("Mode - {} doesn't exist.", mode)
         ));
 
@@ -306,34 +305,24 @@ public List<String> getOwners(ReportPortalUser.ProjectDetails projectDetails, St
   public Map<String, List<ChartStatisticsContent>> getLaunchesComparisonInfo(
       ReportPortalUser.ProjectDetails projectDetails, Long[] ids) {
 
-    List<String> contentFields = Lists.newArrayList(DEFECTS_AUTOMATION_BUG_TOTAL,
-        DEFECTS_NO_DEFECT_TOTAL,
-        DEFECTS_PRODUCT_BUG_TOTAL,
-        DEFECTS_SYSTEM_ISSUE_TOTAL,
-        DEFECTS_TO_INVESTIGATE_TOTAL,
-        EXECUTIONS_FAILED,
-        EXECUTIONS_PASSED,
-        EXECUTIONS_SKIPPED
-    );
-
-    Filter filter = Filter.builder()
-        .withTarget(Launch.class)
-        .withCondition(new FilterCondition(Condition.IN,
-            false,
-            Arrays.stream(ids).map(String::valueOf).collect(Collectors.joining(",")),
-            CRITERIA_ID
-        ))
-        .withCondition(
-            new FilterCondition(EQUALS, false, String.valueOf(projectDetails.getProjectId()),
-                CRITERIA_PROJECT_ID))
-        .build();
-
-    List<ChartStatisticsContent> result = widgetContentRepository.launchesComparisonStatistics(
-        filter,
-        contentFields,
-        Sort.unsorted(),
-        ids.length
-    );
+    List<String> contentFields =
+        Lists.newArrayList(DEFECTS_AUTOMATION_BUG_TOTAL, DEFECTS_NO_DEFECT_TOTAL,
+            DEFECTS_PRODUCT_BUG_TOTAL, DEFECTS_SYSTEM_ISSUE_TOTAL, DEFECTS_TO_INVESTIGATE_TOTAL,
+            EXECUTIONS_FAILED, EXECUTIONS_PASSED, EXECUTIONS_SKIPPED
+        );
+
+    Filter filter = Filter.builder().withTarget(Launch.class).withCondition(
+        new FilterCondition(Condition.IN, false,
+            Arrays.stream(ids).map(String::valueOf).collect(Collectors.joining(",")), CRITERIA_ID
+        )).withCondition(
+        new FilterCondition(EQUALS, false, String.valueOf(projectDetails.getProjectId()),
+            CRITERIA_PROJECT_ID
+        )).build();
+
+    List<ChartStatisticsContent> result =
+        widgetContentRepository.launchesComparisonStatistics(filter, contentFields, Sort.unsorted(),
+            ids.length
+        );
 
     return singletonMap(RESULT, result);
 
@@ -356,8 +345,7 @@ public void exportLaunch(Long launchId, ReportFormat reportFormat, OutputStream
             "Launch '{}' has IN_PROGRESS status. Impossible to export such elements.", launchId)
     );
 
-    String userFullName = userRepository.findById(user.getUserId())
-        .map(User::getFullName)
+    String userFullName = userRepository.findById(user.getUserId()).map(User::getFullName)
         .orElseThrow(() -> new ReportPortalException(ErrorType.USER_NOT_FOUND, user.getUserId()));
 
     Map<String, Object> params = jasperReportHandler.convertParams(launch);
@@ -402,11 +390,9 @@ private Filter addLaunchCommonCriteria(Mode mode, Filter filter) {
    * @param filter
    */
   private void validateModeConditions(Filter filter) {
-    expect(filter.getFilterConditions()
-        .stream()
-        .map(ConvertibleCondition::getAllConditions)
-        .flatMap(Collection::stream)
-        .anyMatch(HAS_ANY_MODE), equalTo(false)).verify(INCORRECT_FILTER_PARAMETERS,
+    expect(filter.getFilterConditions().stream().map(ConvertibleCondition::getAllConditions)
+        .flatMap(Collection::stream).anyMatch(HAS_ANY_MODE), equalTo(false)).verify(
+        INCORRECT_FILTER_PARAMETERS,
         "Filters for 'mode' aren't applicable for project's launches."
     );
   }
diff --git a/src/main/java/com/epam/ta/reportportal/core/launch/impl/MergeLaunchHandlerImpl.java b/src/main/java/com/epam/ta/reportportal/core/launch/impl/MergeLaunchHandlerImpl.java
index 6d463d219e..de317400f3 100644
--- a/src/main/java/com/epam/ta/reportportal/core/launch/impl/MergeLaunchHandlerImpl.java
+++ b/src/main/java/com/epam/ta/reportportal/core/launch/impl/MergeLaunchHandlerImpl.java
@@ -46,10 +46,10 @@
 import com.epam.ta.reportportal.entity.project.Project;
 import com.epam.ta.reportportal.entity.project.ProjectRole;
 import com.epam.ta.reportportal.exception.ReportPortalException;
+import com.epam.ta.reportportal.model.launch.MergeLaunchesRQ;
 import com.epam.ta.reportportal.ws.converter.converters.LaunchConverter;
 import com.epam.ta.reportportal.ws.model.ErrorType;
 import com.epam.ta.reportportal.ws.model.launch.LaunchResource;
-import com.epam.ta.reportportal.ws.model.launch.MergeLaunchesRQ;
 import java.util.List;
 import java.util.Set;
 import org.apache.commons.collections.CollectionUtils;
@@ -80,9 +80,8 @@ public class MergeLaunchHandlerImpl implements MergeLaunchHandler {
 
   @Autowired
   public MergeLaunchHandlerImpl(LaunchRepository launchRepository,
-      TestItemRepository testItemRepository,
-      ProjectRepository projectRepository, LaunchMergeFactory launchMergeFactory,
-      LaunchConverter launchConverter,
+      TestItemRepository testItemRepository, ProjectRepository projectRepository,
+      LaunchMergeFactory launchMergeFactory, LaunchConverter launchConverter,
       LaunchPreparerService launchPreparerService, LogIndexer logIndexer) {
     this.launchRepository = launchRepository;
     this.testItemRepository = testItemRepository;
@@ -96,16 +95,13 @@ public MergeLaunchHandlerImpl(LaunchRepository launchRepository,
   @Override
   public LaunchResource mergeLaunches(ReportPortalUser.ProjectDetails projectDetails,
       ReportPortalUser user, MergeLaunchesRQ rq) {
-    Project project = projectRepository.findById(projectDetails.getProjectId())
-        .orElseThrow(
-            () -> new ReportPortalException(PROJECT_NOT_FOUND, projectDetails.getProjectName()));
+    Project project = projectRepository.findById(projectDetails.getProjectId()).orElseThrow(
+        () -> new ReportPortalException(PROJECT_NOT_FOUND, projectDetails.getProjectName()));
 
     Set<Long> launchesIds = rq.getLaunches();
 
     expect(CollectionUtils.isNotEmpty(launchesIds), equalTo(true)).verify(
-        ErrorType.BAD_REQUEST_ERROR,
-        "At least one launch id should be  specified for merging"
-    );
+        ErrorType.BAD_REQUEST_ERROR, "At least one launch id should be  specified for merging");
 
     expect(launchesIds.size() > 0, equalTo(true)).verify(ErrorType.BAD_REQUEST_ERROR,
         "At least 1 launch id should be provided for merging"
@@ -147,9 +143,9 @@ private void validateMergingLaunches(List<Launch> launches, ReportPortalUser use
      * ADMINISTRATOR and PROJECT_MANAGER+ users have permission to merge not-only-own
      * launches
      */
-    boolean isUserValidate = !(user.getUserRole().equals(ADMINISTRATOR)
-        || projectDetails.getProjectRole()
-        .sameOrHigherThan(ProjectRole.PROJECT_MANAGER));
+    boolean isUserValidate =
+        !(user.getUserRole().equals(ADMINISTRATOR) || projectDetails.getProjectRole()
+            .sameOrHigherThan(ProjectRole.PROJECT_MANAGER));
 
     launches.forEach(launch -> {
       expect(launch, notNull()).verify(LAUNCH_NOT_FOUND, launch);
@@ -157,16 +153,16 @@ private void validateMergingLaunches(List<Launch> launches, ReportPortalUser use
       expect(launch.getStatus(), not(Preconditions.statusIn(IN_PROGRESS))).verify(
           LAUNCH_IS_NOT_FINISHED,
           Suppliers.formattedSupplier("Cannot merge launch '{}' with status '{}'", launch.getId(),
-              launch.getStatus())
+              launch.getStatus()
+          )
       );
 
       expect(launch.getProjectId(), equalTo(projectDetails.getProjectId())).verify(
-          FORBIDDEN_OPERATION,
-          "Impossible to merge launches from different projects."
-      );
+          FORBIDDEN_OPERATION, "Impossible to merge launches from different projects.");
 
       if (isUserValidate) {
-        expect(launch.getUserId(), equalTo(user.getUserId())).verify(ACCESS_DENIED,
+        expect(launch.getUserId(), equalTo(user.getUserId())).verify(
+            ACCESS_DENIED,
             "You are not an owner of launches or have less than PROJECT_MANAGER project role."
         );
       }
diff --git a/src/main/java/com/epam/ta/reportportal/core/launch/impl/StopLaunchHandlerImpl.java b/src/main/java/com/epam/ta/reportportal/core/launch/impl/StopLaunchHandlerImpl.java
index 7b87a8f0d6..29208f1a5b 100644
--- a/src/main/java/com/epam/ta/reportportal/core/launch/impl/StopLaunchHandlerImpl.java
+++ b/src/main/java/com/epam/ta/reportportal/core/launch/impl/StopLaunchHandlerImpl.java
@@ -16,34 +16,32 @@
 
 package com.epam.ta.reportportal.core.launch.impl;
 
+import static com.epam.ta.reportportal.core.launch.util.LaunchValidator.validate;
+import static com.epam.ta.reportportal.core.launch.util.LaunchValidator.validateRoles;
+import static com.epam.ta.reportportal.entity.enums.StatusEnum.STOPPED;
+import static java.util.Optional.ofNullable;
+import static java.util.stream.Collectors.toList;
+
 import com.epam.ta.reportportal.commons.ReportPortalUser;
-import com.epam.ta.reportportal.core.events.MessageBus;
 import com.epam.ta.reportportal.core.events.activity.LaunchFinishedEvent;
 import com.epam.ta.reportportal.core.launch.StopLaunchHandler;
 import com.epam.ta.reportportal.dao.LaunchRepository;
 import com.epam.ta.reportportal.dao.TestItemRepository;
 import com.epam.ta.reportportal.entity.launch.Launch;
 import com.epam.ta.reportportal.exception.ReportPortalException;
+import com.epam.ta.reportportal.model.BulkRQ;
 import com.epam.ta.reportportal.ws.converter.builders.LaunchBuilder;
-import com.epam.ta.reportportal.ws.model.BulkRQ;
 import com.epam.ta.reportportal.ws.model.ErrorType;
 import com.epam.ta.reportportal.ws.model.FinishExecutionRQ;
 import com.epam.ta.reportportal.ws.model.OperationCompletionRS;
 import com.epam.ta.reportportal.ws.model.attribute.ItemAttributeResource;
+import java.util.Date;
+import java.util.List;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.ApplicationEventPublisher;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
-import java.util.Date;
-import java.util.List;
-
-import static com.epam.ta.reportportal.core.launch.util.LaunchValidator.validate;
-import static com.epam.ta.reportportal.core.launch.util.LaunchValidator.validateRoles;
-import static com.epam.ta.reportportal.entity.enums.StatusEnum.STOPPED;
-import static java.util.Optional.ofNullable;
-import static java.util.stream.Collectors.toList;
-
 /**
  * @author <a href="mailto:ihar_kahadouski@epam.com">Ihar Kahadouski</a>
  */
@@ -51,52 +49,50 @@
 @Transactional
 public class StopLaunchHandlerImpl implements StopLaunchHandler {
 
-	private static final String LAUNCH_STOP_DESCRIPTION = " stopped";
+  private static final String LAUNCH_STOP_DESCRIPTION = " stopped";
 
-	private final LaunchRepository launchRepository;
-	private final TestItemRepository testItemRepository;
-	private final ApplicationEventPublisher eventPublisher;
+  private final LaunchRepository launchRepository;
+  private final TestItemRepository testItemRepository;
+  private final ApplicationEventPublisher eventPublisher;
 
-	@Autowired
-	public StopLaunchHandlerImpl(LaunchRepository launchRepository, TestItemRepository testItemRepository,
-			ApplicationEventPublisher eventPublisher) {
-		this.launchRepository = launchRepository;
-		this.testItemRepository = testItemRepository;
-		this.eventPublisher = eventPublisher;
-	}
+  @Autowired
+  public StopLaunchHandlerImpl(LaunchRepository launchRepository,
+      TestItemRepository testItemRepository, ApplicationEventPublisher eventPublisher) {
+    this.launchRepository = launchRepository;
+    this.testItemRepository = testItemRepository;
+    this.eventPublisher = eventPublisher;
+  }
 
-	@Override
-	public OperationCompletionRS stopLaunch(Long launchId, FinishExecutionRQ finishLaunchRQ, ReportPortalUser.ProjectDetails projectDetails,
-			ReportPortalUser user) {
-		Launch launch = launchRepository.findById(launchId)
-				.orElseThrow(() -> new ReportPortalException(ErrorType.LAUNCH_NOT_FOUND, launchId));
+  @Override
+  public OperationCompletionRS stopLaunch(Long launchId, FinishExecutionRQ finishLaunchRQ,
+      ReportPortalUser.ProjectDetails projectDetails, ReportPortalUser user) {
+    Launch launch = launchRepository.findById(launchId)
+        .orElseThrow(() -> new ReportPortalException(ErrorType.LAUNCH_NOT_FOUND, launchId));
 
-		validateRoles(launch, user, projectDetails);
-		validate(launch, finishLaunchRQ);
+    validateRoles(launch, user, projectDetails);
+    validate(launch, finishLaunchRQ);
 
-		launch = new LaunchBuilder(launch).addDescription(ofNullable(finishLaunchRQ.getDescription()).orElse(ofNullable(launch.getDescription())
-				.orElse("")).concat(LAUNCH_STOP_DESCRIPTION))
-				.addStatus(ofNullable(finishLaunchRQ.getStatus()).orElse(STOPPED.name()))
-				.addEndTime(ofNullable(finishLaunchRQ.getEndTime()).orElse(new Date()))
-				.addAttributes(finishLaunchRQ.getAttributes())
-				.addAttribute(new ItemAttributeResource("status", "stopped"))
-				.get();
+    launch = new LaunchBuilder(launch).addDescription(
+            ofNullable(finishLaunchRQ.getDescription()).orElse(
+                ofNullable(launch.getDescription()).orElse("")).concat(LAUNCH_STOP_DESCRIPTION))
+        .addStatus(ofNullable(finishLaunchRQ.getStatus()).orElse(STOPPED.name()))
+        .addEndTime(ofNullable(finishLaunchRQ.getEndTime()).orElse(new Date()))
+        .addAttributes(finishLaunchRQ.getAttributes())
+        .addAttribute(new ItemAttributeResource("status", "stopped")).get();
 
-		launchRepository.save(launch);
-		testItemRepository.interruptInProgressItems(launch.getId());
+    launchRepository.save(launch);
+    testItemRepository.interruptInProgressItems(launch.getId());
 
     eventPublisher.publishEvent(
         new LaunchFinishedEvent(launch, user.getUserId(), user.getUsername(), false));
-		return new OperationCompletionRS("Launch with ID = '" + launchId + "' successfully stopped.");
-	}
+    return new OperationCompletionRS("Launch with ID = '" + launchId + "' successfully stopped.");
+  }
 
-	@Override
-	public List<OperationCompletionRS> stopLaunch(BulkRQ<Long, FinishExecutionRQ> bulkRQ, ReportPortalUser.ProjectDetails projectDetails,
-			ReportPortalUser user) {
-		return bulkRQ.getEntities()
-				.entrySet()
-				.stream()
-				.map(entry -> stopLaunch(entry.getKey(), entry.getValue(), projectDetails, user))
-				.collect(toList());
-	}
+  @Override
+  public List<OperationCompletionRS> stopLaunch(BulkRQ<Long, FinishExecutionRQ> bulkRQ,
+      ReportPortalUser.ProjectDetails projectDetails, ReportPortalUser user) {
+    return bulkRQ.getEntities().entrySet().stream()
+        .map(entry -> stopLaunch(entry.getKey(), entry.getValue(), projectDetails, user))
+        .collect(toList());
+  }
 }
diff --git a/src/main/java/com/epam/ta/reportportal/core/launch/impl/UpdateLaunchHandlerImpl.java b/src/main/java/com/epam/ta/reportportal/core/launch/impl/UpdateLaunchHandlerImpl.java
index d1dcac32b6..0752e1a998 100644
--- a/src/main/java/com/epam/ta/reportportal/core/launch/impl/UpdateLaunchHandlerImpl.java
+++ b/src/main/java/com/epam/ta/reportportal/core/launch/impl/UpdateLaunchHandlerImpl.java
@@ -50,16 +50,16 @@
 import com.epam.ta.reportportal.entity.project.ProjectRole;
 import com.epam.ta.reportportal.entity.user.UserRole;
 import com.epam.ta.reportportal.exception.ReportPortalException;
+import com.epam.ta.reportportal.model.BulkRQ;
+import com.epam.ta.reportportal.model.launch.AnalyzeLaunchRQ;
+import com.epam.ta.reportportal.model.launch.UpdateLaunchRQ;
+import com.epam.ta.reportportal.model.launch.cluster.CreateClustersRQ;
 import com.epam.ta.reportportal.util.ItemInfoUtils;
 import com.epam.ta.reportportal.ws.converter.builders.LaunchBuilder;
 import com.epam.ta.reportportal.ws.converter.converters.ItemAttributeConverter;
 import com.epam.ta.reportportal.ws.model.BulkInfoUpdateRQ;
-import com.epam.ta.reportportal.ws.model.BulkRQ;
 import com.epam.ta.reportportal.ws.model.OperationCompletionRS;
-import com.epam.ta.reportportal.ws.model.launch.AnalyzeLaunchRQ;
 import com.epam.ta.reportportal.ws.model.launch.Mode;
-import com.epam.ta.reportportal.ws.model.launch.UpdateLaunchRQ;
-import com.epam.ta.reportportal.ws.model.launch.cluster.CreateClustersRQ;
 import com.epam.ta.reportportal.ws.model.project.AnalyzerConfig;
 import com.google.common.collect.Lists;
 import java.util.List;
@@ -93,11 +93,11 @@ public class UpdateLaunchHandlerImpl implements UpdateLaunchHandler {
 
   @Autowired
   public UpdateLaunchHandlerImpl(GetProjectHandler getProjectHandler,
-      GetLaunchHandler getLaunchHandler,
-      LaunchAccessValidator launchAccessValidator, LaunchRepository launchRepository,
-      LogIndexer logIndexer,
+      GetLaunchHandler getLaunchHandler, LaunchAccessValidator launchAccessValidator,
+      LaunchRepository launchRepository, LogIndexer logIndexer,
       Map<AnalyzerType, LaunchAnalysisStrategy> launchAnalysisStrategyMapping,
-      @Qualifier("uniqueErrorAnalysisStarterAsync") UniqueErrorAnalysisStarter uniqueErrorAnalysisStarter) {
+      @Qualifier("uniqueErrorAnalysisStarterAsync")
+      UniqueErrorAnalysisStarter uniqueErrorAnalysisStarter) {
     this.getProjectHandler = getProjectHandler;
     this.getLaunchHandler = getLaunchHandler;
     this.launchAccessValidator = launchAccessValidator;
@@ -109,8 +109,7 @@ public UpdateLaunchHandlerImpl(GetProjectHandler getProjectHandler,
 
   @Override
   public OperationCompletionRS updateLaunch(Long launchId,
-      ReportPortalUser.ProjectDetails projectDetails, ReportPortalUser user,
-      UpdateLaunchRQ rq) {
+      ReportPortalUser.ProjectDetails projectDetails, ReportPortalUser user, UpdateLaunchRQ rq) {
     Project project = getProjectHandler.get(projectDetails);
     Launch launch = launchRepository.findById(launchId)
         .orElseThrow(() -> new ReportPortalException(LAUNCH_NOT_FOUND, launchId.toString()));
@@ -118,10 +117,8 @@ public OperationCompletionRS updateLaunch(Long launchId,
 
     LaunchModeEnum previousMode = launch.getMode();
 
-    launch = new LaunchBuilder(launch).addMode(rq.getMode())
-        .addDescription(rq.getDescription())
-        .overwriteAttributes(rq.getAttributes())
-        .get();
+    launch = new LaunchBuilder(launch).addMode(rq.getMode()).addDescription(rq.getDescription())
+        .overwriteAttributes(rq.getAttributes()).get();
     launchRepository.save(launch);
 
     if (!previousMode.equals(launch.getMode())) {
@@ -133,19 +130,15 @@ public OperationCompletionRS updateLaunch(Long launchId,
 
   @Override
   public List<OperationCompletionRS> updateLaunch(BulkRQ<Long, UpdateLaunchRQ> rq,
-      ReportPortalUser.ProjectDetails projectDetails,
-      ReportPortalUser user) {
-    return rq.getEntities()
-        .entrySet()
-        .stream()
+      ReportPortalUser.ProjectDetails projectDetails, ReportPortalUser user) {
+    return rq.getEntities().entrySet().stream()
         .map(entry -> updateLaunch(entry.getKey(), projectDetails, user, entry.getValue()))
         .collect(toList());
   }
 
   @Override
   public OperationCompletionRS startLaunchAnalyzer(AnalyzeLaunchRQ analyzeRQ,
-      ReportPortalUser.ProjectDetails projectDetails,
-      ReportPortalUser user) {
+      ReportPortalUser.ProjectDetails projectDetails, ReportPortalUser user) {
     AnalyzerType analyzerType = AnalyzerType.fromString(analyzeRQ.getAnalyzerTypeName());
     launchAnalysisStrategyMapping.get(analyzerType).analyze(analyzeRQ, projectDetails, user);
     return new OperationCompletionRS(
@@ -156,38 +149,37 @@ public OperationCompletionRS startLaunchAnalyzer(AnalyzeLaunchRQ analyzeRQ,
   @Override
   @Transactional
   public OperationCompletionRS createClusters(CreateClustersRQ createClustersRQ,
-      ReportPortalUser.ProjectDetails projectDetails,
-      ReportPortalUser user) {
+      ReportPortalUser.ProjectDetails projectDetails, ReportPortalUser user) {
 
     final Launch launch = getLaunchHandler.get(createClustersRQ.getLaunchId());
     launchAccessValidator.validate(launch, projectDetails, user);
     //TODO should be put inside *Validator after validators refactoring
     expect(launch.getStatus(), not(statusIn(StatusEnum.IN_PROGRESS))).verify(INCORRECT_REQUEST,
-        "Cannot analyze launch in progress.");
+        "Cannot analyze launch in progress."
+    );
 
     final Project project = getProjectHandler.get(launch.getProjectId());
 
-    final Map<String, String> configParameters = getConfigParameters(
-        project.getProjectAttributes());
+    final Map<String, String> configParameters =
+        getConfigParameters(project.getProjectAttributes());
     configParameters.put(ProjectAttributeEnum.UNIQUE_ERROR_ANALYZER_REMOVE_NUMBERS.getAttribute(),
         String.valueOf(createClustersRQ.isRemoveNumbers())
     );
     uniqueErrorAnalysisStarter.start(ClusterEntityContext.of(launch.getId(), launch.getProjectId()),
-        configParameters);
+        configParameters
+    );
 
     return new OperationCompletionRS(
         Suppliers.formattedSupplier("Clusters generation for launch with ID='{}' started.",
-                launch.getId())
-            .get());
+            launch.getId()
+        ).get());
   }
 
   @Override
   public OperationCompletionRS bulkInfoUpdate(BulkInfoUpdateRQ bulkUpdateRq,
       ReportPortalUser.ProjectDetails projectDetails) {
     expect(getProjectHandler.exists(projectDetails.getProjectId()), Predicate.isEqual(true)).verify(
-        PROJECT_NOT_FOUND,
-        projectDetails.getProjectId()
-    );
+        PROJECT_NOT_FOUND, projectDetails.getProjectId());
 
     List<Launch> launches = launchRepository.findAllById(bulkUpdateRq.getIds());
     launches.forEach(
@@ -198,8 +190,8 @@ public OperationCompletionRS bulkInfoUpdate(BulkInfoUpdateRQ bulkUpdateRq,
       switch (it.getAction()) {
         case DELETE: {
           launches.forEach(launch -> {
-            ItemAttribute toDelete = ItemInfoUtils.findAttributeByResource(launch.getAttributes(),
-                it.getFrom());
+            ItemAttribute toDelete =
+                ItemInfoUtils.findAttributeByResource(launch.getAttributes(), it.getFrom());
             launch.getAttributes().remove(toDelete);
           });
           break;
@@ -212,8 +204,8 @@ public OperationCompletionRS bulkInfoUpdate(BulkInfoUpdateRQ bulkUpdateRq,
           launches.stream()
               .filter(launch -> ItemInfoUtils.containsAttribute(launch.getAttributes(), it.getTo()))
               .forEach(launch -> {
-                ItemAttribute itemAttribute = ItemAttributeConverter.FROM_RESOURCE.apply(
-                    it.getTo());
+                ItemAttribute itemAttribute =
+                    ItemAttributeConverter.FROM_RESOURCE.apply(it.getTo());
                 itemAttribute.setLaunch(launch);
                 launch.getAttributes().add(itemAttribute);
               });
diff --git a/src/main/java/com/epam/ta/reportportal/core/log/GetLogHandler.java b/src/main/java/com/epam/ta/reportportal/core/log/GetLogHandler.java
index 7b8b44e682..bc53a8602e 100644
--- a/src/main/java/com/epam/ta/reportportal/core/log/GetLogHandler.java
+++ b/src/main/java/com/epam/ta/reportportal/core/log/GetLogHandler.java
@@ -22,8 +22,8 @@
 import com.epam.ta.reportportal.core.log.impl.PagedLogResource;
 import com.epam.ta.reportportal.entity.item.TestItem;
 import com.epam.ta.reportportal.entity.log.Log;
-import com.epam.ta.reportportal.ws.model.log.GetLogsUnderRq;
-import com.epam.ta.reportportal.ws.model.log.LogResource;
+import com.epam.ta.reportportal.model.log.GetLogsUnderRq;
+import com.epam.ta.reportportal.model.log.LogResource;
 import java.util.List;
 import java.util.Map;
 import org.springframework.data.domain.Pageable;
@@ -38,10 +38,10 @@ public interface GetLogHandler {
   /**
    * Returns logs for specified filter
    *
-   * @param filterable      - filter definition
-   * @param pageable        - pageable definition
-   * @param path            - logs path
-   * @param projectDetails  - project details
+   * @param filterable     - filter definition
+   * @param pageable       - pageable definition
+   * @param path           - logs path
+   * @param projectDetails - project details
    * @return mapping with {@link TestItem#getItemId()} as key and its list of {@link LogResource} as value
    */
   Iterable<LogResource> getLogs(String path, ReportPortalUser.ProjectDetails projectDetails,
@@ -88,11 +88,10 @@ long getPageNumber(Long logId, ReportPortalUser.ProjectDetails projectDetails, F
    * @param queryable      {@link Queryable}
    * @param pageable       {@link Pageable}
    * @return The {@link Iterable} of {@link LogResource} and
-   * {@link com.epam.ta.reportportal.ws.model.NestedStepResource} entities
+   * {@link com.epam.ta.reportportal.model.NestedStepResource} entities
    */
   Iterable<?> getNestedItems(Long parentId, ReportPortalUser.ProjectDetails projectDetails,
-      Map<String, String> params,
-      Queryable queryable, Pageable pageable);
+      Map<String, String> params, Queryable queryable, Pageable pageable);
 
   List<PagedLogResource> getLogsWithLocation(Long parentId,
       ReportPortalUser.ProjectDetails projectDetails, Map<String, String> params,
diff --git a/src/main/java/com/epam/ta/reportportal/core/log/impl/GetLogHandlerImpl.java b/src/main/java/com/epam/ta/reportportal/core/log/impl/GetLogHandlerImpl.java
index c83b40440a..3e104b9fe4 100644
--- a/src/main/java/com/epam/ta/reportportal/core/log/impl/GetLogHandlerImpl.java
+++ b/src/main/java/com/epam/ta/reportportal/core/log/impl/GetLogHandlerImpl.java
@@ -53,12 +53,12 @@
 import com.epam.ta.reportportal.entity.log.Log;
 import com.epam.ta.reportportal.entity.log.LogFull;
 import com.epam.ta.reportportal.exception.ReportPortalException;
+import com.epam.ta.reportportal.model.log.GetLogsUnderRq;
+import com.epam.ta.reportportal.model.log.LogResource;
 import com.epam.ta.reportportal.ws.converter.PagedResourcesAssembler;
 import com.epam.ta.reportportal.ws.converter.converters.LogConverter;
 import com.epam.ta.reportportal.ws.converter.converters.TestItemConverter;
 import com.epam.ta.reportportal.ws.model.ErrorType;
-import com.epam.ta.reportportal.ws.model.log.GetLogsUnderRq;
-import com.epam.ta.reportportal.ws.model.log.LogResource;
 import com.google.common.collect.Lists;
 import java.util.AbstractMap;
 import java.util.Collections;
@@ -113,11 +113,12 @@ public GetLogHandlerImpl(LogRepository logRepository, LogService logService,
 
   @Override
   public Iterable<LogResource> getLogs(@Nullable String path,
-      ReportPortalUser.ProjectDetails projectDetails, Filter filterable,
-      Pageable pageable) {
+      ReportPortalUser.ProjectDetails projectDetails, Filter filterable, Pageable pageable) {
     ofNullable(path).ifPresent(p -> updateFilter(filterable, p));
-    Page<LogFull> logFullPage = logService.findByFilter(
-        ProjectFilter.of(filterable, projectDetails.getProjectId()), pageable);
+    Page<LogFull> logFullPage =
+        logService.findByFilter(ProjectFilter.of(filterable, projectDetails.getProjectId()),
+            pageable
+        );
     return PagedResourcesAssembler.pageConverter(LogConverter.TO_RESOURCE).apply(logFullPage);
   }
 
@@ -125,20 +126,16 @@ public Iterable<LogResource> getLogs(@Nullable String path,
   public Map<Long, List<LogResource>> getLogs(GetLogsUnderRq logsUnderRq,
       ReportPortalUser.ProjectDetails projectDetails) {
 
-    final LogLevel logLevel = LogLevel.toLevel(logsUnderRq.getLogLevel())
-        .orElseThrow(() -> new ReportPortalException(ErrorType.BAD_REQUEST_ERROR,
-            logsUnderRq.getLogLevel()));
+    final LogLevel logLevel = LogLevel.toLevel(logsUnderRq.getLogLevel()).orElseThrow(
+        () -> new ReportPortalException(ErrorType.BAD_REQUEST_ERROR, logsUnderRq.getLogLevel()));
 
     return testItemRepository.findAllById(logsUnderRq.getItemIds()).stream()
         .collect(toMap(TestItem::getItemId, item -> {
           final Launch launch = testItemService.getEffectiveLaunch(item);
           validate(launch, projectDetails);
           return logService.findLatestUnderTestItemByLaunchIdAndTestItemIdsAndLogLevelGte(
-              launch.getId(),
-              item.getItemId(),
-              logLevel.toInt(),
-              LOG_UNDER_ITEM_BATCH_SIZE
-          ).stream().map(LogConverter.TO_RESOURCE).collect(Collectors.toList());
+                  launch.getId(), item.getItemId(), logLevel.toInt(), LOG_UNDER_ITEM_BATCH_SIZE)
+              .stream().map(LogConverter.TO_RESOURCE).collect(Collectors.toList());
         }));
   }
 
@@ -163,43 +160,37 @@ public LogResource getLog(String logId, ReportPortalUser.ProjectDetails projectD
 
   @Override
   public Iterable<?> getNestedItems(Long parentId, ReportPortalUser.ProjectDetails projectDetails,
-      Map<String, String> params,
-      Queryable queryable, Pageable pageable) {
+      Map<String, String> params, Queryable queryable, Pageable pageable) {
 
     TestItem parentItem = testItemRepository.findById(parentId)
         .orElseThrow(() -> new ReportPortalException(ErrorType.TEST_ITEM_NOT_FOUND, parentId));
     Launch launch = testItemService.getEffectiveLaunch(parentItem);
     validate(launch, projectDetails);
 
-    Boolean excludeEmptySteps = ofNullable(params.get(EXCLUDE_EMPTY_STEPS)).map(
-        BooleanUtils::toBoolean).orElse(false);
-    Boolean excludePassedLogs = ofNullable(params.get(EXCLUDE_PASSED_LOGS)).map(
-        BooleanUtils::toBoolean).orElse(false);
+    Boolean excludeEmptySteps =
+        ofNullable(params.get(EXCLUDE_EMPTY_STEPS)).map(BooleanUtils::toBoolean).orElse(false);
+    Boolean excludePassedLogs =
+        ofNullable(params.get(EXCLUDE_PASSED_LOGS)).map(BooleanUtils::toBoolean).orElse(false);
 
-    Page<NestedItem> nestedItems = logRepository.findNestedItems(parentId,
-        excludeEmptySteps,
-        isLogsExclusionRequired(parentItem, excludePassedLogs),
-        queryable,
-        pageable
+    Page<NestedItem> nestedItems = logRepository.findNestedItems(parentId, excludeEmptySteps,
+        isLogsExclusionRequired(parentItem, excludePassedLogs), queryable, pageable
     );
 
     List<NestedItem> content = nestedItems.getContent();
 
-    Map<String, List<NestedItem>> result = content.stream()
-        .collect(groupingBy(NestedItem::getType));
+    Map<String, List<NestedItem>> result =
+        content.stream().collect(groupingBy(NestedItem::getType));
 
     Map<Long, LogFull> logMap = ofNullable(result.get(LogRepositoryConstants.LOG)).map(
-            logs -> logService.findAllById(logs.stream()
-                .map(NestedItem::getId)
-                .collect(Collectors.toSet())).stream().collect(toMap(LogFull::getId, l -> l)))
-        .orElseGet(Collections::emptyMap);
+        logs -> logService.findAllById(
+                logs.stream().map(NestedItem::getId).collect(Collectors.toSet())).stream()
+            .collect(toMap(LogFull::getId, l -> l))).orElseGet(Collections::emptyMap);
 
     queryable.getFilterConditions().add(getLaunchCondition(launch.getId()));
     queryable.getFilterConditions().add(getParentPathCondition(parentItem));
     Map<Long, NestedStep> nestedStepMap = ofNullable(result.get(LogRepositoryConstants.ITEM)).map(
         testItems -> testItemRepository.findAllNestedStepsByIds(
-            testItems.stream().map(NestedItem::getId).collect(Collectors.toSet()),
-            queryable,
+            testItems.stream().map(NestedItem::getId).collect(Collectors.toSet()), queryable,
             excludePassedLogs
         ).stream().collect(toMap(NestedStep::getId, i -> i))).orElseGet(Collections::emptyMap);
 
@@ -214,36 +205,38 @@ public Iterable<?> getNestedItems(Long parentId, ReportPortalUser.ProjectDetails
       }
     });
 
-    return PagedResourcesAssembler.pageConverter()
-        .apply(PageableExecutionUtils.getPage(resources, nestedItems.getPageable(),
-            nestedItems::getTotalElements));
+    return PagedResourcesAssembler.pageConverter().apply(
+        PageableExecutionUtils.getPage(resources, nestedItems.getPageable(),
+            nestedItems::getTotalElements
+        ));
   }
 
   @Override
   public List<PagedLogResource> getLogsWithLocation(Long parentId,
-      ReportPortalUser.ProjectDetails projectDetails,
-      Map<String, String> params, Queryable queryable, Pageable pageable) {
+      ReportPortalUser.ProjectDetails projectDetails, Map<String, String> params,
+      Queryable queryable, Pageable pageable) {
 
     TestItem parentItem = testItemRepository.findById(parentId)
         .orElseThrow(() -> new ReportPortalException(ErrorType.TEST_ITEM_NOT_FOUND, parentId));
     Launch launch = testItemService.getEffectiveLaunch(parentItem);
     validate(launch, projectDetails);
 
-    Boolean excludeEmptySteps = ofNullable(params.get(EXCLUDE_EMPTY_STEPS)).map(
-        BooleanUtils::toBoolean).orElse(false);
-    Boolean excludePassedLogs = ofNullable(params.get(EXCLUDE_PASSED_LOGS)).map(
-        BooleanUtils::toBoolean).orElse(false);
-    Boolean excludeLogContent = ofNullable(params.get(EXCLUDE_LOG_CONTENT)).map(
-        BooleanUtils::toBoolean).orElse(false);
+    Boolean excludeEmptySteps =
+        ofNullable(params.get(EXCLUDE_EMPTY_STEPS)).map(BooleanUtils::toBoolean).orElse(false);
+    Boolean excludePassedLogs =
+        ofNullable(params.get(EXCLUDE_PASSED_LOGS)).map(BooleanUtils::toBoolean).orElse(false);
+    Boolean excludeLogContent =
+        ofNullable(params.get(EXCLUDE_LOG_CONTENT)).map(BooleanUtils::toBoolean).orElse(false);
 
     List<PagedLogResource> loadedLogs = new LinkedList<>();
     loadInnerLogs(parentId, loadedLogs, Collections.emptyList(), excludeEmptySteps,
-        excludePassedLogs, queryable, pageable);
+        excludePassedLogs, queryable, pageable
+    );
 
     if (!excludeLogContent) {
-      Map<Long, LogFull> logMap = logService.findAllById(loadedLogs.stream()
-          .map(PagedLogResource::getId)
-          .collect(Collectors.toSet())).stream().collect(toMap(LogFull::getId, l -> l));
+      Map<Long, LogFull> logMap = logService.findAllById(
+              loadedLogs.stream().map(PagedLogResource::getId).collect(Collectors.toSet())).stream()
+          .collect(toMap(LogFull::getId, l -> l));
       loadedLogs.forEach(resource -> {
         final LogFull model = logMap.get(resource.getId());
         LogConverter.FILL_WITH_LOG_CONTENT.apply(model, resource);
@@ -253,9 +246,8 @@ public List<PagedLogResource> getLogsWithLocation(Long parentId,
   }
 
   private void loadInnerLogs(Long parentId, List<PagedLogResource> results,
-      List<Map.Entry<Long, Integer>> pagesLocation,
-      boolean excludeEmptySteps, boolean excludePassedLogs, Queryable queryable,
-      Pageable pageable) {
+      List<Map.Entry<Long, Integer>> pagesLocation, boolean excludeEmptySteps,
+      boolean excludePassedLogs, Queryable queryable, Pageable pageable) {
 
     TestItem parentItem = testItemRepository.findById(parentId)
         .orElseThrow(() -> new ReportPortalException(ErrorType.TEST_ITEM_NOT_FOUND, parentId));
@@ -264,35 +256,26 @@ private void loadInnerLogs(Long parentId, List<PagedLogResource> results,
       return;
     }
 
-    final List<NestedItemPage> nestedItems = logRepository.findNestedItemsWithPage(
-        parentId,
-        excludeEmptySteps,
-        isLogsExclusionRequired(parentItem, excludePassedLogs),
-        queryable,
-        pageable
-    );
-    nestedItems.stream()
-        .filter(nestedItem -> nestedItem.getType().equals(LogRepositoryConstants.ITEM)
-            || nestedItem.getLogLevel() >= LogLevel.ERROR_INT)
-        .forEach(nestedItem -> {
-          List<Map.Entry<Long, Integer>> copy = new LinkedList<>(pagesLocation);
-          copy.add(new AbstractMap.SimpleEntry<>(nestedItem.getId(), nestedItem.getPageNumber()));
-          if (nestedItem.getType().equals(LogRepositoryConstants.ITEM)) {
-            loadInnerLogs(nestedItem.getId(),
-                results,
-                copy,
-                excludeEmptySteps,
-                excludePassedLogs,
-                queryable,
-                PageRequest.of(1, NESTED_STEP_MAX_PAGE_SIZE, pageable.getSort())
-            );
-          } else {
-            PagedLogResource pagedLogResource = new PagedLogResource();
-            pagedLogResource.setId(nestedItem.getId());
-            pagedLogResource.setPagesLocation(copy);
-            results.add(pagedLogResource);
-          }
-        });
+    final List<NestedItemPage> nestedItems =
+        logRepository.findNestedItemsWithPage(parentId, excludeEmptySteps,
+            isLogsExclusionRequired(parentItem, excludePassedLogs), queryable, pageable
+        );
+    nestedItems.stream().filter(
+        nestedItem -> nestedItem.getType().equals(LogRepositoryConstants.ITEM)
+            || nestedItem.getLogLevel() >= LogLevel.ERROR_INT).forEach(nestedItem -> {
+      List<Map.Entry<Long, Integer>> copy = new LinkedList<>(pagesLocation);
+      copy.add(new AbstractMap.SimpleEntry<>(nestedItem.getId(), nestedItem.getPageNumber()));
+      if (nestedItem.getType().equals(LogRepositoryConstants.ITEM)) {
+        loadInnerLogs(nestedItem.getId(), results, copy, excludeEmptySteps, excludePassedLogs,
+            queryable, PageRequest.of(1, NESTED_STEP_MAX_PAGE_SIZE, pageable.getSort())
+        );
+      } else {
+        PagedLogResource pagedLogResource = new PagedLogResource();
+        pagedLogResource.setId(nestedItem.getId());
+        pagedLogResource.setPagesLocation(copy);
+        results.add(pagedLogResource);
+      }
+    });
   }
 
   /**
@@ -308,7 +291,8 @@ private void validate(LogFull log, ReportPortalUser.ProjectDetails projectDetail
 
     expect(launchProjectId, equalTo(projectDetails.getProjectId())).verify(FORBIDDEN_OPERATION,
         formattedSupplier("Log '{}' is not under '{}' project", log.getId(),
-            projectDetails.getProjectName())
+            projectDetails.getProjectName()
+        )
     );
   }
 
@@ -316,7 +300,8 @@ private void validate(Launch launch, ReportPortalUser.ProjectDetails projectDeta
     expect(launch.getProjectId(), equalTo(projectDetails.getProjectId())).verify(
         FORBIDDEN_OPERATION,
         formattedSupplier("Launch '{}' is not under '{}' project", launch.getId(),
-            projectDetails.getProjectName())
+            projectDetails.getProjectName()
+        )
     );
   }
 
@@ -363,16 +348,15 @@ private void updateFilter(Filter filterable, String path) {
 
     Launch launch = testItemService.getEffectiveLaunch(testItem);
 
-    FilterCondition.ConditionBuilder itemLaunchIdConditionBuilder = FilterCondition.builder()
-        .eq(CRITERIA_ITEM_LAUNCH_ID, String.valueOf(launch.getId()));
+    FilterCondition.ConditionBuilder itemLaunchIdConditionBuilder =
+        FilterCondition.builder().eq(CRITERIA_ITEM_LAUNCH_ID, String.valueOf(launch.getId()));
 
     ConvertibleCondition launchIdCondition = ofNullable(testItem.getRetryOf()).map(
         retryOf -> (ConvertibleCondition) new CompositeFilterCondition(
             Lists.newArrayList(itemLaunchIdConditionBuilder.withOperator(Operator.OR).build(),
                 FilterCondition.builder()
                     .eq(CRITERIA_RETRY_PARENT_LAUNCH_ID, String.valueOf(launch.getId()))
-                    .withOperator(Operator.OR)
-                    .build()
+                    .withOperator(Operator.OR).build()
             ))).orElseGet(itemLaunchIdConditionBuilder::build);
 
     filterable.getFilterConditions().add(launchIdCondition);
@@ -387,34 +371,28 @@ private void updateFilter(Filter filterable, String path) {
    * @param filterable {@link Filter} with {@link FilterTarget#getClazz()} of {@link Log}
    */
   private void updatePathCondition(TestItem testItem, Filter filterable) {
-    List<ConvertibleCondition> resultConditions = filterable.getFilterConditions()
-        .stream()
-        .flatMap(c -> c.getAllConditions().stream())
-        .filter(c -> BooleanUtils.isFalse(
-            CRITERIA_PATH.equals(c.getSearchCriteria()) && Condition.UNDER.equals(
-                c.getCondition())))
-        .collect(Collectors.toList());
+    List<ConvertibleCondition> resultConditions =
+        filterable.getFilterConditions().stream().flatMap(c -> c.getAllConditions().stream())
+            .filter(c -> BooleanUtils.isFalse(
+                CRITERIA_PATH.equals(c.getSearchCriteria()) && Condition.UNDER.equals(
+                    c.getCondition()))).collect(Collectors.toList());
     filterable.getFilterConditions().clear();
 
     FilterCondition parentPathCondition = getParentPathCondition(testItem);
     resultConditions.add(ofNullable(testItem.getRetryOf()).map(
-        retryParent -> (ConvertibleCondition) new CompositeFilterCondition(Lists.newArrayList(
-            parentPathCondition,
-            FilterCondition.builder()
-                .withOperator(Operator.OR)
-                .withCondition(Condition.UNDER)
-                .withSearchCriteria(CRITERIA_PATH)
-                .withValue(String.valueOf(testItem.getPath()))
-                .build()
-        ))).orElse(parentPathCondition));
+        retryParent -> (ConvertibleCondition) new CompositeFilterCondition(
+            Lists.newArrayList(parentPathCondition,
+                FilterCondition.builder().withOperator(Operator.OR).withCondition(Condition.UNDER)
+                    .withSearchCriteria(CRITERIA_PATH).withValue(String.valueOf(testItem.getPath()))
+                    .build()
+            ))).orElse(parentPathCondition));
 
     filterable.getFilterConditions().addAll(resultConditions);
   }
 
   private FilterCondition getParentPathCondition(TestItem parent) {
     String pathValue = ofNullable(parent.getRetryOf()).flatMap(
-            retryParentId -> ofNullable(parent.getParentId()).flatMap(
-                    testItemRepository::findById)
+            retryParentId -> ofNullable(parent.getParentId()).flatMap(testItemRepository::findById)
                 .map(retryParent -> retryParent.getPath() + "." + parent.getItemId()))
         .orElse(parent.getPath());
     return FilterCondition.builder().withCondition(Condition.UNDER)
diff --git a/src/main/java/com/epam/ta/reportportal/core/log/impl/PagedLogResource.java b/src/main/java/com/epam/ta/reportportal/core/log/impl/PagedLogResource.java
index 24804eb9f8..28a8fdba89 100644
--- a/src/main/java/com/epam/ta/reportportal/core/log/impl/PagedLogResource.java
+++ b/src/main/java/com/epam/ta/reportportal/core/log/impl/PagedLogResource.java
@@ -1,6 +1,6 @@
 package com.epam.ta.reportportal.core.log.impl;
 
-import com.epam.ta.reportportal.ws.model.log.LogResource;
+import com.epam.ta.reportportal.model.log.LogResource;
 import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
diff --git a/src/main/java/com/epam/ta/reportportal/core/preference/GetPreferenceHandler.java b/src/main/java/com/epam/ta/reportportal/core/preference/GetPreferenceHandler.java
index 83d48cd36e..ce0262f8c7 100644
--- a/src/main/java/com/epam/ta/reportportal/core/preference/GetPreferenceHandler.java
+++ b/src/main/java/com/epam/ta/reportportal/core/preference/GetPreferenceHandler.java
@@ -17,7 +17,7 @@
 package com.epam.ta.reportportal.core.preference;
 
 import com.epam.ta.reportportal.commons.ReportPortalUser;
-import com.epam.ta.reportportal.ws.model.preference.PreferenceResource;
+import com.epam.ta.reportportal.model.preference.PreferenceResource;
 
 /**
  * Get user preference handler
diff --git a/src/main/java/com/epam/ta/reportportal/core/preference/impl/GetPreferenceHandlerImpl.java b/src/main/java/com/epam/ta/reportportal/core/preference/impl/GetPreferenceHandlerImpl.java
index 0835adf044..004fb6559c 100644
--- a/src/main/java/com/epam/ta/reportportal/core/preference/impl/GetPreferenceHandlerImpl.java
+++ b/src/main/java/com/epam/ta/reportportal/core/preference/impl/GetPreferenceHandlerImpl.java
@@ -13,15 +13,16 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package com.epam.ta.reportportal.core.preference.impl;
 
 import com.epam.ta.reportportal.commons.ReportPortalUser;
 import com.epam.ta.reportportal.core.preference.GetPreferenceHandler;
 import com.epam.ta.reportportal.dao.UserPreferenceRepository;
 import com.epam.ta.reportportal.entity.preference.UserPreference;
+import com.epam.ta.reportportal.model.filter.UserFilterResource;
+import com.epam.ta.reportportal.model.preference.PreferenceResource;
 import com.epam.ta.reportportal.ws.converter.converters.UserFilterConverter;
-import com.epam.ta.reportportal.ws.model.filter.UserFilterResource;
-import com.epam.ta.reportportal.ws.model.preference.PreferenceResource;
 import java.util.List;
 import java.util.stream.Collectors;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -45,10 +46,10 @@ public GetPreferenceHandlerImpl(UserPreferenceRepository userPreferenceRepositor
   @Override
   public PreferenceResource getPreference(ReportPortalUser.ProjectDetails projectDetails,
       ReportPortalUser user) {
-    List<UserPreference> userPreferences = userPreferenceRepository.findByProjectIdAndUserId(
-        projectDetails.getProjectId(),
-        user.getUserId()
-    );
+    List<UserPreference> userPreferences =
+        userPreferenceRepository.findByProjectIdAndUserId(projectDetails.getProjectId(),
+            user.getUserId()
+        );
     PreferenceResource preferenceResource = new PreferenceResource();
     preferenceResource.setUserId(user.getUserId());
     preferenceResource.setProjectId(projectDetails.getProjectId());
diff --git a/src/main/java/com/epam/ta/reportportal/core/project/CreateProjectHandler.java b/src/main/java/com/epam/ta/reportportal/core/project/CreateProjectHandler.java
index a7fb7e1bd7..79f5524353 100644
--- a/src/main/java/com/epam/ta/reportportal/core/project/CreateProjectHandler.java
+++ b/src/main/java/com/epam/ta/reportportal/core/project/CreateProjectHandler.java
@@ -19,8 +19,8 @@
 import com.epam.ta.reportportal.commons.ReportPortalUser;
 import com.epam.ta.reportportal.entity.project.Project;
 import com.epam.ta.reportportal.entity.user.User;
-import com.epam.ta.reportportal.ws.model.EntryCreatedRS;
-import com.epam.ta.reportportal.ws.model.project.CreateProjectRQ;
+import com.epam.ta.reportportal.model.EntryCreatedRS;
+import com.epam.ta.reportportal.model.project.CreateProjectRQ;
 
 /**
  * Create {@link Project} request handler
diff --git a/src/main/java/com/epam/ta/reportportal/core/project/DeleteProjectHandler.java b/src/main/java/com/epam/ta/reportportal/core/project/DeleteProjectHandler.java
index 2aa783949c..b24d61f5ca 100644
--- a/src/main/java/com/epam/ta/reportportal/core/project/DeleteProjectHandler.java
+++ b/src/main/java/com/epam/ta/reportportal/core/project/DeleteProjectHandler.java
@@ -18,7 +18,7 @@
 
 import com.epam.ta.reportportal.commons.ReportPortalUser;
 import com.epam.ta.reportportal.exception.ReportPortalException;
-import com.epam.ta.reportportal.ws.model.DeleteBulkRS;
+import com.epam.ta.reportportal.model.DeleteBulkRS;
 import com.epam.ta.reportportal.ws.model.OperationCompletionRS;
 import java.util.List;
 
@@ -42,8 +42,8 @@ public interface DeleteProjectHandler {
   /**
    * Delete specified project.
    *
-   * @param ids projects ids
-   * @param user      {@link ReportPortalUser}
+   * @param ids  projects ids
+   * @param user {@link ReportPortalUser}
    * @return Bulk result of operation
    * @throws ReportPortalException if project not found
    */
diff --git a/src/main/java/com/epam/ta/reportportal/core/project/GetProjectHandler.java b/src/main/java/com/epam/ta/reportportal/core/project/GetProjectHandler.java
index 81ee3dc926..7e215e4328 100644
--- a/src/main/java/com/epam/ta/reportportal/core/project/GetProjectHandler.java
+++ b/src/main/java/com/epam/ta/reportportal/core/project/GetProjectHandler.java
@@ -21,9 +21,9 @@
 import com.epam.ta.reportportal.commons.querygen.Queryable;
 import com.epam.ta.reportportal.entity.jasper.ReportFormat;
 import com.epam.ta.reportportal.entity.project.Project;
-import com.epam.ta.reportportal.ws.model.project.ProjectResource;
-import com.epam.ta.reportportal.ws.model.user.SearchUserResource;
-import com.epam.ta.reportportal.ws.model.user.UserResource;
+import com.epam.ta.reportportal.model.project.ProjectResource;
+import com.epam.ta.reportportal.model.user.SearchUserResource;
+import com.epam.ta.reportportal.model.user.UserResource;
 import java.io.OutputStream;
 import java.util.List;
 import java.util.Map;
diff --git a/src/main/java/com/epam/ta/reportportal/core/project/GetProjectInfoHandler.java b/src/main/java/com/epam/ta/reportportal/core/project/GetProjectInfoHandler.java
index 8cc231aed3..4e3a674986 100644
--- a/src/main/java/com/epam/ta/reportportal/core/project/GetProjectInfoHandler.java
+++ b/src/main/java/com/epam/ta/reportportal/core/project/GetProjectInfoHandler.java
@@ -18,12 +18,12 @@
 
 import com.epam.ta.reportportal.commons.querygen.Queryable;
 import com.epam.ta.reportportal.entity.enums.InfoInterval;
-import com.epam.ta.reportportal.ws.model.project.ProjectInfoResource;
+import com.epam.ta.reportportal.model.project.ProjectInfoResource;
 import java.util.Map;
 import org.springframework.data.domain.Pageable;
 
 /**
- * Get {@link com.epam.ta.reportportal.ws.model.project.ProjectInfoResource} request handler
+ * Get {@link ProjectInfoResource} request handler
  *
  * @author Dzmitry_Kavalets
  */
@@ -32,7 +32,7 @@ public interface GetProjectInfoHandler {
   /**
    * Get all projects info
    *
-   * @param filter  Queryable filter to apply on the projects
+   * @param filter   Queryable filter to apply on the projects
    * @param pageable Pagination information for the results
    * @return An {@link Iterable} of {@link ProjectInfoResource} containing information about all projects
    */
diff --git a/src/main/java/com/epam/ta/reportportal/core/project/UpdateProjectHandler.java b/src/main/java/com/epam/ta/reportportal/core/project/UpdateProjectHandler.java
index 784fc1f690..ddce49b0af 100644
--- a/src/main/java/com/epam/ta/reportportal/core/project/UpdateProjectHandler.java
+++ b/src/main/java/com/epam/ta/reportportal/core/project/UpdateProjectHandler.java
@@ -19,11 +19,11 @@
 import com.epam.ta.reportportal.commons.ReportPortalUser;
 import com.epam.ta.reportportal.entity.project.Project;
 import com.epam.ta.reportportal.exception.ReportPortalException;
+import com.epam.ta.reportportal.model.project.AssignUsersRQ;
+import com.epam.ta.reportportal.model.project.UnassignUsersRQ;
+import com.epam.ta.reportportal.model.project.UpdateProjectRQ;
+import com.epam.ta.reportportal.model.project.email.ProjectNotificationConfigDTO;
 import com.epam.ta.reportportal.ws.model.OperationCompletionRS;
-import com.epam.ta.reportportal.ws.model.project.AssignUsersRQ;
-import com.epam.ta.reportportal.ws.model.project.UnassignUsersRQ;
-import com.epam.ta.reportportal.ws.model.project.UpdateProjectRQ;
-import com.epam.ta.reportportal.ws.model.project.email.ProjectNotificationConfigDTO;
 
 /**
  * Update {@link com.epam.ta.reportportal.entity.project.Project} request handler
diff --git a/src/main/java/com/epam/ta/reportportal/core/project/impl/CreateProjectHandlerImpl.java b/src/main/java/com/epam/ta/reportportal/core/project/impl/CreateProjectHandlerImpl.java
index fe7570343d..29aa901691 100644
--- a/src/main/java/com/epam/ta/reportportal/core/project/impl/CreateProjectHandlerImpl.java
+++ b/src/main/java/com/epam/ta/reportportal/core/project/impl/CreateProjectHandlerImpl.java
@@ -40,10 +40,10 @@
 import com.epam.ta.reportportal.entity.user.ProjectUser;
 import com.epam.ta.reportportal.entity.user.User;
 import com.epam.ta.reportportal.exception.ReportPortalException;
+import com.epam.ta.reportportal.model.EntryCreatedRS;
+import com.epam.ta.reportportal.model.project.CreateProjectRQ;
 import com.epam.ta.reportportal.util.PersonalProjectService;
-import com.epam.ta.reportportal.ws.model.EntryCreatedRS;
 import com.epam.ta.reportportal.ws.model.ErrorType;
-import com.epam.ta.reportportal.ws.model.project.CreateProjectRQ;
 import java.util.Date;
 import java.util.Optional;
 import java.util.Set;
@@ -98,18 +98,20 @@ public EntryCreatedRS createProject(CreateProjectRQ createProjectRQ, ReportPorta
     );
 
     expect(projectName,
-        com.epam.ta.reportportal.util.Predicates.SPECIAL_CHARS_ONLY.negate()).verify(
-        ErrorType.INCORRECT_REQUEST,
+        com.epam.ta.reportportal.util.Predicates.SPECIAL_CHARS_ONLY.negate()
+    ).verify(ErrorType.INCORRECT_REQUEST,
         Suppliers.formattedSupplier("Project name '{}' consists only of special characters",
-            projectName)
+            projectName
+        )
     );
 
     Optional<Project> existProject = projectRepository.findByName(projectName);
     expect(existProject, not(isPresent())).verify(ErrorType.PROJECT_ALREADY_EXISTS, projectName);
 
-    ProjectType projectType = ProjectType.findByName(createProjectRQ.getEntryType())
-        .orElseThrow(() -> new ReportPortalException(ErrorType.BAD_REQUEST_ERROR,
-            createProjectRQ.getEntryType()));
+    ProjectType projectType = ProjectType.findByName(createProjectRQ.getEntryType()).orElseThrow(
+        () -> new ReportPortalException(ErrorType.BAD_REQUEST_ERROR,
+            createProjectRQ.getEntryType()
+        ));
     expect(projectType, equalTo(ProjectType.INTERNAL)).verify(ErrorType.BAD_REQUEST_ERROR,
         "Only internal projects can be created via API"
     );
diff --git a/src/main/java/com/epam/ta/reportportal/core/project/impl/DeleteProjectHandlerImpl.java b/src/main/java/com/epam/ta/reportportal/core/project/impl/DeleteProjectHandlerImpl.java
index db3b6140cc..117f156ff8 100644
--- a/src/main/java/com/epam/ta/reportportal/core/project/impl/DeleteProjectHandlerImpl.java
+++ b/src/main/java/com/epam/ta/reportportal/core/project/impl/DeleteProjectHandlerImpl.java
@@ -42,8 +42,8 @@
 import com.epam.ta.reportportal.entity.project.ProjectIssueType;
 import com.epam.ta.reportportal.entity.user.User;
 import com.epam.ta.reportportal.exception.ReportPortalException;
+import com.epam.ta.reportportal.model.DeleteBulkRS;
 import com.epam.ta.reportportal.util.FeatureFlagHandler;
-import com.epam.ta.reportportal.ws.model.DeleteBulkRS;
 import com.epam.ta.reportportal.ws.model.ErrorType;
 import com.epam.ta.reportportal.ws.model.OperationCompletionRS;
 import com.google.common.cache.Cache;
diff --git a/src/main/java/com/epam/ta/reportportal/core/project/impl/GetProjectHandlerImpl.java b/src/main/java/com/epam/ta/reportportal/core/project/impl/GetProjectHandlerImpl.java
index 976ea58141..77a69d497a 100644
--- a/src/main/java/com/epam/ta/reportportal/core/project/impl/GetProjectHandlerImpl.java
+++ b/src/main/java/com/epam/ta/reportportal/core/project/impl/GetProjectHandlerImpl.java
@@ -16,9 +16,21 @@
 
 package com.epam.ta.reportportal.core.project.impl;
 
+import static com.epam.ta.reportportal.commons.querygen.constant.GeneralCriteriaConstant.CRITERIA_PROJECT;
+import static com.epam.ta.reportportal.commons.querygen.constant.GeneralCriteriaConstant.CRITERIA_PROJECT_ID;
+import static com.epam.ta.reportportal.commons.querygen.constant.UserCriteriaConstant.CRITERIA_EMAIL;
+import static com.epam.ta.reportportal.commons.querygen.constant.UserCriteriaConstant.CRITERIA_FULL_NAME;
+import static com.epam.ta.reportportal.commons.querygen.constant.UserCriteriaConstant.CRITERIA_USER;
+import static com.epam.ta.reportportal.core.analyzer.auto.impl.AnalyzerUtils.getAnalyzerConfig;
+import static com.epam.ta.reportportal.ws.model.ErrorType.PROJECT_NOT_FOUND;
+
 import com.epam.ta.reportportal.commons.Predicates;
 import com.epam.ta.reportportal.commons.ReportPortalUser;
-import com.epam.ta.reportportal.commons.querygen.*;
+import com.epam.ta.reportportal.commons.querygen.CompositeFilterCondition;
+import com.epam.ta.reportportal.commons.querygen.Condition;
+import com.epam.ta.reportportal.commons.querygen.Filter;
+import com.epam.ta.reportportal.commons.querygen.FilterCondition;
+import com.epam.ta.reportportal.commons.querygen.Queryable;
 import com.epam.ta.reportportal.commons.validation.BusinessRule;
 import com.epam.ta.reportportal.commons.validation.Suppliers;
 import com.epam.ta.reportportal.core.jasper.GetJasperReportHandler;
@@ -30,13 +42,18 @@
 import com.epam.ta.reportportal.entity.project.ProjectInfo;
 import com.epam.ta.reportportal.entity.user.User;
 import com.epam.ta.reportportal.exception.ReportPortalException;
+import com.epam.ta.reportportal.model.project.ProjectResource;
+import com.epam.ta.reportportal.model.user.SearchUserResource;
+import com.epam.ta.reportportal.model.user.UserResource;
 import com.epam.ta.reportportal.ws.converter.PagedResourcesAssembler;
 import com.epam.ta.reportportal.ws.converter.converters.ProjectConverter;
 import com.epam.ta.reportportal.ws.converter.converters.UserConverter;
 import com.epam.ta.reportportal.ws.model.ErrorType;
-import com.epam.ta.reportportal.ws.model.project.ProjectResource;
-import com.epam.ta.reportportal.ws.model.user.SearchUserResource;
-import com.epam.ta.reportportal.ws.model.user.UserResource;
+import java.io.OutputStream;
+import java.util.Collections;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
 import net.sf.jasperreports.engine.JRDataSource;
 import net.sf.jasperreports.engine.JasperPrint;
 import net.sf.jasperreports.engine.data.JRBeanCollectionDataSource;
@@ -48,157 +65,156 @@
 import org.springframework.stereotype.Service;
 import org.springframework.util.CollectionUtils;
 
-import java.io.OutputStream;
-import java.util.Collections;
-import java.util.List;
-import java.util.Map;
-import java.util.stream.Collectors;
-
-import static com.epam.ta.reportportal.commons.querygen.constant.GeneralCriteriaConstant.CRITERIA_PROJECT;
-import static com.epam.ta.reportportal.commons.querygen.constant.GeneralCriteriaConstant.CRITERIA_PROJECT_ID;
-import static com.epam.ta.reportportal.commons.querygen.constant.UserCriteriaConstant.*;
-import static com.epam.ta.reportportal.core.analyzer.auto.impl.AnalyzerUtils.getAnalyzerConfig;
-import static com.epam.ta.reportportal.ws.model.ErrorType.PROJECT_NOT_FOUND;
-
 /**
  * @author Pavel Bortnik
  */
 @Service
 public class GetProjectHandlerImpl implements GetProjectHandler {
 
-	private static final String LENGTH_LESS_THAN_1_SYMBOL_MSG = "Length of the filtering string "
-			+ "'{}' is less than 1 symbol";
-
-	private final ProjectRepository projectRepository;
-
-	private final UserRepository userRepository;
-
-	private final GetJasperReportHandler<ProjectInfo> jasperReportHandler;
-
-	private final ProjectConverter projectConverter;
-
-	@Autowired
-	public GetProjectHandlerImpl(ProjectRepository projectRepository, UserRepository userRepository,
-			@Qualifier("projectJasperReportHandler") GetJasperReportHandler<ProjectInfo> jasperReportHandler,
-			ProjectConverter projectConverter) {
-		this.projectRepository = projectRepository;
-		this.userRepository = userRepository;
-		this.jasperReportHandler = jasperReportHandler;
-		this.projectConverter = projectConverter;
-	}
-
-	@Override
-	public Iterable<UserResource> getProjectUsers(String projectName, Filter filter, Pageable pageable) {
-		Project project = projectRepository.findByName(projectName)
-				.orElseThrow(() -> new ReportPortalException(ErrorType.PROJECT_NOT_FOUND, projectName));
-		if (CollectionUtils.isEmpty(project.getUsers())) {
-			return Collections.emptyList();
-		}
-		filter.withCondition(new FilterCondition(Condition.EQUALS, false, String.valueOf(project.getId()), CRITERIA_PROJECT_ID));
-		Page<User> users = userRepository.findByFilterExcluding(filter, pageable, "email");
-		return PagedResourcesAssembler.pageConverter(UserConverter.TO_RESOURCE).apply(users);
-	}
-
-	@Override
-	public boolean exists(Long id) {
-		return projectRepository.existsById(id);
-	}
-
-	@Override
-	public Project get(ReportPortalUser.ProjectDetails projectDetails) {
-		return projectRepository.findById(projectDetails.getProjectId())
-				.orElseThrow(() -> new ReportPortalException(PROJECT_NOT_FOUND, projectDetails.getProjectName()));
-	}
-
-	@Override
-	public Project get(Long id) {
-		return projectRepository.findById(id).orElseThrow(() -> new ReportPortalException(PROJECT_NOT_FOUND, id));
-	}
-
-	@Override
-	public Project get(String name) {
-		return projectRepository.findByName(name).orElseThrow(() -> new ReportPortalException(ErrorType.PROJECT_NOT_FOUND, name));
-	}
-
-	@Override
-	public Project getRaw(String name) {
-		return projectRepository.findRawByName(name).orElseThrow(() -> new ReportPortalException(ErrorType.PROJECT_NOT_FOUND, name));
-	}
-
-	@Override
-	public ProjectResource getResource(String projectName, ReportPortalUser user) {
-
-		Project project = projectRepository.findByName(projectName)
-				.orElseThrow(() -> new ReportPortalException(ErrorType.PROJECT_NOT_FOUND, projectName));
-
-		return projectConverter.TO_PROJECT_RESOURCE.apply(project);
-	}
-
-	@Override
-	public List<String> getUserNames(ReportPortalUser.ProjectDetails projectDetails, String value) {
-		checkBusinessRuleLessThan1Symbol(value);
-		return userRepository.findNamesByProject(projectDetails.getProjectId(), value);
-	}
-
-	private void checkBusinessRuleLessThan1Symbol(String value) {
-		BusinessRule.expect(value.length() >= 1, Predicates.equalTo(true))
-				.verify(ErrorType.INCORRECT_FILTER_PARAMETERS,
-						Suppliers.formattedSupplier(LENGTH_LESS_THAN_1_SYMBOL_MSG, value));
-	}
-
-	@Override
-	public Iterable<SearchUserResource> getUserNames(String value, ReportPortalUser.ProjectDetails projectDetails, Pageable pageable) {
-		checkBusinessRuleLessThan1Symbol(value);
-
-		final CompositeFilterCondition userCondition = getUserSearchCondition(value);
-
-		final Filter filter = Filter.builder()
-				.withTarget(User.class)
-				.withCondition(userCondition)
-				.withCondition(new FilterCondition(Operator.AND, Condition.ANY, true, projectDetails.getProjectName(), CRITERIA_PROJECT))
-				.build();
-
-		return PagedResourcesAssembler.pageConverter(UserConverter.TO_SEARCH_RESOURCE)
-				.apply(userRepository.findByFilterExcludingProjects(filter, pageable));
-	}
-
-	private CompositeFilterCondition getUserSearchCondition(String value) {
-		return new CompositeFilterCondition(List.of(new FilterCondition(Operator.OR, Condition.CONTAINS, false, value, CRITERIA_USER),
-				new FilterCondition(Operator.OR, Condition.CONTAINS, false, value, CRITERIA_FULL_NAME),
-				new FilterCondition(Operator.OR, Condition.CONTAINS, false, value, CRITERIA_EMAIL)
-		), Operator.AND);
-	}
-
-	@Override
-	public List<String> getAllProjectNames() {
-		return projectRepository.findAllProjectNames();
-	}
-
-	@Override
-	public List<String> getAllProjectNamesByTerm(String term) {
-		return projectRepository.findAllProjectNamesByTerm(term);
-	}
-
-	@Override
-	public void exportProjects(ReportFormat reportFormat, Queryable filter, OutputStream outputStream) {
-
-		List<ProjectInfo> projects = projectRepository.findProjectInfoByFilter(filter);
-
-		List<? extends Map<String, ?>> data = projects.stream().map(jasperReportHandler::convertParams).collect(Collectors.toList());
-
-		JRDataSource jrDataSource = new JRBeanCollectionDataSource(data);
-
-		//don't provide any params to not overwrite params from the Jasper template
-		JasperPrint jasperPrint = jasperReportHandler.getJasperPrint(null, jrDataSource);
-
-		jasperReportHandler.writeReport(reportFormat, outputStream, jasperPrint);
-	}
-
-	@Override
-	public Map<String, Boolean> getAnalyzerIndexingStatus() {
-		return projectRepository.findAll()
-				.stream()
-				.collect(Collectors.toMap(Project::getName, it -> getAnalyzerConfig(it).isIndexingRunning()));
-	}
+  private static final String LENGTH_LESS_THAN_1_SYMBOL_MSG =
+      "Length of the filtering string " + "'{}' is less than 1 symbol";
+
+  private final ProjectRepository projectRepository;
+
+  private final UserRepository userRepository;
+
+  private final GetJasperReportHandler<ProjectInfo> jasperReportHandler;
+
+  private final ProjectConverter projectConverter;
+
+  @Autowired
+  public GetProjectHandlerImpl(ProjectRepository projectRepository, UserRepository userRepository,
+      @Qualifier("projectJasperReportHandler")
+      GetJasperReportHandler<ProjectInfo> jasperReportHandler, ProjectConverter projectConverter) {
+    this.projectRepository = projectRepository;
+    this.userRepository = userRepository;
+    this.jasperReportHandler = jasperReportHandler;
+    this.projectConverter = projectConverter;
+  }
+
+  @Override
+  public Iterable<UserResource> getProjectUsers(String projectName, Filter filter,
+      Pageable pageable) {
+    Project project = projectRepository.findByName(projectName)
+        .orElseThrow(() -> new ReportPortalException(ErrorType.PROJECT_NOT_FOUND, projectName));
+    if (CollectionUtils.isEmpty(project.getUsers())) {
+      return Collections.emptyList();
+    }
+    filter.withCondition(
+        new FilterCondition(Condition.EQUALS, false, String.valueOf(project.getId()),
+            CRITERIA_PROJECT_ID
+        ));
+    Page<User> users = userRepository.findByFilterExcluding(filter, pageable, "email");
+    return PagedResourcesAssembler.pageConverter(UserConverter.TO_RESOURCE).apply(users);
+  }
+
+  @Override
+  public boolean exists(Long id) {
+    return projectRepository.existsById(id);
+  }
+
+  @Override
+  public Project get(ReportPortalUser.ProjectDetails projectDetails) {
+    return projectRepository.findById(projectDetails.getProjectId()).orElseThrow(
+        () -> new ReportPortalException(PROJECT_NOT_FOUND, projectDetails.getProjectName()));
+  }
+
+  @Override
+  public Project get(Long id) {
+    return projectRepository.findById(id)
+        .orElseThrow(() -> new ReportPortalException(PROJECT_NOT_FOUND, id));
+  }
+
+  @Override
+  public Project get(String name) {
+    return projectRepository.findByName(name)
+        .orElseThrow(() -> new ReportPortalException(ErrorType.PROJECT_NOT_FOUND, name));
+  }
+
+  @Override
+  public Project getRaw(String name) {
+    return projectRepository.findRawByName(name)
+        .orElseThrow(() -> new ReportPortalException(ErrorType.PROJECT_NOT_FOUND, name));
+  }
+
+  @Override
+  public ProjectResource getResource(String projectName, ReportPortalUser user) {
+
+    Project project = projectRepository.findByName(projectName)
+        .orElseThrow(() -> new ReportPortalException(ErrorType.PROJECT_NOT_FOUND, projectName));
+
+    return projectConverter.TO_PROJECT_RESOURCE.apply(project);
+  }
+
+  @Override
+  public List<String> getUserNames(ReportPortalUser.ProjectDetails projectDetails, String value) {
+    checkBusinessRuleLessThan1Symbol(value);
+    return userRepository.findNamesByProject(projectDetails.getProjectId(), value);
+  }
+
+  private void checkBusinessRuleLessThan1Symbol(String value) {
+    BusinessRule.expect(value.length() >= 1, Predicates.equalTo(true))
+        .verify(ErrorType.INCORRECT_FILTER_PARAMETERS,
+            Suppliers.formattedSupplier(LENGTH_LESS_THAN_1_SYMBOL_MSG, value)
+        );
+  }
+
+  @Override
+  public Iterable<SearchUserResource> getUserNames(String value,
+      ReportPortalUser.ProjectDetails projectDetails, Pageable pageable) {
+    checkBusinessRuleLessThan1Symbol(value);
+
+    final CompositeFilterCondition userCondition = getUserSearchCondition(value);
+
+    final Filter filter = Filter.builder().withTarget(User.class).withCondition(userCondition)
+        .withCondition(
+            new FilterCondition(Operator.AND, Condition.ANY, true, projectDetails.getProjectName(),
+                CRITERIA_PROJECT
+            )).build();
+
+    return PagedResourcesAssembler.pageConverter(UserConverter.TO_SEARCH_RESOURCE)
+        .apply(userRepository.findByFilterExcludingProjects(filter, pageable));
+  }
+
+  private CompositeFilterCondition getUserSearchCondition(String value) {
+    return new CompositeFilterCondition(
+        List.of(new FilterCondition(Operator.OR, Condition.CONTAINS, false, value, CRITERIA_USER),
+            new FilterCondition(Operator.OR, Condition.CONTAINS, false, value, CRITERIA_FULL_NAME),
+            new FilterCondition(Operator.OR, Condition.CONTAINS, false, value, CRITERIA_EMAIL)
+        ), Operator.AND);
+  }
+
+  @Override
+  public List<String> getAllProjectNames() {
+    return projectRepository.findAllProjectNames();
+  }
+
+  @Override
+  public List<String> getAllProjectNamesByTerm(String term) {
+    return projectRepository.findAllProjectNamesByTerm(term);
+  }
+
+  @Override
+  public void exportProjects(ReportFormat reportFormat, Queryable filter,
+      OutputStream outputStream) {
+
+    List<ProjectInfo> projects = projectRepository.findProjectInfoByFilter(filter);
+
+    List<? extends Map<String, ?>> data =
+        projects.stream().map(jasperReportHandler::convertParams).collect(Collectors.toList());
+
+    JRDataSource jrDataSource = new JRBeanCollectionDataSource(data);
+
+    //don't provide any params to not overwrite params from the Jasper template
+    JasperPrint jasperPrint = jasperReportHandler.getJasperPrint(null, jrDataSource);
+
+    jasperReportHandler.writeReport(reportFormat, outputStream, jasperPrint);
+  }
+
+  @Override
+  public Map<String, Boolean> getAnalyzerIndexingStatus() {
+    return projectRepository.findAll().stream().collect(
+        Collectors.toMap(Project::getName, it -> getAnalyzerConfig(it).isIndexingRunning()));
+  }
 
 }
diff --git a/src/main/java/com/epam/ta/reportportal/core/project/impl/GetProjectInfoHandlerImpl.java b/src/main/java/com/epam/ta/reportportal/core/project/impl/GetProjectInfoHandlerImpl.java
index 964109deb6..8cc2dcae97 100644
--- a/src/main/java/com/epam/ta/reportportal/core/project/impl/GetProjectInfoHandlerImpl.java
+++ b/src/main/java/com/epam/ta/reportportal/core/project/impl/GetProjectInfoHandlerImpl.java
@@ -62,13 +62,13 @@
 import com.epam.ta.reportportal.entity.project.email.ProjectInfoWidget;
 import com.epam.ta.reportportal.entity.user.User;
 import com.epam.ta.reportportal.exception.ReportPortalException;
+import com.epam.ta.reportportal.model.project.LaunchesPerUser;
+import com.epam.ta.reportportal.model.project.ProjectInfoResource;
 import com.epam.ta.reportportal.ws.converter.PagedResourcesAssembler;
 import com.epam.ta.reportportal.ws.converter.converters.LaunchConverter;
 import com.epam.ta.reportportal.ws.converter.converters.ProjectSettingsConverter;
 import com.epam.ta.reportportal.ws.model.ActivityResource;
 import com.epam.ta.reportportal.ws.model.launch.Mode;
-import com.epam.ta.reportportal.ws.model.project.LaunchesPerUser;
-import com.epam.ta.reportportal.ws.model.project.ProjectInfoResource;
 import com.google.common.collect.Lists;
 import java.math.RoundingMode;
 import java.sql.Timestamp;
@@ -96,201 +96,196 @@
 @Service
 public class GetProjectInfoHandlerImpl implements GetProjectInfoHandler {
 
-	private static final Double WEEKS_IN_MONTH = 4.4;
-	private static final int LIMIT = 150;
-	private static final Predicate<ActivityAction> ACTIVITIES_PROJECT_FILTER = it -> it == UPDATE_DEFECT || it == DELETE_DEFECT
-			|| it == LINK_ISSUE || it == LINK_ISSUE_AA || it == UNLINK_ISSUE || it == UPDATE_ITEM;
-	private final ProjectRepository projectRepository;
-
-	private final LaunchRepository launchRepository;
-
-	private final ActivityRepository activityRepository;
-
-	private final ProjectInfoWidgetDataConverter dataConverter;
-
-	private final LaunchConverter launchConverter;
-
-	private final UserRepository userRepository;
-
-	private final TicketRepository ticketRepository;
-
-	private final DecimalFormat formatter = new DecimalFormat("###.##");
-
-	@Autowired
-	public GetProjectInfoHandlerImpl(ProjectRepository projectRepository, LaunchRepository launchRepository,
-			ActivityRepository activityRepository, ProjectInfoWidgetDataConverter dataConverter, LaunchConverter launchConverter,
-			UserRepository userRepository, TicketRepository ticketRepository) {
-		this.projectRepository = projectRepository;
-		this.launchRepository = launchRepository;
-		this.activityRepository = activityRepository;
-		this.dataConverter = dataConverter;
-		this.launchConverter = launchConverter;
-		this.userRepository = userRepository;
-		this.ticketRepository = ticketRepository;
-	}
-
-	/**
-	 * Utility method for calculation of start interval date
-	 *
-	 * @param interval Back interval
-	 * @return Now minus interval
-	 */
-	private static LocalDateTime getStartIntervalDate(InfoInterval interval) {
-		return LocalDateTime.now(Clock.systemUTC()).minusMonths(interval.getCount());
-	}
-
-	/**
-	 * Filter that gets project info from selected date.
-	 *
-	 * @param project      Project
-	 * @param infoInterval Date interval
-	 * @return {@link Filter}
-	 */
-	private static Filter projectInfoFilter(Project project, InfoInterval infoInterval) {
-		return Filter.builder()
-				.withTarget(ProjectInfo.class)
-				.withCondition(new FilterCondition(EQUALS, false, project.getName(), CRITERIA_PROJECT_NAME))
-				.withCondition(new FilterCondition(GREATER_THAN_OR_EQUALS,
-						false,
-						String.valueOf(getStartIntervalDate(infoInterval).toInstant(ZoneOffset.UTC).toEpochMilli()),
-						CRITERIA_PROJECT_CREATION_DATE
-				))
-				.build();
-	}
-
-	@Override
-	public Iterable<ProjectInfoResource> getAllProjectsInfo(Queryable filter, Pageable pageable) {
-		return PagedResourcesAssembler.pageConverter(ProjectSettingsConverter.TO_PROJECT_INFO_RESOURCE)
-				.apply(projectRepository.findProjectInfoByFilter(filter, pageable));
-	}
-
-	@Override
-	public ProjectInfoResource getProjectInfo(String projectName, String interval) {
-
-		Project project = projectRepository.findByName(normalizeId(projectName))
-				.orElseThrow(() -> new ReportPortalException(PROJECT_NOT_FOUND, projectName));
-
-		InfoInterval infoInterval = InfoInterval.findByInterval(interval)
-				.orElseThrow(() -> new ReportPortalException(BAD_REQUEST_ERROR, interval));
-
-		Filter filter = Filter.builder()
-				.withTarget(ProjectInfo.class)
-				.withCondition(FilterCondition.builder().eq(CRITERIA_PROJECT_NAME, project.getName()).build())
-				.build();
-
-		Page<ProjectInfo> result = projectRepository.findProjectInfoByFilter(filter, Pageable.unpaged());
-		ProjectInfoResource projectInfoResource = ProjectSettingsConverter.TO_PROJECT_INFO_RESOURCE.apply(result.get()
-				.findFirst()
-				.orElseThrow(() -> new ReportPortalException(PROJECT_NOT_FOUND, projectName)));
-
-		LocalDateTime startIntervalDate = getStartIntervalDate(infoInterval);
-
-		Map<String, Integer> countPerUser = launchRepository.countLaunchesGroupedByOwner(project.getId(),
-				LaunchModeEnum.DEFAULT.toString(),
-				startIntervalDate
-		);
-
-		projectInfoResource.setUniqueTickets(ticketRepository.findUniqueCountByProjectBefore(project.getId(), startIntervalDate));
-
-		projectInfoResource.setLaunchesPerUser(countPerUser.entrySet()
-				.stream()
-				.map(e -> new LaunchesPerUser(e.getKey(), e.getValue()))
-				.collect(Collectors.toList()));
-
-		if (projectInfoResource.getLaunchesQuantity() != 0) {
-			formatter.setRoundingMode(RoundingMode.HALF_UP);
-			double value = projectInfoResource.getLaunchesQuantity() / (infoInterval.getCount() * WEEKS_IN_MONTH);
-			projectInfoResource.setLaunchesPerWeek(formatter.format(value));
-		} else {
-			projectInfoResource.setLaunchesPerWeek(formatter.format(0));
-		}
-		return projectInfoResource;
-	}
-
-	@Override
-	public Map<String, ?> getProjectInfoWidgetContent(String projectName, String interval, String widgetCode) {
-		Project project = projectRepository.findByName(projectName)
-				.orElseThrow(() -> new ReportPortalException(PROJECT_NOT_FOUND, projectName));
-
-		InfoInterval infoInterval = InfoInterval.findByInterval(interval)
-				.orElseThrow(() -> new ReportPortalException(BAD_REQUEST_ERROR, interval));
-
-		ProjectInfoWidget widgetType = ProjectInfoWidget.findByCode(widgetCode)
-				.orElseThrow(() -> new ReportPortalException(BAD_REQUEST_ERROR, widgetCode));
-
-		List<Launch> launches = launchRepository.findByProjectIdAndStartTimeGreaterThanAndMode(project.getId(),
-				getStartIntervalDate(infoInterval),
-				LaunchModeEnum.DEFAULT
-		);
-
-		Map<String, ?> result;
-
-		switch (widgetType) {
-			case INVESTIGATED:
-				result = dataConverter.getInvestigatedProjectInfo(launches, infoInterval);
-				break;
-			case CASES_STATISTIC:
-				result = dataConverter.getTestCasesStatisticsProjectInfo(launches);
-				break;
-			case LAUNCHES_QUANTITY:
-				result = dataConverter.getLaunchesQuantity(launches, infoInterval);
-				break;
-			case ISSUES_CHART:
-				result = dataConverter.getLaunchesIssues(launches, infoInterval);
-				break;
-			case ACTIVITIES:
-				result = getActivities(project, infoInterval);
-				break;
-			case LAST_LAUNCH:
-				result = getLastLaunchStatistics(project.getId());
-				break;
-			default:
-				// empty result
-				result = Collections.emptyMap();
-		}
-
-		return result;
-	}
-
-	private Map<String, ?> getLastLaunchStatistics(Long projectId) {
-		Optional<Launch> launchOptional = launchRepository.findLastRun(projectId, Mode.DEFAULT.name());
-		return launchOptional.isPresent() ?
-				Collections.singletonMap(RESULT, launchConverter.TO_RESOURCE.apply(launchOptional.get())) :
-				Collections.emptyMap();
-	}
-
-	private Map<String, List<ActivityResource>> getActivities(Project project,
-			InfoInterval infoInterval) {
-		String value = Arrays.stream(ActivityAction.values())
-				.filter(not(ACTIVITIES_PROJECT_FILTER))
-				.map(ActivityAction::getValue)
-				.collect(joining(","));
-		Filter filter = new Filter(Activity.class,
-				Lists.newArrayList(new FilterCondition(IN, false, value, CRITERIA_EVENT_NAME),
-						new FilterCondition(EQUALS, false, String.valueOf(project.getId()),
-								CRITERIA_PROJECT_ID),
-						new FilterCondition(GREATER_THAN_OR_EQUALS,
-								false,
-								String.valueOf(Timestamp.valueOf(getStartIntervalDate(infoInterval)).getTime()),
-								CRITERIA_CREATED_AT
-						)
-				));
-		List<Activity> activities = activityRepository.findByFilter(filter,
-				PageRequest.of(0, LIMIT, Sort.by(Sort.Direction.DESC, CRITERIA_CREATED_AT))
-		).getContent();
-
-		Map<Long, String> userIdLoginMapping = userRepository.findAllById(activities.stream()
-				.filter(a -> a.getSubjectId() != null && a.getSubjectType() == EventSubject.USER)
-				.map(Activity::getSubjectId)
-				.collect(Collectors.toSet())).stream().collect(toMap(User::getId, User::getLogin));
-
-		return Collections.singletonMap(RESULT,
-				activities.stream()
-						.map(a -> ofNullable(a.getSubjectId()).map(
-										userId -> TO_RESOURCE_WITH_USER.apply(a, userIdLoginMapping.get(userId)))
-								.orElseGet(() -> TO_RESOURCE.apply(a)))
-						.peek(resource -> resource.setProjectName(project.getName()))
-						.collect(toList())
-		);
-	}
+  private static final Double WEEKS_IN_MONTH = 4.4;
+  private static final int LIMIT = 150;
+  private static final Predicate<ActivityAction> ACTIVITIES_PROJECT_FILTER =
+      it -> it == UPDATE_DEFECT || it == DELETE_DEFECT || it == LINK_ISSUE || it == LINK_ISSUE_AA
+          || it == UNLINK_ISSUE || it == UPDATE_ITEM;
+  private final ProjectRepository projectRepository;
+
+  private final LaunchRepository launchRepository;
+
+  private final ActivityRepository activityRepository;
+
+  private final ProjectInfoWidgetDataConverter dataConverter;
+
+  private final LaunchConverter launchConverter;
+
+  private final UserRepository userRepository;
+
+  private final TicketRepository ticketRepository;
+
+  private final DecimalFormat formatter = new DecimalFormat("###.##");
+
+  @Autowired
+  public GetProjectInfoHandlerImpl(ProjectRepository projectRepository,
+      LaunchRepository launchRepository, ActivityRepository activityRepository,
+      ProjectInfoWidgetDataConverter dataConverter, LaunchConverter launchConverter,
+      UserRepository userRepository, TicketRepository ticketRepository) {
+    this.projectRepository = projectRepository;
+    this.launchRepository = launchRepository;
+    this.activityRepository = activityRepository;
+    this.dataConverter = dataConverter;
+    this.launchConverter = launchConverter;
+    this.userRepository = userRepository;
+    this.ticketRepository = ticketRepository;
+  }
+
+  /**
+   * Utility method for calculation of start interval date
+   *
+   * @param interval Back interval
+   * @return Now minus interval
+   */
+  private static LocalDateTime getStartIntervalDate(InfoInterval interval) {
+    return LocalDateTime.now(Clock.systemUTC()).minusMonths(interval.getCount());
+  }
+
+  /**
+   * Filter that gets project info from selected date.
+   *
+   * @param project      Project
+   * @param infoInterval Date interval
+   * @return {@link Filter}
+   */
+  private static Filter projectInfoFilter(Project project, InfoInterval infoInterval) {
+    return Filter.builder().withTarget(ProjectInfo.class)
+        .withCondition(new FilterCondition(EQUALS, false, project.getName(), CRITERIA_PROJECT_NAME))
+        .withCondition(new FilterCondition(GREATER_THAN_OR_EQUALS, false, String.valueOf(
+            getStartIntervalDate(infoInterval).toInstant(ZoneOffset.UTC).toEpochMilli()),
+            CRITERIA_PROJECT_CREATION_DATE
+        )).build();
+  }
+
+  @Override
+  public Iterable<ProjectInfoResource> getAllProjectsInfo(Queryable filter, Pageable pageable) {
+    return PagedResourcesAssembler.pageConverter(ProjectSettingsConverter.TO_PROJECT_INFO_RESOURCE)
+        .apply(projectRepository.findProjectInfoByFilter(filter, pageable));
+  }
+
+  @Override
+  public ProjectInfoResource getProjectInfo(String projectName, String interval) {
+
+    Project project = projectRepository.findByName(normalizeId(projectName))
+        .orElseThrow(() -> new ReportPortalException(PROJECT_NOT_FOUND, projectName));
+
+    InfoInterval infoInterval = InfoInterval.findByInterval(interval)
+        .orElseThrow(() -> new ReportPortalException(BAD_REQUEST_ERROR, interval));
+
+    Filter filter = Filter.builder().withTarget(ProjectInfo.class).withCondition(
+        FilterCondition.builder().eq(CRITERIA_PROJECT_NAME, project.getName()).build()).build();
+
+    Page<ProjectInfo> result =
+        projectRepository.findProjectInfoByFilter(filter, Pageable.unpaged());
+    ProjectInfoResource projectInfoResource =
+        ProjectSettingsConverter.TO_PROJECT_INFO_RESOURCE.apply(result.get().findFirst()
+            .orElseThrow(() -> new ReportPortalException(PROJECT_NOT_FOUND, projectName)));
+
+    LocalDateTime startIntervalDate = getStartIntervalDate(infoInterval);
+
+    Map<String, Integer> countPerUser =
+        launchRepository.countLaunchesGroupedByOwner(project.getId(),
+            LaunchModeEnum.DEFAULT.toString(), startIntervalDate
+        );
+
+    projectInfoResource.setUniqueTickets(
+        ticketRepository.findUniqueCountByProjectBefore(project.getId(), startIntervalDate));
+
+    projectInfoResource.setLaunchesPerUser(
+        countPerUser.entrySet().stream().map(e -> new LaunchesPerUser(e.getKey(), e.getValue()))
+            .collect(Collectors.toList()));
+
+    if (projectInfoResource.getLaunchesQuantity() != 0) {
+      formatter.setRoundingMode(RoundingMode.HALF_UP);
+      double value =
+          projectInfoResource.getLaunchesQuantity() / (infoInterval.getCount() * WEEKS_IN_MONTH);
+      projectInfoResource.setLaunchesPerWeek(formatter.format(value));
+    } else {
+      projectInfoResource.setLaunchesPerWeek(formatter.format(0));
+    }
+    return projectInfoResource;
+  }
+
+  @Override
+  public Map<String, ?> getProjectInfoWidgetContent(String projectName, String interval,
+      String widgetCode) {
+    Project project = projectRepository.findByName(projectName)
+        .orElseThrow(() -> new ReportPortalException(PROJECT_NOT_FOUND, projectName));
+
+    InfoInterval infoInterval = InfoInterval.findByInterval(interval)
+        .orElseThrow(() -> new ReportPortalException(BAD_REQUEST_ERROR, interval));
+
+    ProjectInfoWidget widgetType = ProjectInfoWidget.findByCode(widgetCode)
+        .orElseThrow(() -> new ReportPortalException(BAD_REQUEST_ERROR, widgetCode));
+
+    List<Launch> launches =
+        launchRepository.findByProjectIdAndStartTimeGreaterThanAndMode(project.getId(),
+            getStartIntervalDate(infoInterval), LaunchModeEnum.DEFAULT
+        );
+
+    Map<String, ?> result;
+
+    switch (widgetType) {
+      case INVESTIGATED:
+        result = dataConverter.getInvestigatedProjectInfo(launches, infoInterval);
+        break;
+      case CASES_STATISTIC:
+        result = dataConverter.getTestCasesStatisticsProjectInfo(launches);
+        break;
+      case LAUNCHES_QUANTITY:
+        result = dataConverter.getLaunchesQuantity(launches, infoInterval);
+        break;
+      case ISSUES_CHART:
+        result = dataConverter.getLaunchesIssues(launches, infoInterval);
+        break;
+      case ACTIVITIES:
+        result = getActivities(project, infoInterval);
+        break;
+      case LAST_LAUNCH:
+        result = getLastLaunchStatistics(project.getId());
+        break;
+      default:
+        // empty result
+        result = Collections.emptyMap();
+    }
+
+    return result;
+  }
+
+  private Map<String, ?> getLastLaunchStatistics(Long projectId) {
+    Optional<Launch> launchOptional = launchRepository.findLastRun(projectId, Mode.DEFAULT.name());
+    return launchOptional.isPresent() ?
+        Collections.singletonMap(RESULT, launchConverter.TO_RESOURCE.apply(launchOptional.get())) :
+        Collections.emptyMap();
+  }
+
+  private Map<String, List<ActivityResource>> getActivities(Project project,
+      InfoInterval infoInterval) {
+    String value = Arrays.stream(ActivityAction.values()).filter(not(ACTIVITIES_PROJECT_FILTER))
+        .map(ActivityAction::getValue).collect(joining(","));
+    Filter filter = new Filter(Activity.class,
+        Lists.newArrayList(new FilterCondition(IN, false, value, CRITERIA_EVENT_NAME),
+            new FilterCondition(EQUALS, false, String.valueOf(project.getId()),
+                CRITERIA_PROJECT_ID
+            ), new FilterCondition(GREATER_THAN_OR_EQUALS, false,
+                String.valueOf(Timestamp.valueOf(getStartIntervalDate(infoInterval)).getTime()),
+                CRITERIA_CREATED_AT
+            )
+        )
+    );
+    List<Activity> activities = activityRepository.findByFilter(filter,
+        PageRequest.of(0, LIMIT, Sort.by(Sort.Direction.DESC, CRITERIA_CREATED_AT))
+    ).getContent();
+
+    Map<Long, String> userIdLoginMapping = userRepository.findAllById(activities.stream()
+            .filter(a -> a.getSubjectId() != null && a.getSubjectType() == EventSubject.USER)
+            .map(Activity::getSubjectId).collect(Collectors.toSet())).stream()
+        .collect(toMap(User::getId, User::getLogin));
+
+    return Collections.singletonMap(RESULT, activities.stream().map(
+            a -> ofNullable(a.getSubjectId()).map(
+                    userId -> TO_RESOURCE_WITH_USER.apply(a, userIdLoginMapping.get(userId)))
+                .orElseGet(() -> TO_RESOURCE.apply(a)))
+        .peek(resource -> resource.setProjectName(project.getName())).collect(toList()));
+  }
 }
diff --git a/src/main/java/com/epam/ta/reportportal/core/project/impl/ProjectInfoWidgetDataConverter.java b/src/main/java/com/epam/ta/reportportal/core/project/impl/ProjectInfoWidgetDataConverter.java
index fd5ca58e5f..3d35fb1f42 100644
--- a/src/main/java/com/epam/ta/reportportal/core/project/impl/ProjectInfoWidgetDataConverter.java
+++ b/src/main/java/com/epam/ta/reportportal/core/project/impl/ProjectInfoWidgetDataConverter.java
@@ -30,7 +30,7 @@
 import com.epam.ta.reportportal.entity.enums.InfoInterval;
 import com.epam.ta.reportportal.entity.launch.Launch;
 import com.epam.ta.reportportal.entity.statistics.Statistics;
-import com.epam.ta.reportportal.ws.model.widget.ChartObject;
+import com.epam.ta.reportportal.model.widget.ChartObject;
 import com.google.common.collect.Lists;
 import java.text.DecimalFormat;
 import java.time.LocalDate;
@@ -70,24 +70,20 @@ public ProjectInfoWidgetDataConverter(
   }
 
   public enum ProjectInfoGroup {
-    BY_DAY,
-    BY_WEEK,
-    BY_NAME
+    BY_DAY, BY_WEEK, BY_NAME
   }
 
-  private static DateTimeFormatter formatter = new DateTimeFormatterBuilder().appendValue(
-          IsoFields.WEEK_BASED_YEAR, 4)
-      .appendLiteral("-W")
-      .appendValue(IsoFields.WEEK_OF_WEEK_BASED_YEAR, 2)
-      .toFormatter();
+  private static DateTimeFormatter formatter =
+      new DateTimeFormatterBuilder().appendValue(IsoFields.WEEK_BASED_YEAR, 4).appendLiteral("-W")
+          .appendValue(IsoFields.WEEK_OF_WEEK_BASED_YEAR, 2).toFormatter();
 
   /**
    * <b>Percentage Of Investigation</b> project info widget content
    *
-   * @param initial   A list of {@link Launch} objects to calculate investigation percentages
-   * @param interval  An {@link InfoInterval} representing the grouping interval (e.g., daily, weekly)
+   * @param initial  A list of {@link Launch} objects to calculate investigation percentages
+   * @param interval An {@link InfoInterval} representing the grouping interval (e.g., daily, weekly)
    * @return A {@link Map} with keys representing interval group names and values containing
-   *         {@link List} of {@link ChartObject} instances with investigated and to-investigate percentage information
+   * {@link List} of {@link ChartObject} instances with investigated and to-investigate percentage information
    */
   public Map<String, List<ChartObject>> getInvestigatedProjectInfo(List<Launch> initial,
       InfoInterval interval) {
@@ -111,12 +107,11 @@ public Map<String, List<ChartObject>> getInvestigatedProjectInfo(List<Launch> in
       for (Launch one : group) {
         investigated =
             investigated + extractStatisticsCount(DEFECTS_PRODUCT_BUG_TOTAL, one.getStatistics())
-                + extractStatisticsCount(
-                DEFECTS_SYSTEM_ISSUE_TOTAL,
-                one.getStatistics()
-            ) + extractStatisticsCount(DEFECTS_AUTOMATION_BUG_TOTAL, one.getStatistics());
+                + extractStatisticsCount(DEFECTS_SYSTEM_ISSUE_TOTAL, one.getStatistics())
+                + extractStatisticsCount(DEFECTS_AUTOMATION_BUG_TOTAL, one.getStatistics());
         toInvestigate = toInvestigate + extractStatisticsCount(DEFECTS_TO_INVESTIGATE_TOTAL,
-            one.getStatistics());
+            one.getStatistics()
+        );
       }
       if ((investigated + toInvestigate) > 0) {
         double investigatedPercent = (investigated / (investigated + toInvestigate)) * 100;
@@ -140,7 +135,7 @@ public Map<String, List<ChartObject>> getInvestigatedProjectInfo(List<Launch> in
    *
    * @param initial A list of {@link Launch} objects to calculate test-case statistics
    * @return A {@link Map} with keys representing launch names and values containing
-   *         {@link List} of {@link ChartObject} instances with min, max, and average statistics
+   * {@link List} of {@link ChartObject} instances with min, max, and average statistics
    */
   public Map<String, List<ChartObject>> getTestCasesStatisticsProjectInfo(List<Launch> initial) {
     DecimalFormat formatter = new DecimalFormat("#####.##");
@@ -161,14 +156,10 @@ public Map<String, List<ChartObject>> getTestCasesStatisticsProjectInfo(List<Lau
       Map<String, String> values = new HashMap<>();
       List<Launch> group = pair.getValue();
 
-      DoubleSummaryStatistics statistics = group.stream()
-          .mapToDouble(launch -> launch.getStatistics()
-              .stream()
+      DoubleSummaryStatistics statistics = group.stream().mapToDouble(
+          launch -> launch.getStatistics().stream()
               .filter(it -> it.getStatisticsField().getName().equalsIgnoreCase(EXECUTIONS_TOTAL))
-              .findFirst()
-              .orElse(new Statistics())
-              .getCounter())
-          .summaryStatistics();
+              .findFirst().orElse(new Statistics()).getCounter()).summaryStatistics();
 
       values.put(MIN, String.valueOf(statistics.getMin()));
       values.put(MAX, String.valueOf(statistics.getMax()));
@@ -189,10 +180,10 @@ public Map<String, List<ChartObject>> getTestCasesStatisticsProjectInfo(List<Lau
   /**
    * <b>Quantity of Launches</b> project info widget content
    *
-   * @param initial A list of {@link Launch} objects to calculate the quantity of launches
+   * @param initial  A list of {@link Launch} objects to calculate the quantity of launches
    * @param interval An {@link InfoInterval} representing the grouping interval (e.g., daily, weekly)
    * @return A {@link Map} with keys representing interval group names and values containing
-   *         {@link List} of {@link ChartObject} instances with launch quantity information
+   * {@link List} of {@link ChartObject} instances with launch quantity information
    */
   public Map<String, List<ChartObject>> getLaunchesQuantity(List<Launch> initial,
       InfoInterval interval) {
@@ -217,7 +208,8 @@ public Map<String, List<ChartObject>> getLaunchesQuantity(List<Launch> initial,
         DateTime parse = DateTime.parse(entry.getKey());
         // TODO remove Yoda time. replace with JDK8
         values.put(START_PERIOD,
-            parse.withDayOfWeek(DateTimeConstants.MONDAY).toString("yyy-MM-dd"));
+            parse.withDayOfWeek(DateTimeConstants.MONDAY).toString("yyy-MM-dd")
+        );
         values.put(END_PERIOD, parse.withDayOfWeek(DateTimeConstants.SUNDAY).toString("yyy-MM-dd"));
       } else {
         values.put(START_PERIOD, entry.getKey());
@@ -232,10 +224,10 @@ public Map<String, List<ChartObject>> getLaunchesQuantity(List<Launch> initial,
   /**
    * <b>Launch statistics line chart</b> project info widget content
    *
-   * @param initial A list of {@link Launch} objects to calculate the issues
+   * @param initial  A list of {@link Launch} objects to calculate the issues
    * @param interval An {@link InfoInterval} representing the grouping interval (e.g., daily, weekly)
    * @return A {@link Map} with keys representing interval group names and values containing
-   *         {@link List} of {@link ChartObject} instances with issue count information
+   * {@link List} of {@link ChartObject} instances with issue count information
    */
   public Map<String, List<ChartObject>> getLaunchesIssues(List<Launch> initial,
       InfoInterval interval) {
@@ -280,7 +272,7 @@ public Map<String, List<ChartObject>> getLaunchesIssues(List<Launch> initial,
    * @param initial  A list of {@link Launch} objects to be grouped
    * @param criteria The {@link ProjectInfoGroup} criteria that determines the grouping key
    * @return A map where the keys represent the grouping parameters (e.g., launch names or formatted dates)
-   *         and the values are lists of {@link Launch} objects grouped under that key
+   * and the values are lists of {@link Launch} objects grouped under that key
    */
   private static Map<String, List<Launch>> groupBy(List<Launch> initial,
       ProjectInfoGroup criteria) {
diff --git a/src/main/java/com/epam/ta/reportportal/core/project/impl/ProjectUserHandlerImpl.java b/src/main/java/com/epam/ta/reportportal/core/project/impl/ProjectUserHandlerImpl.java
index 671868258d..31b8c3bba7 100644
--- a/src/main/java/com/epam/ta/reportportal/core/project/impl/ProjectUserHandlerImpl.java
+++ b/src/main/java/com/epam/ta/reportportal/core/project/impl/ProjectUserHandlerImpl.java
@@ -7,7 +7,7 @@
 import com.epam.ta.reportportal.entity.project.ProjectRole;
 import com.epam.ta.reportportal.entity.user.ProjectUser;
 import com.epam.ta.reportportal.entity.user.User;
-import com.epam.ta.reportportal.ws.model.activity.UserActivityResource;
+import com.epam.ta.reportportal.model.activity.UserActivityResource;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.ApplicationEventPublisher;
 import org.springframework.stereotype.Service;
@@ -28,13 +28,14 @@ public ProjectUserHandlerImpl(ApplicationEventPublisher eventPublisher,
   @Override
   public ProjectUser assign(User user, Project project, ProjectRole projectRole, User creator,
       boolean isSystemEvent) {
-    final ProjectUser projectUser = new ProjectUser().withProjectRole(projectRole)
-        .withUser(user)
-        .withProject(project);
+    final ProjectUser projectUser =
+        new ProjectUser().withProjectRole(projectRole).withUser(user).withProject(project);
     projectUserRepository.save(projectUser);
 
-    AssignUserEvent assignUserEvent = new AssignUserEvent(getUserActivityResource(user, project),
-        creator.getId(), creator.getLogin(), isSystemEvent);
+    AssignUserEvent assignUserEvent =
+        new AssignUserEvent(getUserActivityResource(user, project), creator.getId(),
+            creator.getLogin(), isSystemEvent
+        );
     eventPublisher.publishEvent(assignUserEvent);
 
     return projectUser;
diff --git a/src/main/java/com/epam/ta/reportportal/core/project/impl/UpdateProjectHandlerImpl.java b/src/main/java/com/epam/ta/reportportal/core/project/impl/UpdateProjectHandlerImpl.java
index 685702ac58..743ec71b59 100644
--- a/src/main/java/com/epam/ta/reportportal/core/project/impl/UpdateProjectHandlerImpl.java
+++ b/src/main/java/com/epam/ta/reportportal/core/project/impl/UpdateProjectHandlerImpl.java
@@ -77,6 +77,15 @@
 import com.epam.ta.reportportal.entity.user.UserRole;
 import com.epam.ta.reportportal.entity.user.UserType;
 import com.epam.ta.reportportal.exception.ReportPortalException;
+import com.epam.ta.reportportal.model.activity.ProjectAttributesActivityResource;
+import com.epam.ta.reportportal.model.activity.UserActivityResource;
+import com.epam.ta.reportportal.model.project.AssignUsersRQ;
+import com.epam.ta.reportportal.model.project.ProjectResource;
+import com.epam.ta.reportportal.model.project.UnassignUsersRQ;
+import com.epam.ta.reportportal.model.project.UpdateProjectRQ;
+import com.epam.ta.reportportal.model.project.config.ProjectConfigurationUpdate;
+import com.epam.ta.reportportal.model.project.email.ProjectNotificationConfigDTO;
+import com.epam.ta.reportportal.model.project.email.SenderCaseDTO;
 import com.epam.ta.reportportal.util.ProjectExtractor;
 import com.epam.ta.reportportal.util.email.EmailRulesValidator;
 import com.epam.ta.reportportal.util.email.MailServiceFactory;
@@ -86,16 +95,7 @@
 import com.epam.ta.reportportal.ws.model.ErrorType;
 import com.epam.ta.reportportal.ws.model.OperationCompletionRS;
 import com.epam.ta.reportportal.ws.model.ValidationConstraints;
-import com.epam.ta.reportportal.ws.model.activity.ProjectAttributesActivityResource;
-import com.epam.ta.reportportal.ws.model.activity.UserActivityResource;
 import com.epam.ta.reportportal.ws.model.attribute.ItemAttributeResource;
-import com.epam.ta.reportportal.ws.model.project.AssignUsersRQ;
-import com.epam.ta.reportportal.ws.model.project.ProjectResource;
-import com.epam.ta.reportportal.ws.model.project.UnassignUsersRQ;
-import com.epam.ta.reportportal.ws.model.project.UpdateProjectRQ;
-import com.epam.ta.reportportal.ws.model.project.config.ProjectConfigurationUpdate;
-import com.epam.ta.reportportal.ws.model.project.email.ProjectNotificationConfigDTO;
-import com.epam.ta.reportportal.ws.model.project.email.SenderCaseDTO;
 import com.google.common.cache.Cache;
 import com.google.common.collect.Lists;
 import java.util.List;
@@ -150,13 +150,11 @@ public class UpdateProjectHandlerImpl implements UpdateProjectHandler {
 
   @Autowired
   public UpdateProjectHandlerImpl(ProjectExtractor projectExtractor,
-      ProjectAttributeValidator projectAttributeValidator,
-      ProjectRepository projectRepository, UserRepository userRepository,
-      UserPreferenceRepository preferenceRepository,
+      ProjectAttributeValidator projectAttributeValidator, ProjectRepository projectRepository,
+      UserRepository userRepository, UserPreferenceRepository preferenceRepository,
       MessageBus messageBus, ProjectUserRepository projectUserRepository,
-      ApplicationEventPublisher applicationEventPublisher,
-      MailServiceFactory mailServiceFactory, AnalyzerStatusCache analyzerStatusCache,
-      IndexerStatusCache indexerStatusCache,
+      ApplicationEventPublisher applicationEventPublisher, MailServiceFactory mailServiceFactory,
+      AnalyzerStatusCache analyzerStatusCache, IndexerStatusCache indexerStatusCache,
       AnalyzerServiceClient analyzerServiceClient, LogIndexer logIndexer,
       ProjectConverter projectConverter) {
     this.projectExtractor = projectExtractor;
@@ -196,27 +194,22 @@ public OperationCompletionRS updateProject(String projectName, UpdateProjectRQ u
 
   @Override
   public OperationCompletionRS updateProjectNotificationConfig(String projectName,
-      ReportPortalUser user,
-      ProjectNotificationConfigDTO updateProjectNotificationConfigRQ) {
+      ReportPortalUser user, ProjectNotificationConfigDTO updateProjectNotificationConfigRQ) {
     Project project = projectRepository.findByName(projectName)
         .orElseThrow(() -> new ReportPortalException(ErrorType.PROJECT_NOT_FOUND, projectName));
     ProjectResource before = projectConverter.TO_PROJECT_RESOURCE.apply(project);
 
     updateSenderCases(project, updateProjectNotificationConfigRQ.getSenderCases());
 
-    project.getProjectAttributes()
-        .stream()
-        .filter(it -> it.getAttribute().getName()
-            .equalsIgnoreCase(ProjectAttributeEnum.NOTIFICATIONS_ENABLED.getAttribute()))
-        .findAny()
+    project.getProjectAttributes().stream().filter(it -> it.getAttribute().getName()
+            .equalsIgnoreCase(ProjectAttributeEnum.NOTIFICATIONS_ENABLED.getAttribute())).findAny()
         .ifPresent(
             pa -> pa.setValue(String.valueOf(updateProjectNotificationConfigRQ.isEnabled())));
 
-    messageBus.publishActivity(new NotificationsConfigUpdatedEvent(before,
-        updateProjectNotificationConfigRQ,
-        user.getUserId(),
-        user.getUsername()
-    ));
+    messageBus.publishActivity(
+        new NotificationsConfigUpdatedEvent(before, updateProjectNotificationConfigRQ,
+            user.getUserId(), user.getUsername()
+        ));
     return new OperationCompletionRS(
         "Notification configuration of project - '" + projectName + "' is successfully updated.");
   }
@@ -233,9 +226,7 @@ public OperationCompletionRS unassignUsers(String projectName, UnassignUsersRQ u
         .orElseThrow(() -> new ReportPortalException(USER_NOT_FOUND, user.getUsername()));
     if (!UserRole.ADMINISTRATOR.equals(modifier.getRole())) {
       expect(unassignUsersRQ.getUsernames(), not(contains(equalTo(modifier.getLogin())))).verify(
-          UNABLE_ASSIGN_UNASSIGN_USER_TO_PROJECT,
-          "User should not unassign himself from project."
-      );
+          UNABLE_ASSIGN_UNASSIGN_USER_TO_PROJECT, "User should not unassign himself from project.");
     }
 
     List<ProjectUser> unassignedUsers =
@@ -244,21 +235,19 @@ public OperationCompletionRS unassignUsers(String projectName, UnassignUsersRQ u
     ProjectUtils.excludeProjectRecipients(
         unassignedUsers.stream().map(ProjectUser::getUser).collect(Collectors.toSet()), project);
     unassignedUsers.forEach(it -> preferenceRepository.removeByProjectIdAndUserId(project.getId(),
-        it.getUser().getId()));
+        it.getUser().getId()
+    ));
 
-    return new OperationCompletionRS(
-        "User(s) with username(s)='" + unassignUsersRQ.getUsernames()
-            + "' was successfully un-assigned from project='"
-            + project.getName() + "'");
+    return new OperationCompletionRS("User(s) with username(s)='" + unassignUsersRQ.getUsernames()
+        + "' was successfully un-assigned from project='" + project.getName() + "'");
   }
 
   @Override
   public OperationCompletionRS assignUsers(String projectName, AssignUsersRQ assignUsersRQ,
       ReportPortalUser user) {
     if (UserRole.ADMINISTRATOR.equals(user.getUserRole())) {
-      Project project = projectRepository.findByName(normalizeId(projectName))
-          .orElseThrow(() -> new ReportPortalException(ErrorType.PROJECT_NOT_FOUND,
-              normalizeId(projectName)));
+      Project project = projectRepository.findByName(normalizeId(projectName)).orElseThrow(
+          () -> new ReportPortalException(ErrorType.PROJECT_NOT_FOUND, normalizeId(projectName)));
 
       List<String> assignedUsernames =
           project.getUsers().stream().map(u -> u.getUser().getLogin()).collect(toList());
@@ -269,16 +258,15 @@ public OperationCompletionRS assignUsers(String projectName, AssignUsersRQ assig
       });
     } else {
       expect(assignUsersRQ.getUserNames().keySet(),
-          not(Preconditions.contains(equalTo(user.getUsername())))).verify(
-          UNABLE_ASSIGN_UNASSIGN_USER_TO_PROJECT,
+          not(Preconditions.contains(equalTo(user.getUsername())))
+      ).verify(UNABLE_ASSIGN_UNASSIGN_USER_TO_PROJECT,
           "User should not assign himself to project."
       );
 
       ReportPortalUser.ProjectDetails projectDetails =
           projectExtractor.extractProjectDetails(user, projectName);
-      Project project = projectRepository.findById(projectDetails.getProjectId())
-          .orElseThrow(() -> new ReportPortalException(ErrorType.PROJECT_NOT_FOUND,
-              normalizeId(projectName)));
+      Project project = projectRepository.findById(projectDetails.getProjectId()).orElseThrow(
+          () -> new ReportPortalException(ErrorType.PROJECT_NOT_FOUND, normalizeId(projectName)));
 
       List<String> assignedUsernames =
           project.getUsers().stream().map(u -> u.getUser().getLogin()).collect(toList());
@@ -295,16 +283,13 @@ public OperationCompletionRS assignUsers(String projectName, AssignUsersRQ assig
 
     return new OperationCompletionRS(
         "User(s) with username='" + assignUsersRQ.getUserNames().keySet()
-            + "' was successfully assigned to project='"
-            + normalizeId(projectName) + "'");
+            + "' was successfully assigned to project='" + normalizeId(projectName) + "'");
   }
 
   @Override
   public OperationCompletionRS indexProjectData(String projectName, ReportPortalUser user) {
     expect(analyzerServiceClient.hasClients(), Predicate.isEqual(true)).verify(
-        ErrorType.UNABLE_INTERACT_WITH_INTEGRATION,
-        "There are no analyzer deployed."
-    );
+        ErrorType.UNABLE_INTERACT_WITH_INTEGRATION, "There are no analyzer deployed.");
 
     Project project = projectRepository.findByName(projectName)
         .orElseThrow(() -> new ReportPortalException(PROJECT_NOT_FOUND, projectName));
@@ -318,20 +303,20 @@ public OperationCompletionRS indexProjectData(String projectName, ReportPortalUs
         .orElseThrow(
             () -> new ReportPortalException(ErrorType.ANALYZER_NOT_FOUND, AUTO_ANALYZER_KEY));
     expect(analyzeStatus.asMap().containsValue(project.getId()), equalTo(false)).verify(
-        ErrorType.FORBIDDEN_OPERATION,
-        "Index can not be removed until auto-analysis proceeds."
-    );
+        ErrorType.FORBIDDEN_OPERATION, "Index can not be removed until auto-analysis proceeds.");
 
     logIndexer.deleteIndex(project.getId());
 
-    logIndexer.index(project.getId(), AnalyzerUtils.getAnalyzerConfig(project))
-        .thenAcceptAsync(indexedCount -> mailServiceFactory.getDefaultEmailService(true)
+    logIndexer.index(project.getId(), AnalyzerUtils.getAnalyzerConfig(project)).thenAcceptAsync(
+        indexedCount -> mailServiceFactory.getDefaultEmailService(true)
             .sendIndexFinishedEmail("Index generation has been finished", user.getEmail(),
-                indexedCount));
+                indexedCount
+            ));
 
     messageBus.publishActivity(
         new ProjectIndexEvent(user.getUserId(), user.getUsername(), project.getId(),
-            project.getName(), true));
+            project.getName(), true
+        ));
     return new OperationCompletionRS("Log indexing has been started");
   }
 
@@ -354,18 +339,16 @@ private List<ProjectUser> unassignUsers(List<String> usernames, User modifier, P
       usernames.forEach(username -> {
         User userForUnassign = userRepository.findByLogin(username)
             .orElseThrow(() -> new ReportPortalException(USER_NOT_FOUND, username));
-        ProjectUser projectUser = userForUnassign.getProjects()
-            .stream()
-            .filter(it -> Objects.equals(it.getProject().getId(), project.getId()))
-            .findFirst()
-            .orElseThrow(() -> new ReportPortalException(USER_NOT_FOUND,
-                userForUnassign.getLogin(),
+        ProjectUser projectUser = userForUnassign.getProjects().stream()
+            .filter(it -> Objects.equals(it.getProject().getId(), project.getId())).findFirst()
+            .orElseThrow(() -> new ReportPortalException(USER_NOT_FOUND, userForUnassign.getLogin(),
                 String.format("User not found in project %s", project.getName())
             ));
 
-        expect(projectDetails.getProjectRole().sameOrHigherThan(projectUser.getProjectRole()),
-            BooleanUtils::isTrue).verify(
-            ACCESS_DENIED);
+        expect(
+            projectDetails.getProjectRole().sameOrHigherThan(projectUser.getProjectRole()),
+            BooleanUtils::isTrue
+        ).verify(ACCESS_DENIED);
 
         validateUnassigningUser(modifier, userForUnassign, project.getId(), project);
         unassignedUsers.add(unassignUser(project, username, userForUnassign, user));
@@ -378,18 +361,16 @@ private List<ProjectUser> unassignUsers(List<String> usernames, User modifier, P
 
   private ProjectUser unassignUser(Project project, String username, User userForUnassign,
       ReportPortalUser authorizedUser) {
-    ProjectUser projectUser = project.getUsers()
-        .stream()
-        .filter(it -> it.getUser().getLogin().equalsIgnoreCase(username))
-        .findFirst()
-        .orElseThrow(() -> new ReportPortalException(USER_NOT_FOUND, username));
+    ProjectUser projectUser =
+        project.getUsers().stream().filter(it -> it.getUser().getLogin().equalsIgnoreCase(username))
+            .findFirst().orElseThrow(() -> new ReportPortalException(USER_NOT_FOUND, username));
     project.getUsers().remove(projectUser);
     userForUnassign.getProjects().remove(projectUser);
 
-    UnassignUserEvent unassignUserEvent = new UnassignUserEvent(
-        convertUserToResource(userForUnassign, projectUser),
-        authorizedUser.getUserId(),
-        authorizedUser.getUsername());
+    UnassignUserEvent unassignUserEvent =
+        new UnassignUserEvent(convertUserToResource(userForUnassign, projectUser),
+            authorizedUser.getUserId(), authorizedUser.getUsername()
+        );
     applicationEventPublisher.publishEvent(unassignUserEvent);
 
     return projectUser;
@@ -418,20 +399,22 @@ private void assignUser(String name, ProjectRole projectRole, List<String> assig
     projectUser.setProject(project);
     project.getUsers().add(projectUser);
 
-    AssignUserEvent assignUserEvent = new AssignUserEvent(
-        convertUserToResource(modifyingUser, projectUser),
-        authorizedUser.getUserId(),
-        authorizedUser.getUsername(),
-        false);
+    AssignUserEvent assignUserEvent =
+        new AssignUserEvent(convertUserToResource(modifyingUser, projectUser),
+            authorizedUser.getUserId(), authorizedUser.getUsername(), false
+        );
     applicationEventPublisher.publishEvent(assignUserEvent);
   }
 
   private void validateUnassigningUser(User modifier, User userForUnassign, Long projectId,
       Project project) {
     if (ProjectUtils.isPersonalForUser(project.getProjectType(), project.getName(),
-        userForUnassign.getLogin())) {
-      fail().withError(UNABLE_ASSIGN_UNASSIGN_USER_TO_PROJECT,
-          "Unable to unassign user from his personal project");
+        userForUnassign.getLogin()
+    )) {
+      fail().withError(
+          UNABLE_ASSIGN_UNASSIGN_USER_TO_PROJECT,
+          "Unable to unassign user from his personal project"
+      );
     }
     if (ProjectType.UPSA.equals(project.getProjectType()) && UserType.UPSA.equals(
         userForUnassign.getUserType())) {
@@ -439,7 +422,8 @@ private void validateUnassigningUser(User modifier, User userForUnassign, Long p
     }
     if (!ProjectUtils.doesHaveUser(project, userForUnassign.getLogin())) {
       fail().withError(USER_NOT_FOUND, userForUnassign.getLogin(),
-          String.format("User not found in project %s", project.getName()));
+          String.format("User not found in project %s", project.getName())
+      );
     }
   }
 
@@ -464,10 +448,9 @@ private void updateProjectUserRoles(Map<String, String> userRoles, Project proje
         if (UserRole.ADMINISTRATOR != user.getUserRole()) {
           ProjectRole principalRole =
               projectExtractor.extractProjectDetails(user, project.getName()).getProjectRole();
-          ProjectRole updatingUserRole = ofNullable(ProjectUtils.findUserConfigByLogin(project,
-              key
-          )).orElseThrow(() -> new ReportPortalException(ErrorType.USER_NOT_FOUND, key))
-              .getProjectRole();
+          ProjectRole updatingUserRole =
+              ofNullable(ProjectUtils.findUserConfigByLogin(project, key)).orElseThrow(
+                  () -> new ReportPortalException(ErrorType.USER_NOT_FOUND, key)).getProjectRole();
           /*
            * Validate principal role level is high enough
            */
@@ -490,17 +473,20 @@ private void updateProjectUserRoles(Map<String, String> userRoles, Project proje
   private void publishChangeRoleEvent(ReportPortalUser loggedUser, ProjectUser updatingProjectUser,
       String oldRole) {
     String newRole = updatingProjectUser.getProjectRole().getRoleName();
-    ChangeRoleEvent changeRoleEvent = getChangeRoleEvent(updatingProjectUser.getUser(),
-        updatingProjectUser.getProject().getId(), loggedUser, oldRole, newRole);
+    ChangeRoleEvent changeRoleEvent =
+        getChangeRoleEvent(updatingProjectUser.getUser(), updatingProjectUser.getProject().getId(),
+            loggedUser, oldRole, newRole
+        );
     applicationEventPublisher.publishEvent(changeRoleEvent);
   }
 
   private ChangeRoleEvent getChangeRoleEvent(User updatingUser, Long projectId,
       ReportPortalUser loggedUser, String oldRole, String newRole) {
-    UserActivityResource userActivityResource = new UserActivityResource(updatingUser.getId(),
-        projectId, updatingUser.getLogin());
+    UserActivityResource userActivityResource =
+        new UserActivityResource(updatingUser.getId(), projectId, updatingUser.getLogin());
     return new ChangeRoleEvent(userActivityResource, oldRole, newRole, loggedUser.getUserId(),
-        loggedUser.getUsername());
+        loggedUser.getUsername()
+    );
   }
 
   private void updateProjectConfiguration(ProjectConfigurationUpdate configuration,
@@ -509,10 +495,8 @@ private void updateProjectConfiguration(ProjectConfigurationUpdate configuration
         .ifPresent(attributes -> {
           projectAttributeValidator.verifyProjectAttributes(
               ProjectUtils.getConfigParameters(project.getProjectAttributes()), attributes);
-          attributes.forEach((attribute, value) -> project.getProjectAttributes()
-              .stream()
-              .filter(it -> it.getAttribute().getName().equalsIgnoreCase(attribute))
-              .findFirst()
+          attributes.forEach((attribute, value) -> project.getProjectAttributes().stream()
+              .filter(it -> it.getAttribute().getName().equalsIgnoreCase(attribute)).findFirst()
               .ifPresent(attr -> attr.setValue(value)));
         });
   }
@@ -525,7 +509,8 @@ private void updateSenderCases(Project project, List<SenderCaseDTO> cases) {
         expect(findByName(sendCase.getSendCase()).isPresent(), equalTo(true)).verify(
             BAD_REQUEST_ERROR, sendCase.getSendCase());
         expect(sendCase.getRecipients(), notNull()).verify(BAD_REQUEST_ERROR,
-            "Recipients list should not be null");
+            "Recipients list should not be null"
+        );
         expect(sendCase.getRecipients().isEmpty(), equalTo(false)).verify(BAD_REQUEST_ERROR,
             formattedSupplier("Empty recipients list for email case '{}' ", sendCase)
         );
@@ -550,11 +535,9 @@ private void updateSenderCases(Project project, List<SenderCaseDTO> cases) {
       });
 
       /* If project email settings */
-      Set<SenderCase> withoutDuplicateCases = cases.stream()
-          .distinct()
-          .map(NotificationConfigConverter.TO_CASE_MODEL)
-          .peek(sc -> sc.setProject(project))
-          .collect(toSet());
+      Set<SenderCase> withoutDuplicateCases =
+          cases.stream().distinct().map(NotificationConfigConverter.TO_CASE_MODEL)
+              .peek(sc -> sc.setProject(project)).collect(toSet());
       if (cases.size() != withoutDuplicateCases.size()) {
         fail().withError(BAD_REQUEST_ERROR, "Project email settings contain duplicate cases");
       }
@@ -578,9 +561,9 @@ private void cutAttributeToMaxLength(ItemAttributeResource entity) {
   /**
    * Resolves and publishes activities according to changed attributes
    *
-   * @param before        Object before update
-   * @param after         Object after update
-   * @param user          User
+   * @param before              Object before update
+   * @param after               Object after update
+   * @param user                User
    * @param updateConfiguration Configuration fields that has been updated
    */
   private void publishUpdatedAttributesActivities(ProjectAttributesActivityResource before,
@@ -594,13 +577,15 @@ private void publishUpdatedAttributesActivities(ProjectAttributesActivityResourc
 
     if (ActivityDetailsUtil.configChanged(before.getConfig(), after.getConfig(), Prefix.ANALYZER)) {
       if (ActivityDetailsUtil.extractConfigByPrefix(updateConfiguration.getProjectAttributes(),
-          AUTO_PATTERN_ANALYZER_ENABLED.getAttribute()).isEmpty()) {
+          AUTO_PATTERN_ANALYZER_ENABLED.getAttribute()
+      ).isEmpty()) {
         applicationEventPublisher.publishEvent(
             new ProjectAnalyzerConfigEvent(before, after, user.getUserId(), user.getUsername()));
       } else {
         applicationEventPublisher.publishEvent(
             new ProjectPatternAnalyzerUpdateEvent(before, after, user.getUserId(),
-                user.getUsername()));
+                user.getUsername()
+            ));
       }
     }
   }
diff --git a/src/main/java/com/epam/ta/reportportal/core/project/settings/CreateProjectSettingsHandler.java b/src/main/java/com/epam/ta/reportportal/core/project/settings/CreateProjectSettingsHandler.java
index e0e3297479..bf64d06762 100644
--- a/src/main/java/com/epam/ta/reportportal/core/project/settings/CreateProjectSettingsHandler.java
+++ b/src/main/java/com/epam/ta/reportportal/core/project/settings/CreateProjectSettingsHandler.java
@@ -17,10 +17,10 @@
 package com.epam.ta.reportportal.core.project.settings;
 
 import com.epam.ta.reportportal.commons.ReportPortalUser;
-import com.epam.ta.reportportal.ws.model.EntryCreatedRS;
-import com.epam.ta.reportportal.ws.model.project.config.CreateIssueSubTypeRQ;
-import com.epam.ta.reportportal.ws.model.project.config.IssueSubTypeCreatedRS;
-import com.epam.ta.reportportal.ws.model.project.config.pattern.CreatePatternTemplateRQ;
+import com.epam.ta.reportportal.model.EntryCreatedRS;
+import com.epam.ta.reportportal.model.project.config.CreateIssueSubTypeRQ;
+import com.epam.ta.reportportal.model.project.config.IssueSubTypeCreatedRS;
+import com.epam.ta.reportportal.model.project.config.pattern.CreatePatternTemplateRQ;
 
 /**
  * @author <a href="mailto:ihar_kahadouski@epam.com">Ihar Kahadouski</a>
diff --git a/src/main/java/com/epam/ta/reportportal/core/project/settings/GetProjectSettingsHandler.java b/src/main/java/com/epam/ta/reportportal/core/project/settings/GetProjectSettingsHandler.java
index f3b4e0f644..9cfb8a39b0 100644
--- a/src/main/java/com/epam/ta/reportportal/core/project/settings/GetProjectSettingsHandler.java
+++ b/src/main/java/com/epam/ta/reportportal/core/project/settings/GetProjectSettingsHandler.java
@@ -16,7 +16,7 @@
 
 package com.epam.ta.reportportal.core.project.settings;
 
-import com.epam.ta.reportportal.ws.model.project.config.ProjectSettingsResource;
+import com.epam.ta.reportportal.model.project.config.ProjectSettingsResource;
 
 /**
  * @author <a href="mailto:ihar_kahadouski@epam.com">Ihar Kahadouski</a>
diff --git a/src/main/java/com/epam/ta/reportportal/core/project/settings/UpdateProjectSettingsHandler.java b/src/main/java/com/epam/ta/reportportal/core/project/settings/UpdateProjectSettingsHandler.java
index 91461da027..c068466e09 100644
--- a/src/main/java/com/epam/ta/reportportal/core/project/settings/UpdateProjectSettingsHandler.java
+++ b/src/main/java/com/epam/ta/reportportal/core/project/settings/UpdateProjectSettingsHandler.java
@@ -17,9 +17,9 @@
 package com.epam.ta.reportportal.core.project.settings;
 
 import com.epam.ta.reportportal.commons.ReportPortalUser;
+import com.epam.ta.reportportal.model.project.config.UpdateIssueSubTypeRQ;
+import com.epam.ta.reportportal.model.project.config.pattern.UpdatePatternTemplateRQ;
 import com.epam.ta.reportportal.ws.model.OperationCompletionRS;
-import com.epam.ta.reportportal.ws.model.project.config.UpdateIssueSubTypeRQ;
-import com.epam.ta.reportportal.ws.model.project.config.pattern.UpdatePatternTemplateRQ;
 
 /**
  * @author <a href="mailto:ihar_kahadouski@epam.com">Ihar Kahadouski</a>
@@ -47,6 +47,5 @@ OperationCompletionRS updateProjectIssueSubType(String projectName, ReportPortal
    * @return {@link OperationCompletionRS}
    */
   OperationCompletionRS updatePatternTemplate(Long id, String projectName,
-      UpdatePatternTemplateRQ updatePatternTemplateRQ,
-      ReportPortalUser user);
+      UpdatePatternTemplateRQ updatePatternTemplateRQ, ReportPortalUser user);
 }
diff --git a/src/main/java/com/epam/ta/reportportal/core/project/settings/impl/CreateProjectSettingsHandlerImpl.java b/src/main/java/com/epam/ta/reportportal/core/project/settings/impl/CreateProjectSettingsHandlerImpl.java
index 7389c85fb6..74f41a536a 100644
--- a/src/main/java/com/epam/ta/reportportal/core/project/settings/impl/CreateProjectSettingsHandlerImpl.java
+++ b/src/main/java/com/epam/ta/reportportal/core/project/settings/impl/CreateProjectSettingsHandlerImpl.java
@@ -50,14 +50,14 @@
 import com.epam.ta.reportportal.entity.widget.Widget;
 import com.epam.ta.reportportal.entity.widget.WidgetType;
 import com.epam.ta.reportportal.exception.ReportPortalException;
+import com.epam.ta.reportportal.model.EntryCreatedRS;
+import com.epam.ta.reportportal.model.project.config.CreateIssueSubTypeRQ;
+import com.epam.ta.reportportal.model.project.config.IssueSubTypeCreatedRS;
+import com.epam.ta.reportportal.model.project.config.pattern.CreatePatternTemplateRQ;
 import com.epam.ta.reportportal.ws.converter.builders.IssueTypeBuilder;
 import com.epam.ta.reportportal.ws.converter.converters.PatternTemplateConverter;
-import com.epam.ta.reportportal.ws.model.EntryCreatedRS;
 import com.epam.ta.reportportal.ws.model.ErrorType;
 import com.epam.ta.reportportal.ws.model.ValidationConstraints;
-import com.epam.ta.reportportal.ws.model.project.config.CreateIssueSubTypeRQ;
-import com.epam.ta.reportportal.ws.model.project.config.IssueSubTypeCreatedRS;
-import com.epam.ta.reportportal.ws.model.project.config.pattern.CreatePatternTemplateRQ;
 import com.google.common.base.Charsets;
 import com.google.common.collect.ImmutableMap;
 import java.nio.ByteBuffer;
@@ -77,13 +77,10 @@
 @Transactional
 public class CreateProjectSettingsHandlerImpl implements CreateProjectSettingsHandler {
 
-  private static final Map<String, String> PREFIX = ImmutableMap.<String, String>builder()
-      .put(AUTOMATION_BUG.getValue(), "ab_")
-      .put(PRODUCT_BUG.getValue(), "pb_")
-      .put(SYSTEM_ISSUE.getValue(), "si_")
-      .put(NO_DEFECT.getValue(), "nd_")
-      .put(TO_INVESTIGATE.getValue(), "ti_")
-      .build();
+  private static final Map<String, String> PREFIX =
+      ImmutableMap.<String, String>builder().put(AUTOMATION_BUG.getValue(), "ab_")
+          .put(PRODUCT_BUG.getValue(), "pb_").put(SYSTEM_ISSUE.getValue(), "si_")
+          .put(NO_DEFECT.getValue(), "nd_").put(TO_INVESTIGATE.getValue(), "ti_").build();
 
   private final ProjectRepository projectRepository;
 
@@ -99,9 +96,9 @@ public class CreateProjectSettingsHandlerImpl implements CreateProjectSettingsHa
 
   @Autowired
   public CreateProjectSettingsHandlerImpl(ProjectRepository projectRepository,
-      WidgetRepository widgetRepository,
-      IssueGroupRepository issueGroupRepository, IssueTypeRepository issueTypeRepository,
-      @Qualifier("createPatternTemplateMapping") Map<PatternTemplateType, CreatePatternTemplateHandler> createPatternTemplateMapping,
+      WidgetRepository widgetRepository, IssueGroupRepository issueGroupRepository,
+      IssueTypeRepository issueTypeRepository, @Qualifier("createPatternTemplateMapping")
+  Map<PatternTemplateType, CreatePatternTemplateHandler> createPatternTemplateMapping,
       MessageBus messageBus) {
     this.projectRepository = projectRepository;
     this.widgetRepository = widgetRepository;
@@ -118,9 +115,7 @@ public IssueSubTypeCreatedRS createProjectIssueSubType(String projectName, Repor
         .orElseThrow(() -> new ReportPortalException(PROJECT_NOT_FOUND, projectName));
 
     expect(NOT_ISSUE_FLAG.getValue().equalsIgnoreCase(rq.getTypeRef()), equalTo(false)).verify(
-        INCORRECT_REQUEST,
-        "Impossible to create sub-type for 'Not Issue' type."
-    );
+        INCORRECT_REQUEST, "Impossible to create sub-type for 'Not Issue' type.");
 
     /* Check if global issue type reference is valid */
     TestItemIssueGroup expectedGroup = TestItemIssueGroup.fromValue(rq.getTypeRef())
@@ -128,16 +123,13 @@ public IssueSubTypeCreatedRS createProjectIssueSubType(String projectName, Repor
 
     expect(
         project.getProjectIssueTypes().size() < ValidationConstraints.MAX_ISSUE_TYPES_AND_SUBTYPES,
-        equalTo(true)).verify(INCORRECT_REQUEST,
-        "Sub Issues count is bound of size limit"
-    );
+        equalTo(true)
+    ).verify(INCORRECT_REQUEST, "Sub Issues count is bound of size limit");
 
     String locator = PREFIX.get(expectedGroup.getValue()) + shortUUID();
     IssueType subType = new IssueTypeBuilder().addLocator(locator)
         .addIssueGroup(issueGroupRepository.findByTestItemIssueGroup(expectedGroup))
-        .addLongName(rq.getLongName())
-        .addShortName(rq.getShortName())
-        .addHexColor(rq.getColor())
+        .addLongName(rq.getLongName()).addShortName(rq.getShortName()).addHexColor(rq.getColor())
         .get();
 
     ProjectIssueType projectIssueType = new ProjectIssueType();
@@ -151,11 +143,10 @@ public IssueSubTypeCreatedRS createProjectIssueSubType(String projectName, Repor
 
     updateWidgets(project, subType);
 
-    messageBus.publishActivity(new DefectTypeCreatedEvent(TO_ACTIVITY_RESOURCE.apply(subType),
-        user.getUserId(),
-        user.getUsername(),
-        project.getId()
-    ));
+    messageBus.publishActivity(
+        new DefectTypeCreatedEvent(TO_ACTIVITY_RESOURCE.apply(subType), user.getUserId(),
+            user.getUsername(), project.getId()
+        ));
     return new IssueSubTypeCreatedRS(subType.getId(), subType.getLocator());
   }
 
@@ -172,11 +163,8 @@ private void updateWidgets(Project project, IssueType issueType) {
         "statistics$defects$" + issueType.getIssueGroup().getTestItemIssueGroup().getValue()
             .toLowerCase() + "$";
     widgetRepository.findAllByProjectIdAndWidgetTypeInAndContentFieldContaining(project.getId(),
-        Arrays.stream(WidgetType.values())
-            .filter(WidgetType::isIssueTypeUpdateSupported)
-            .map(WidgetType::getType)
-            .collect(Collectors.toList()),
-        issueGroupContentField
+        Arrays.stream(WidgetType.values()).filter(WidgetType::isIssueTypeUpdateSupported)
+            .map(WidgetType::getType).collect(Collectors.toList()), issueGroupContentField
     ).forEach(widget -> {
       widget.getContentFields().add(issueGroupContentField + issueType.getLocator());
       widgetRepository.save(widget);
@@ -185,21 +173,20 @@ private void updateWidgets(Project project, IssueType issueType) {
 
   @Override
   public EntryCreatedRS createPatternTemplate(String projectName,
-      CreatePatternTemplateRQ createPatternTemplateRQ,
-      ReportPortalUser user) {
+      CreatePatternTemplateRQ createPatternTemplateRQ, ReportPortalUser user) {
 
     Project project = projectRepository.findByName(projectName)
         .orElseThrow(() -> new ReportPortalException(ErrorType.PROJECT_NOT_FOUND, projectName));
 
     PatternTemplate patternTemplate = createPatternTemplateMapping.get(
-        PatternTemplateType.fromString(createPatternTemplateRQ.getType())
-            .orElseThrow(() -> new ReportPortalException(ErrorType.BAD_REQUEST_ERROR,
+        PatternTemplateType.fromString(createPatternTemplateRQ.getType()).orElseThrow(
+            () -> new ReportPortalException(ErrorType.BAD_REQUEST_ERROR,
                 Suppliers.formattedSupplier("Unknown pattern template type - '{}'",
-                    createPatternTemplateRQ.getType()).get()
+                    createPatternTemplateRQ.getType()
+                ).get()
             ))).createPatternTemplate(project.getId(), createPatternTemplateRQ);
 
-    messageBus.publishActivity(new PatternCreatedEvent(user.getUserId(),
-        user.getUsername(),
+    messageBus.publishActivity(new PatternCreatedEvent(user.getUserId(), user.getUsername(),
         PatternTemplateConverter.TO_ACTIVITY_RESOURCE.apply(patternTemplate)
     ));
     return new EntryCreatedRS(patternTemplate.getId());
diff --git a/src/main/java/com/epam/ta/reportportal/core/project/settings/impl/DeleteProjectSettingsHandlerImpl.java b/src/main/java/com/epam/ta/reportportal/core/project/settings/impl/DeleteProjectSettingsHandlerImpl.java
index e8f24456e2..487e53bb15 100644
--- a/src/main/java/com/epam/ta/reportportal/core/project/settings/impl/DeleteProjectSettingsHandlerImpl.java
+++ b/src/main/java/com/epam/ta/reportportal/core/project/settings/impl/DeleteProjectSettingsHandlerImpl.java
@@ -31,10 +31,10 @@
 import com.epam.ta.reportportal.entity.project.ProjectIssueType;
 import com.epam.ta.reportportal.entity.widget.WidgetType;
 import com.epam.ta.reportportal.exception.ReportPortalException;
+import com.epam.ta.reportportal.model.activity.PatternTemplateActivityResource;
 import com.epam.ta.reportportal.ws.converter.converters.PatternTemplateConverter;
 import com.epam.ta.reportportal.ws.model.ErrorType;
 import com.epam.ta.reportportal.ws.model.OperationCompletionRS;
-import com.epam.ta.reportportal.ws.model.activity.PatternTemplateActivityResource;
 import com.google.common.collect.Sets;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.ApplicationEventPublisher;
diff --git a/src/main/java/com/epam/ta/reportportal/core/project/settings/impl/GetProjectSettingsHandlerImpl.java b/src/main/java/com/epam/ta/reportportal/core/project/settings/impl/GetProjectSettingsHandlerImpl.java
index f7f14e91ec..692c78d1de 100644
--- a/src/main/java/com/epam/ta/reportportal/core/project/settings/impl/GetProjectSettingsHandlerImpl.java
+++ b/src/main/java/com/epam/ta/reportportal/core/project/settings/impl/GetProjectSettingsHandlerImpl.java
@@ -20,9 +20,9 @@
 import com.epam.ta.reportportal.dao.ProjectRepository;
 import com.epam.ta.reportportal.entity.project.Project;
 import com.epam.ta.reportportal.exception.ReportPortalException;
+import com.epam.ta.reportportal.model.project.config.ProjectSettingsResource;
 import com.epam.ta.reportportal.ws.converter.converters.ProjectSettingsConverter;
 import com.epam.ta.reportportal.ws.model.ErrorType;
-import com.epam.ta.reportportal.ws.model.project.config.ProjectSettingsResource;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
diff --git a/src/main/java/com/epam/ta/reportportal/core/project/settings/impl/UpdateProjectSettingsHandlerImpl.java b/src/main/java/com/epam/ta/reportportal/core/project/settings/impl/UpdateProjectSettingsHandlerImpl.java
index 7c99aab66f..ce46d5e925 100644
--- a/src/main/java/com/epam/ta/reportportal/core/project/settings/impl/UpdateProjectSettingsHandlerImpl.java
+++ b/src/main/java/com/epam/ta/reportportal/core/project/settings/impl/UpdateProjectSettingsHandlerImpl.java
@@ -46,14 +46,14 @@
 import com.epam.ta.reportportal.entity.project.Project;
 import com.epam.ta.reportportal.entity.project.ProjectIssueType;
 import com.epam.ta.reportportal.exception.ReportPortalException;
+import com.epam.ta.reportportal.model.activity.IssueTypeActivityResource;
+import com.epam.ta.reportportal.model.activity.PatternTemplateActivityResource;
+import com.epam.ta.reportportal.model.project.config.UpdateIssueSubTypeRQ;
+import com.epam.ta.reportportal.model.project.config.UpdateOneIssueSubTypeRQ;
+import com.epam.ta.reportportal.model.project.config.pattern.UpdatePatternTemplateRQ;
 import com.epam.ta.reportportal.ws.converter.converters.PatternTemplateConverter;
 import com.epam.ta.reportportal.ws.model.ErrorType;
 import com.epam.ta.reportportal.ws.model.OperationCompletionRS;
-import com.epam.ta.reportportal.ws.model.activity.IssueTypeActivityResource;
-import com.epam.ta.reportportal.ws.model.activity.PatternTemplateActivityResource;
-import com.epam.ta.reportportal.ws.model.project.config.UpdateIssueSubTypeRQ;
-import com.epam.ta.reportportal.ws.model.project.config.UpdateOneIssueSubTypeRQ;
-import com.epam.ta.reportportal.ws.model.project.config.pattern.UpdatePatternTemplateRQ;
 import com.google.common.collect.Sets;
 import java.util.List;
 import java.util.stream.Collectors;
@@ -77,8 +77,7 @@ public class UpdateProjectSettingsHandlerImpl implements UpdateProjectSettingsHa
 
   @Autowired
   public UpdateProjectSettingsHandlerImpl(ProjectRepository projectRepository,
-      PatternTemplateRepository patternTemplateRepository,
-      MessageBus messageBus) {
+      PatternTemplateRepository patternTemplateRepository, MessageBus messageBus) {
     this.projectRepository = projectRepository;
     this.patternTemplateRepository = patternTemplateRepository;
     this.messageBus = messageBus;
@@ -94,61 +93,56 @@ public OperationCompletionRS updateProjectIssueSubType(String projectName, Repor
     Project project = projectRepository.findByName(projectName)
         .orElseThrow(() -> new ReportPortalException(PROJECT_NOT_FOUND, projectName));
 
-    List<IssueTypeActivityResource> issueTypeActivityResources = updateIssueSubTypeRQ.getIds()
-        .stream()
-        .map(subTypeRQ -> TO_ACTIVITY_RESOURCE.apply(validateAndUpdate(subTypeRQ,
-            project.getProjectIssueTypes().stream().map(ProjectIssueType::getIssueType)
-                .collect(Collectors.toList())
-        )))
-        .collect(Collectors.toList());
+    List<IssueTypeActivityResource> issueTypeActivityResources =
+        updateIssueSubTypeRQ.getIds().stream().map(subTypeRQ -> TO_ACTIVITY_RESOURCE.apply(
+            validateAndUpdate(subTypeRQ,
+                project.getProjectIssueTypes().stream().map(ProjectIssueType::getIssueType)
+                    .collect(Collectors.toList())
+            ))).collect(Collectors.toList());
 
     projectRepository.save(project);
-    issueTypeActivityResources.forEach(
-        it -> messageBus.publishActivity(new DefectTypeUpdatedEvent(it,
-            user.getUserId(),
-            user.getUsername(),
-            project.getId()
-        )));
+    issueTypeActivityResources.forEach(it -> messageBus.publishActivity(
+        new DefectTypeUpdatedEvent(it, user.getUserId(), user.getUsername(), project.getId())));
     return new OperationCompletionRS("Issue sub-type(s) was updated successfully.");
   }
 
   @Override
   public OperationCompletionRS updatePatternTemplate(Long id, String projectName,
-      UpdatePatternTemplateRQ updatePatternTemplateRQ,
-      ReportPortalUser user) {
+      UpdatePatternTemplateRQ updatePatternTemplateRQ, ReportPortalUser user) {
 
     Project project = projectRepository.findByName(projectName)
         .orElseThrow(() -> new ReportPortalException(ErrorType.PROJECT_NOT_FOUND, projectName));
 
-    PatternTemplate patternTemplate = patternTemplateRepository.findById(id)
-        .orElseThrow(
-            () -> new ReportPortalException(ErrorType.PATTERN_TEMPLATE_NOT_FOUND_IN_PROJECT, id,
-                project.getId()));
+    PatternTemplate patternTemplate = patternTemplateRepository.findById(id).orElseThrow(
+        () -> new ReportPortalException(ErrorType.PATTERN_TEMPLATE_NOT_FOUND_IN_PROJECT, id,
+            project.getId()
+        ));
 
     final String name = StringUtils.trim(updatePatternTemplateRQ.getName());
 
     if (!patternTemplate.getName().equalsIgnoreCase(name)) {
-      BusinessRule.expect(patternTemplateRepository.existsByProjectIdAndNameIgnoreCase(
-          project.getId(), name
-      ), equalTo(false)).verify(ErrorType.RESOURCE_ALREADY_EXISTS, name);
+      BusinessRule.expect(
+          patternTemplateRepository.existsByProjectIdAndNameIgnoreCase(project.getId(), name),
+          equalTo(false)
+      ).verify(ErrorType.RESOURCE_ALREADY_EXISTS, name);
     }
 
-    PatternTemplateActivityResource before = PatternTemplateConverter.TO_ACTIVITY_RESOURCE.apply(
-        patternTemplate);
+    PatternTemplateActivityResource before =
+        PatternTemplateConverter.TO_ACTIVITY_RESOURCE.apply(patternTemplate);
 
     patternTemplate.setName(name);
     patternTemplate.setEnabled(updatePatternTemplateRQ.getEnabled());
 
-    PatternTemplateActivityResource after = PatternTemplateConverter.TO_ACTIVITY_RESOURCE.apply(
-        patternTemplate);
+    PatternTemplateActivityResource after =
+        PatternTemplateConverter.TO_ACTIVITY_RESOURCE.apply(patternTemplate);
 
     messageBus.publishActivity(
         new PatternUpdatedEvent(user.getUserId(), user.getUsername(), before, after));
 
     return new OperationCompletionRS(
         Suppliers.formattedSupplier("Pattern template with ID = '{}' has been successfully updated",
-                id)
-            .get());
+            id
+        ).get());
 
   }
 
@@ -161,23 +155,17 @@ private IssueType validateAndUpdate(UpdateOneIssueSubTypeRQ issueSubTypeRQ,
 
     IssueType exist = issueTypes.stream()
         .filter(issueType -> issueType.getLocator().equalsIgnoreCase(issueSubTypeRQ.getLocator()))
-        .findFirst()
-        .orElseThrow(
+        .findFirst().orElseThrow(
             () -> new ReportPortalException(ISSUE_TYPE_NOT_FOUND, issueSubTypeRQ.getLocator()));
 
     expect(exist.getIssueGroup().getTestItemIssueGroup().equals(expectedGroup),
-        equalTo(true)).verify(FORBIDDEN_OPERATION,
-        "You cannot change sub-type references to global type."
-    );
+        equalTo(true)
+    ).verify(FORBIDDEN_OPERATION, "You cannot change sub-type references to global type.");
 
-    expect(exist.getLocator(),
-        not(in(Sets.newHashSet(AUTOMATION_BUG.getLocator(),
-            PRODUCT_BUG.getLocator(),
-            SYSTEM_ISSUE.getLocator(),
-            NO_DEFECT.getLocator(),
-            TO_INVESTIGATE.getLocator()
-        )))
-    ).verify(FORBIDDEN_OPERATION, "You cannot remove predefined global issue types.");
+    expect(exist.getLocator(), not(in(
+        Sets.newHashSet(AUTOMATION_BUG.getLocator(), PRODUCT_BUG.getLocator(),
+            SYSTEM_ISSUE.getLocator(), NO_DEFECT.getLocator(), TO_INVESTIGATE.getLocator()
+        )))).verify(FORBIDDEN_OPERATION, "You cannot remove predefined global issue types.");
 
     ofNullable(issueSubTypeRQ.getLongName()).ifPresent(exist::setLongName);
     ofNullable(issueSubTypeRQ.getShortName()).ifPresent(exist::setShortName);
diff --git a/src/main/java/com/epam/ta/reportportal/core/project/settings/notification/CreateProjectNotificationHandler.java b/src/main/java/com/epam/ta/reportportal/core/project/settings/notification/CreateProjectNotificationHandler.java
index 55cd982c36..62abba41f9 100644
--- a/src/main/java/com/epam/ta/reportportal/core/project/settings/notification/CreateProjectNotificationHandler.java
+++ b/src/main/java/com/epam/ta/reportportal/core/project/settings/notification/CreateProjectNotificationHandler.java
@@ -18,8 +18,8 @@
 
 import com.epam.ta.reportportal.commons.ReportPortalUser;
 import com.epam.ta.reportportal.entity.project.Project;
-import com.epam.ta.reportportal.ws.model.EntryCreatedRS;
-import com.epam.ta.reportportal.ws.model.project.email.SenderCaseDTO;
+import com.epam.ta.reportportal.model.EntryCreatedRS;
+import com.epam.ta.reportportal.model.project.email.SenderCaseDTO;
 
 /**
  * @author <a href="mailto:chingiskhan_kalanov@epam.com">Chingiskhan Kalanov</a>
diff --git a/src/main/java/com/epam/ta/reportportal/core/project/settings/notification/CreateProjectNotificationHandlerImpl.java b/src/main/java/com/epam/ta/reportportal/core/project/settings/notification/CreateProjectNotificationHandlerImpl.java
index 29879a1487..f6ef24478b 100644
--- a/src/main/java/com/epam/ta/reportportal/core/project/settings/notification/CreateProjectNotificationHandlerImpl.java
+++ b/src/main/java/com/epam/ta/reportportal/core/project/settings/notification/CreateProjectNotificationHandlerImpl.java
@@ -25,13 +25,13 @@
 import com.epam.ta.reportportal.dao.SenderCaseRepository;
 import com.epam.ta.reportportal.entity.project.Project;
 import com.epam.ta.reportportal.entity.project.email.SenderCase;
+import com.epam.ta.reportportal.model.EntryCreatedRS;
+import com.epam.ta.reportportal.model.project.ProjectResource;
+import com.epam.ta.reportportal.model.project.email.ProjectNotificationConfigDTO;
+import com.epam.ta.reportportal.model.project.email.SenderCaseDTO;
 import com.epam.ta.reportportal.ws.converter.converters.NotificationConfigConverter;
 import com.epam.ta.reportportal.ws.converter.converters.ProjectConverter;
-import com.epam.ta.reportportal.ws.model.EntryCreatedRS;
 import com.epam.ta.reportportal.ws.model.ErrorType;
-import com.epam.ta.reportportal.ws.model.project.ProjectResource;
-import com.epam.ta.reportportal.ws.model.project.email.ProjectNotificationConfigDTO;
-import com.epam.ta.reportportal.ws.model.project.email.SenderCaseDTO;
 import java.util.Optional;
 import org.springframework.stereotype.Service;
 
@@ -47,8 +47,7 @@ public class CreateProjectNotificationHandlerImpl implements CreateProjectNotifi
   private final ProjectNotificationValidator projectNotificationValidator;
 
   public CreateProjectNotificationHandlerImpl(SenderCaseRepository senderCaseRepository,
-      MessageBus messageBus,
-      ProjectConverter projectConverter,
+      MessageBus messageBus, ProjectConverter projectConverter,
       ProjectNotificationValidator projectNotificationValidator) {
     this.senderCaseRepository = senderCaseRepository;
     this.messageBus = messageBus;
@@ -60,9 +59,9 @@ public CreateProjectNotificationHandlerImpl(SenderCaseRepository senderCaseRepos
   public EntryCreatedRS createNotification(Project project, SenderCaseDTO createNotificationRQ,
       ReportPortalUser user) {
     expect(senderCaseRepository.findByProjectIdAndRuleNameIgnoreCase(project.getId(),
-            createNotificationRQ.getRuleName()),
-        Optional::isEmpty)
-        .verify(ErrorType.RESOURCE_ALREADY_EXISTS, createNotificationRQ.getRuleName());
+        createNotificationRQ.getRuleName()
+    ), Optional::isEmpty).verify(
+        ErrorType.RESOURCE_ALREADY_EXISTS, createNotificationRQ.getRuleName());
 
     projectNotificationValidator.validateCreateRQ(project, createNotificationRQ);
 
@@ -72,14 +71,12 @@ public EntryCreatedRS createNotification(Project project, SenderCaseDTO createNo
     senderCaseRepository.save(senderCase);
 
     ProjectResource projectResource = projectConverter.TO_PROJECT_RESOURCE.apply(project);
-    ProjectNotificationConfigDTO projectNotificationConfigDTO = projectResource.getConfiguration()
-        .getProjectConfig();
+    ProjectNotificationConfigDTO projectNotificationConfigDTO =
+        projectResource.getConfiguration().getProjectConfig();
     projectNotificationConfigDTO.getSenderCases().add(createNotificationRQ);
 
     messageBus.publishActivity(new NotificationsConfigUpdatedEvent(projectResource,
-        projectResource.getConfiguration().getProjectConfig(),
-        user.getUserId(),
-        user.getUsername()
+        projectResource.getConfiguration().getProjectConfig(), user.getUserId(), user.getUsername()
     ));
 
     return new EntryCreatedRS(senderCase.getId());
diff --git a/src/main/java/com/epam/ta/reportportal/core/project/settings/notification/DeleteProjectNotificationHandlerImpl.java b/src/main/java/com/epam/ta/reportportal/core/project/settings/notification/DeleteProjectNotificationHandlerImpl.java
index 9c914c8203..f7949316a9 100644
--- a/src/main/java/com/epam/ta/reportportal/core/project/settings/notification/DeleteProjectNotificationHandlerImpl.java
+++ b/src/main/java/com/epam/ta/reportportal/core/project/settings/notification/DeleteProjectNotificationHandlerImpl.java
@@ -28,11 +28,11 @@
 import com.epam.ta.reportportal.dao.SenderCaseRepository;
 import com.epam.ta.reportportal.entity.project.Project;
 import com.epam.ta.reportportal.entity.project.email.SenderCase;
+import com.epam.ta.reportportal.model.project.ProjectResource;
+import com.epam.ta.reportportal.model.project.email.ProjectNotificationConfigDTO;
 import com.epam.ta.reportportal.ws.converter.converters.ProjectConverter;
 import com.epam.ta.reportportal.ws.model.ErrorType;
 import com.epam.ta.reportportal.ws.model.OperationCompletionRS;
-import com.epam.ta.reportportal.ws.model.project.ProjectResource;
-import com.epam.ta.reportportal.ws.model.project.email.ProjectNotificationConfigDTO;
 import java.util.Objects;
 import java.util.Optional;
 import java.util.stream.Collectors;
@@ -49,8 +49,7 @@ public class DeleteProjectNotificationHandlerImpl implements DeleteProjectNotifi
   private final ProjectConverter projectConverter;
 
   public DeleteProjectNotificationHandlerImpl(SenderCaseRepository senderCaseRepository,
-      MessageBus messageBus,
-      ProjectConverter projectConverter) {
+      MessageBus messageBus, ProjectConverter projectConverter) {
     this.senderCaseRepository = senderCaseRepository;
     this.messageBus = messageBus;
     this.projectConverter = projectConverter;
@@ -60,30 +59,23 @@ public DeleteProjectNotificationHandlerImpl(SenderCaseRepository senderCaseRepos
   public OperationCompletionRS deleteNotification(Project project, Long notificationId,
       ReportPortalUser user) {
     Optional<SenderCase> senderCase = senderCaseRepository.findById(notificationId);
-    expect(senderCase,
-        (notification) -> notification.map(
-            ntf -> Objects.equals(ntf.getProject().getId(), project.getId())).orElse(false))
-        .verify(
-            ErrorType.BAD_REQUEST_ERROR,
-            Suppliers.formattedSupplier(
-                "Notification '{}' not found. Did you use correct Notification ID?",
-                notificationId).get()
-        );
+    expect(senderCase, (notification) -> notification.map(
+        ntf -> Objects.equals(ntf.getProject().getId(), project.getId())).orElse(false)).verify(
+        ErrorType.BAD_REQUEST_ERROR, Suppliers.formattedSupplier(
+                "Notification '{}' not found. Did you use correct Notification ID?", notificationId)
+            .get());
     senderCaseRepository.deleteSenderCaseById(notificationId);
 
     ProjectResource projectResource = projectConverter.TO_PROJECT_RESOURCE.apply(project);
-    ProjectNotificationConfigDTO projectNotificationConfigDTO = projectResource.getConfiguration()
-        .getProjectConfig();
+    ProjectNotificationConfigDTO projectNotificationConfigDTO =
+        projectResource.getConfiguration().getProjectConfig();
     ofNullable(projectNotificationConfigDTO.getSenderCases()).ifPresent(
         scs -> projectNotificationConfigDTO.setSenderCases(
             scs.stream().filter(sc -> !Objects.equals(sc.getId(), notificationId))
-                .collect(Collectors.toList())
-        ));
+                .collect(Collectors.toList())));
 
     messageBus.publishActivity(new NotificationsConfigUpdatedEvent(projectResource,
-        projectResource.getConfiguration().getProjectConfig(),
-        user.getUserId(),
-        user.getUsername()
+        projectResource.getConfiguration().getProjectConfig(), user.getUserId(), user.getUsername()
     ));
 
     return new OperationCompletionRS("Notification rule was deleted successfully.");
diff --git a/src/main/java/com/epam/ta/reportportal/core/project/settings/notification/GetProjectNotificationsHandler.java b/src/main/java/com/epam/ta/reportportal/core/project/settings/notification/GetProjectNotificationsHandler.java
index 052be9282d..32fca57b36 100644
--- a/src/main/java/com/epam/ta/reportportal/core/project/settings/notification/GetProjectNotificationsHandler.java
+++ b/src/main/java/com/epam/ta/reportportal/core/project/settings/notification/GetProjectNotificationsHandler.java
@@ -16,7 +16,7 @@
 
 package com.epam.ta.reportportal.core.project.settings.notification;
 
-import com.epam.ta.reportportal.ws.model.project.email.SenderCaseDTO;
+import com.epam.ta.reportportal.model.project.email.SenderCaseDTO;
 import java.util.List;
 
 /**
diff --git a/src/main/java/com/epam/ta/reportportal/core/project/settings/notification/GetProjectNotificationsHandlerImpl.java b/src/main/java/com/epam/ta/reportportal/core/project/settings/notification/GetProjectNotificationsHandlerImpl.java
index ebb99190b6..7559b798b0 100644
--- a/src/main/java/com/epam/ta/reportportal/core/project/settings/notification/GetProjectNotificationsHandlerImpl.java
+++ b/src/main/java/com/epam/ta/reportportal/core/project/settings/notification/GetProjectNotificationsHandlerImpl.java
@@ -17,8 +17,8 @@
 package com.epam.ta.reportportal.core.project.settings.notification;
 
 import com.epam.ta.reportportal.dao.SenderCaseRepository;
+import com.epam.ta.reportportal.model.project.email.SenderCaseDTO;
 import com.epam.ta.reportportal.ws.converter.converters.NotificationConfigConverter;
-import com.epam.ta.reportportal.ws.model.project.email.SenderCaseDTO;
 import java.util.List;
 import java.util.stream.Collectors;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -40,7 +40,6 @@ public GetProjectNotificationsHandlerImpl(SenderCaseRepository senderCaseReposit
   @Override
   public List<SenderCaseDTO> getProjectNotifications(Long projectId) {
     return senderCaseRepository.findAllByProjectId(projectId).stream()
-        .map(NotificationConfigConverter.TO_CASE_RESOURCE)
-        .collect(Collectors.toList());
+        .map(NotificationConfigConverter.TO_CASE_RESOURCE).collect(Collectors.toList());
   }
 }
diff --git a/src/main/java/com/epam/ta/reportportal/core/project/settings/notification/UpdateProjectNotificationHandler.java b/src/main/java/com/epam/ta/reportportal/core/project/settings/notification/UpdateProjectNotificationHandler.java
index 11e785b0b5..3f67864934 100644
--- a/src/main/java/com/epam/ta/reportportal/core/project/settings/notification/UpdateProjectNotificationHandler.java
+++ b/src/main/java/com/epam/ta/reportportal/core/project/settings/notification/UpdateProjectNotificationHandler.java
@@ -20,8 +20,8 @@
 
 import com.epam.ta.reportportal.commons.ReportPortalUser;
 import com.epam.ta.reportportal.entity.project.Project;
+import com.epam.ta.reportportal.model.project.email.SenderCaseDTO;
 import com.epam.ta.reportportal.ws.model.OperationCompletionRS;
-import com.epam.ta.reportportal.ws.model.project.email.SenderCaseDTO;
 
 /**
  * @author <a href="mailto:chingiskhan_kalanov@epam.com">Chingiskhan Kalanov</a>
diff --git a/src/main/java/com/epam/ta/reportportal/core/project/settings/notification/UpdateProjectNotificationHandlerImpl.java b/src/main/java/com/epam/ta/reportportal/core/project/settings/notification/UpdateProjectNotificationHandlerImpl.java
index 4a51f5be29..4352df3219 100644
--- a/src/main/java/com/epam/ta/reportportal/core/project/settings/notification/UpdateProjectNotificationHandlerImpl.java
+++ b/src/main/java/com/epam/ta/reportportal/core/project/settings/notification/UpdateProjectNotificationHandlerImpl.java
@@ -28,13 +28,13 @@
 import com.epam.ta.reportportal.dao.SenderCaseRepository;
 import com.epam.ta.reportportal.entity.project.Project;
 import com.epam.ta.reportportal.entity.project.email.SenderCase;
+import com.epam.ta.reportportal.model.project.ProjectResource;
+import com.epam.ta.reportportal.model.project.email.ProjectNotificationConfigDTO;
+import com.epam.ta.reportportal.model.project.email.SenderCaseDTO;
 import com.epam.ta.reportportal.ws.converter.converters.NotificationConfigConverter;
 import com.epam.ta.reportportal.ws.converter.converters.ProjectConverter;
 import com.epam.ta.reportportal.ws.model.ErrorType;
 import com.epam.ta.reportportal.ws.model.OperationCompletionRS;
-import com.epam.ta.reportportal.ws.model.project.ProjectResource;
-import com.epam.ta.reportportal.ws.model.project.email.ProjectNotificationConfigDTO;
-import com.epam.ta.reportportal.ws.model.project.email.SenderCaseDTO;
 import java.util.Objects;
 import org.springframework.stereotype.Service;
 
@@ -50,8 +50,7 @@ public class UpdateProjectNotificationHandlerImpl implements UpdateProjectNotifi
   private final ProjectNotificationValidator projectNotificationValidator;
 
   public UpdateProjectNotificationHandlerImpl(SenderCaseRepository senderCaseRepository,
-      MessageBus messageBus,
-      ProjectConverter projectConverter,
+      MessageBus messageBus, ProjectConverter projectConverter,
       ProjectNotificationValidator projectNotificationValidator) {
     this.senderCaseRepository = senderCaseRepository;
     this.messageBus = messageBus;
@@ -63,29 +62,27 @@ public UpdateProjectNotificationHandlerImpl(SenderCaseRepository senderCaseRepos
   public OperationCompletionRS updateNotification(Project project,
       SenderCaseDTO updateNotificationRQ, ReportPortalUser user) {
     expect(updateNotificationRQ.getId(), Objects::nonNull).verify(ErrorType.BAD_REQUEST_ERROR,
-        "Please specify notification Id");
+        "Please specify notification Id"
+    );
     expect(senderCaseRepository.findById(updateNotificationRQ.getId()),
         (notification) -> notification.map(
-            ntf -> Objects.equals(ntf.getProject().getId(), project.getId())).orElse(false))
-        .verify(ErrorType.BAD_REQUEST_ERROR,
-            Suppliers.formattedSupplier(
-                "Notification '{}' not found. Did you use correct Notification ID?",
-                updateNotificationRQ.getId()).get()
-        );
+            ntf -> Objects.equals(ntf.getProject().getId(), project.getId())).orElse(false)
+    ).verify(ErrorType.BAD_REQUEST_ERROR, Suppliers.formattedSupplier(
+        "Notification '{}' not found. Did you use correct Notification ID?",
+        updateNotificationRQ.getId()
+    ).get());
     projectNotificationValidator.validateUpdateRQ(project, updateNotificationRQ);
     SenderCase notification = NotificationConfigConverter.TO_CASE_MODEL.apply(updateNotificationRQ);
     notification.setProject(project);
     senderCaseRepository.save(notification);
 
     ProjectResource projectResource = projectConverter.TO_PROJECT_RESOURCE.apply(project);
-    ProjectNotificationConfigDTO projectNotificationConfigDTO = projectResource.getConfiguration()
-        .getProjectConfig();
+    ProjectNotificationConfigDTO projectNotificationConfigDTO =
+        projectResource.getConfiguration().getProjectConfig();
     projectNotificationConfigDTO.getSenderCases().add(updateNotificationRQ);
 
     messageBus.publishActivity(new NotificationsConfigUpdatedEvent(projectResource,
-        projectResource.getConfiguration().getProjectConfig(),
-        user.getUserId(),
-        user.getUsername()
+        projectResource.getConfiguration().getProjectConfig(), user.getUserId(), user.getUsername()
     ));
 
     return new OperationCompletionRS("Notification rule was updated successfully.");
diff --git a/src/main/java/com/epam/ta/reportportal/core/project/validator/notification/ProjectNotificationValidator.java b/src/main/java/com/epam/ta/reportportal/core/project/validator/notification/ProjectNotificationValidator.java
index d71e8aef83..c4a28ec6fb 100644
--- a/src/main/java/com/epam/ta/reportportal/core/project/validator/notification/ProjectNotificationValidator.java
+++ b/src/main/java/com/epam/ta/reportportal/core/project/validator/notification/ProjectNotificationValidator.java
@@ -29,9 +29,9 @@
 
 import com.epam.ta.reportportal.dao.SenderCaseRepository;
 import com.epam.ta.reportportal.entity.project.Project;
+import com.epam.ta.reportportal.model.project.email.SenderCaseDTO;
 import com.epam.ta.reportportal.util.email.EmailRulesValidator;
 import com.epam.ta.reportportal.ws.converter.converters.NotificationConfigConverter;
-import com.epam.ta.reportportal.ws.model.project.email.SenderCaseDTO;
 import java.util.List;
 import java.util.Objects;
 import java.util.Optional;
@@ -58,13 +58,13 @@ public void validateCreateRQ(Project project, SenderCaseDTO senderCaseDTO) {
 
     normalizeCreateNotificationRQ(project, senderCaseDTO);
 
-    Optional<SenderCaseDTO> duplicate = senderCaseRepository.findAllByProjectId(project.getId())
-        .stream()
-        .map(NotificationConfigConverter.TO_CASE_RESOURCE)
-        .filter(existing -> equalsWithoutRuleName(existing, senderCaseDTO))
-        .findFirst();
+    Optional<SenderCaseDTO> duplicate =
+        senderCaseRepository.findAllByProjectId(project.getId()).stream()
+            .map(NotificationConfigConverter.TO_CASE_RESOURCE)
+            .filter(existing -> equalsWithoutRuleName(existing, senderCaseDTO)).findFirst();
     expect(duplicate, Optional::isEmpty).verify(BAD_REQUEST_ERROR,
-        "Project email settings contain duplicate cases");
+        "Project email settings contain duplicate cases"
+    );
   }
 
   public void validateUpdateRQ(Project project, SenderCaseDTO senderCaseDTO) {
@@ -72,24 +72,24 @@ public void validateUpdateRQ(Project project, SenderCaseDTO senderCaseDTO) {
 
     normalizeCreateNotificationRQ(project, senderCaseDTO);
 
-    Optional<SenderCaseDTO> duplicate = senderCaseRepository.findAllByProjectId(project.getId())
-        .stream()
-        .filter(senderCase -> !Objects.equals(senderCase.getId(), senderCaseDTO.getId()))
-        .map(NotificationConfigConverter.TO_CASE_RESOURCE)
-        .filter(o1 -> equalsWithoutRuleName(o1, senderCaseDTO))
-        .findFirst();
+    Optional<SenderCaseDTO> duplicate =
+        senderCaseRepository.findAllByProjectId(project.getId()).stream()
+            .filter(senderCase -> !Objects.equals(senderCase.getId(), senderCaseDTO.getId()))
+            .map(NotificationConfigConverter.TO_CASE_RESOURCE)
+            .filter(o1 -> equalsWithoutRuleName(o1, senderCaseDTO)).findFirst();
     expect(duplicate, Optional::isEmpty).verify(BAD_REQUEST_ERROR,
-        "Project email settings contain duplicate cases");
+        "Project email settings contain duplicate cases"
+    );
   }
 
   private void validateRecipients(SenderCaseDTO senderCaseDTO) {
     List<String> recipients = senderCaseDTO.getRecipients();
-    expect(findByName(senderCaseDTO.getSendCase()), Optional::isPresent)
-        .verify(BAD_REQUEST_ERROR, senderCaseDTO.getSendCase());
+    expect(findByName(senderCaseDTO.getSendCase()), Optional::isPresent).verify(
+        BAD_REQUEST_ERROR, senderCaseDTO.getSendCase());
     expect(recipients, notNull()).verify(BAD_REQUEST_ERROR, "Recipients list should not be null");
-    expect(recipients.isEmpty(), equalTo(false))
-        .verify(BAD_REQUEST_ERROR,
-            formattedSupplier("Empty recipients list for email case '{}' ", senderCaseDTO));
+    expect(recipients.isEmpty(), equalTo(false)).verify(BAD_REQUEST_ERROR,
+        formattedSupplier("Empty recipients list for email case '{}' ", senderCaseDTO)
+    );
   }
 
   private void normalizeCreateNotificationRQ(Project project, SenderCaseDTO createNotificationRQ) {
@@ -97,30 +97,25 @@ private void normalizeCreateNotificationRQ(Project project, SenderCaseDTO create
         createNotificationRQ.getRecipients().stream().map(recipient -> {
           EmailRulesValidator.validateRecipient(project, recipient);
           return recipient.trim();
-        }).distinct().collect(toList())
-    );
+        }).distinct().collect(toList()));
     ofNullable(createNotificationRQ.getLaunchNames()).ifPresent(
-        launchNames -> createNotificationRQ.setLaunchNames(
-            launchNames.stream().map(name -> {
-              EmailRulesValidator.validateLaunchName(name);
-              return name.trim();
-            }).distinct().collect(toList()))
-    );
+        launchNames -> createNotificationRQ.setLaunchNames(launchNames.stream().map(name -> {
+          EmailRulesValidator.validateLaunchName(name);
+          return name.trim();
+        }).distinct().collect(toList())));
     ofNullable(createNotificationRQ.getAttributes()).ifPresent(
-        attributes -> createNotificationRQ.setAttributes(
-            attributes.stream().peek(attribute -> {
-              EmailRulesValidator.validateLaunchAttribute(attribute);
-              attribute.setValue(attribute.getValue().trim());
-            }).collect(Collectors.toSet()))
-    );
+        attributes -> createNotificationRQ.setAttributes(attributes.stream().peek(attribute -> {
+          EmailRulesValidator.validateLaunchAttribute(attribute);
+          attribute.setValue(attribute.getValue().trim());
+        }).collect(Collectors.toSet())));
   }
 
   private boolean equalsWithoutRuleName(SenderCaseDTO senderCase, SenderCaseDTO toCompare) {
     return CollectionUtils.isEqualCollection(senderCase.getRecipients(), toCompare.getRecipients())
         && Objects.equals(senderCase.getSendCase(), toCompare.getSendCase())
         && CollectionUtils.isEqualCollection(senderCase.getLaunchNames(),
-        toCompare.getLaunchNames())
-        && CollectionUtils.isEqualCollection(senderCase.getAttributes(), toCompare.getAttributes())
+        toCompare.getLaunchNames()
+    ) && CollectionUtils.isEqualCollection(senderCase.getAttributes(), toCompare.getAttributes())
         && Objects.equals(senderCase.getAttributesOperator(), toCompare.getAttributesOperator());
   }
 }
diff --git a/src/main/java/com/epam/ta/reportportal/core/user/ApiKeyHandler.java b/src/main/java/com/epam/ta/reportportal/core/user/ApiKeyHandler.java
index ab0d953176..97f2e06d03 100644
--- a/src/main/java/com/epam/ta/reportportal/core/user/ApiKeyHandler.java
+++ b/src/main/java/com/epam/ta/reportportal/core/user/ApiKeyHandler.java
@@ -16,9 +16,9 @@
 
 package com.epam.ta.reportportal.core.user;
 
-import com.epam.ta.reportportal.ws.model.ApiKeyRQ;
-import com.epam.ta.reportportal.ws.model.ApiKeyRS;
-import com.epam.ta.reportportal.ws.model.ApiKeysRS;
+import com.epam.ta.reportportal.model.ApiKeyRQ;
+import com.epam.ta.reportportal.model.ApiKeyRS;
+import com.epam.ta.reportportal.model.ApiKeysRS;
 import com.epam.ta.reportportal.ws.model.OperationCompletionRS;
 
 /**
@@ -32,7 +32,7 @@ public interface ApiKeyHandler {
    * Generate api key for user.
    *
    * @param keyName name of Api Key
-   * @param userId User id
+   * @param userId  User id
    * @return generated api key.
    */
   ApiKeyRS createApiKey(String keyName, Long userId);
diff --git a/src/main/java/com/epam/ta/reportportal/core/user/CreateUserHandler.java b/src/main/java/com/epam/ta/reportportal/core/user/CreateUserHandler.java
index b10b1c7ea7..d8496cc88f 100644
--- a/src/main/java/com/epam/ta/reportportal/core/user/CreateUserHandler.java
+++ b/src/main/java/com/epam/ta/reportportal/core/user/CreateUserHandler.java
@@ -17,15 +17,15 @@
 package com.epam.ta.reportportal.core.user;
 
 import com.epam.ta.reportportal.commons.ReportPortalUser;
+import com.epam.ta.reportportal.model.YesNoRS;
+import com.epam.ta.reportportal.model.user.CreateUserBidRS;
+import com.epam.ta.reportportal.model.user.CreateUserRQ;
+import com.epam.ta.reportportal.model.user.CreateUserRQConfirm;
+import com.epam.ta.reportportal.model.user.CreateUserRQFull;
+import com.epam.ta.reportportal.model.user.CreateUserRS;
+import com.epam.ta.reportportal.model.user.ResetPasswordRQ;
+import com.epam.ta.reportportal.model.user.RestorePasswordRQ;
 import com.epam.ta.reportportal.ws.model.OperationCompletionRS;
-import com.epam.ta.reportportal.ws.model.YesNoRS;
-import com.epam.ta.reportportal.ws.model.user.CreateUserBidRS;
-import com.epam.ta.reportportal.ws.model.user.CreateUserRQ;
-import com.epam.ta.reportportal.ws.model.user.CreateUserRQConfirm;
-import com.epam.ta.reportportal.ws.model.user.CreateUserRQFull;
-import com.epam.ta.reportportal.ws.model.user.CreateUserRS;
-import com.epam.ta.reportportal.ws.model.user.ResetPasswordRQ;
-import com.epam.ta.reportportal.ws.model.user.RestorePasswordRQ;
 
 /**
  * Post request handler
diff --git a/src/main/java/com/epam/ta/reportportal/core/user/DeleteUserHandler.java b/src/main/java/com/epam/ta/reportportal/core/user/DeleteUserHandler.java
index b14a0c9b4f..2f1c071a4d 100644
--- a/src/main/java/com/epam/ta/reportportal/core/user/DeleteUserHandler.java
+++ b/src/main/java/com/epam/ta/reportportal/core/user/DeleteUserHandler.java
@@ -17,7 +17,7 @@
 package com.epam.ta.reportportal.core.user;
 
 import com.epam.ta.reportportal.commons.ReportPortalUser;
-import com.epam.ta.reportportal.ws.model.DeleteBulkRS;
+import com.epam.ta.reportportal.model.DeleteBulkRS;
 import com.epam.ta.reportportal.ws.model.OperationCompletionRS;
 import java.util.List;
 
@@ -38,6 +38,6 @@ public interface DeleteUserHandler {
    */
   OperationCompletionRS deleteUser(Long userId, ReportPortalUser currentUser);
 
-	DeleteBulkRS deleteUsers(List<Long> ids, ReportPortalUser currentUser);
+  DeleteBulkRS deleteUsers(List<Long> ids, ReportPortalUser currentUser);
 
 }
diff --git a/src/main/java/com/epam/ta/reportportal/core/user/EditUserHandler.java b/src/main/java/com/epam/ta/reportportal/core/user/EditUserHandler.java
index bd79cc62f0..284c4b85da 100644
--- a/src/main/java/com/epam/ta/reportportal/core/user/EditUserHandler.java
+++ b/src/main/java/com/epam/ta/reportportal/core/user/EditUserHandler.java
@@ -17,9 +17,9 @@
 package com.epam.ta.reportportal.core.user;
 
 import com.epam.ta.reportportal.commons.ReportPortalUser;
+import com.epam.ta.reportportal.model.user.ChangePasswordRQ;
+import com.epam.ta.reportportal.model.user.EditUserRQ;
 import com.epam.ta.reportportal.ws.model.OperationCompletionRS;
-import com.epam.ta.reportportal.ws.model.user.ChangePasswordRQ;
-import com.epam.ta.reportportal.ws.model.user.EditUserRQ;
 import org.springframework.web.multipart.MultipartFile;
 
 /**
diff --git a/src/main/java/com/epam/ta/reportportal/core/user/GetUserHandler.java b/src/main/java/com/epam/ta/reportportal/core/user/GetUserHandler.java
index 11ad6bd045..9f2605452c 100644
--- a/src/main/java/com/epam/ta/reportportal/core/user/GetUserHandler.java
+++ b/src/main/java/com/epam/ta/reportportal/core/user/GetUserHandler.java
@@ -20,9 +20,9 @@
 import com.epam.ta.reportportal.commons.querygen.Filter;
 import com.epam.ta.reportportal.commons.querygen.Queryable;
 import com.epam.ta.reportportal.entity.jasper.ReportFormat;
-import com.epam.ta.reportportal.ws.model.YesNoRS;
-import com.epam.ta.reportportal.ws.model.user.UserBidRS;
-import com.epam.ta.reportportal.ws.model.user.UserResource;
+import com.epam.ta.reportportal.model.YesNoRS;
+import com.epam.ta.reportportal.model.user.UserBidRS;
+import com.epam.ta.reportportal.model.user.UserResource;
 import java.io.OutputStream;
 import java.util.Map;
 import javax.servlet.http.HttpServletResponse;
diff --git a/src/main/java/com/epam/ta/reportportal/core/user/impl/ApiKeyHandlerImpl.java b/src/main/java/com/epam/ta/reportportal/core/user/impl/ApiKeyHandlerImpl.java
index bc81adebd3..2fe7993eab 100644
--- a/src/main/java/com/epam/ta/reportportal/core/user/impl/ApiKeyHandlerImpl.java
+++ b/src/main/java/com/epam/ta/reportportal/core/user/impl/ApiKeyHandlerImpl.java
@@ -27,9 +27,9 @@
 import com.epam.ta.reportportal.dao.ApiKeyRepository;
 import com.epam.ta.reportportal.entity.user.ApiKey;
 import com.epam.ta.reportportal.entity.user.User;
+import com.epam.ta.reportportal.model.ApiKeyRS;
+import com.epam.ta.reportportal.model.ApiKeysRS;
 import com.epam.ta.reportportal.ws.converter.converters.ApiKeyConverter;
-import com.epam.ta.reportportal.ws.model.ApiKeyRS;
-import com.epam.ta.reportportal.ws.model.ApiKeysRS;
 import com.epam.ta.reportportal.ws.model.ErrorType;
 import com.epam.ta.reportportal.ws.model.OperationCompletionRS;
 import com.google.common.annotations.VisibleForTesting;
diff --git a/src/main/java/com/epam/ta/reportportal/core/user/impl/CreateUserHandlerImpl.java b/src/main/java/com/epam/ta/reportportal/core/user/impl/CreateUserHandlerImpl.java
index 5baa5625e9..b5baf2756e 100644
--- a/src/main/java/com/epam/ta/reportportal/core/user/impl/CreateUserHandlerImpl.java
+++ b/src/main/java/com/epam/ta/reportportal/core/user/impl/CreateUserHandlerImpl.java
@@ -60,6 +60,15 @@
 import com.epam.ta.reportportal.entity.user.UserRole;
 import com.epam.ta.reportportal.entity.user.UserType;
 import com.epam.ta.reportportal.exception.ReportPortalException;
+import com.epam.ta.reportportal.model.YesNoRS;
+import com.epam.ta.reportportal.model.activity.UserActivityResource;
+import com.epam.ta.reportportal.model.user.CreateUserBidRS;
+import com.epam.ta.reportportal.model.user.CreateUserRQ;
+import com.epam.ta.reportportal.model.user.CreateUserRQConfirm;
+import com.epam.ta.reportportal.model.user.CreateUserRQFull;
+import com.epam.ta.reportportal.model.user.CreateUserRS;
+import com.epam.ta.reportportal.model.user.ResetPasswordRQ;
+import com.epam.ta.reportportal.model.user.RestorePasswordRQ;
 import com.epam.ta.reportportal.util.Predicates;
 import com.epam.ta.reportportal.util.UserUtils;
 import com.epam.ta.reportportal.util.email.MailServiceFactory;
@@ -68,15 +77,6 @@
 import com.epam.ta.reportportal.ws.converter.converters.UserCreationBidConverter;
 import com.epam.ta.reportportal.ws.model.ErrorType;
 import com.epam.ta.reportportal.ws.model.OperationCompletionRS;
-import com.epam.ta.reportportal.ws.model.YesNoRS;
-import com.epam.ta.reportportal.ws.model.activity.UserActivityResource;
-import com.epam.ta.reportportal.ws.model.user.CreateUserBidRS;
-import com.epam.ta.reportportal.ws.model.user.CreateUserRQ;
-import com.epam.ta.reportportal.ws.model.user.CreateUserRQConfirm;
-import com.epam.ta.reportportal.ws.model.user.CreateUserRQFull;
-import com.epam.ta.reportportal.ws.model.user.CreateUserRS;
-import com.epam.ta.reportportal.ws.model.user.ResetPasswordRQ;
-import com.epam.ta.reportportal.ws.model.user.RestorePasswordRQ;
 import com.google.common.collect.Maps;
 import java.util.Map;
 import java.util.Optional;
diff --git a/src/main/java/com/epam/ta/reportportal/core/user/impl/DeleteUserHandlerImpl.java b/src/main/java/com/epam/ta/reportportal/core/user/impl/DeleteUserHandlerImpl.java
index db4e29382a..01240654c0 100644
--- a/src/main/java/com/epam/ta/reportportal/core/user/impl/DeleteUserHandlerImpl.java
+++ b/src/main/java/com/epam/ta/reportportal/core/user/impl/DeleteUserHandlerImpl.java
@@ -36,12 +36,12 @@
 import com.epam.ta.reportportal.entity.user.User;
 import com.epam.ta.reportportal.entity.user.UserRole;
 import com.epam.ta.reportportal.exception.ReportPortalException;
+import com.epam.ta.reportportal.model.DeleteBulkRS;
+import com.epam.ta.reportportal.model.activity.UserActivityResource;
 import com.epam.ta.reportportal.util.email.strategy.EmailNotificationStrategy;
 import com.epam.ta.reportportal.util.email.strategy.EmailTemplate;
-import com.epam.ta.reportportal.ws.model.DeleteBulkRS;
 import com.epam.ta.reportportal.ws.model.ErrorType;
 import com.epam.ta.reportportal.ws.model.OperationCompletionRS;
-import com.epam.ta.reportportal.ws.model.activity.UserActivityResource;
 import com.google.common.collect.Lists;
 import java.util.Collections;
 import java.util.List;
diff --git a/src/main/java/com/epam/ta/reportportal/core/user/impl/EditUserHandlerImpl.java b/src/main/java/com/epam/ta/reportportal/core/user/impl/EditUserHandlerImpl.java
index 2d230c7e31..9805175235 100644
--- a/src/main/java/com/epam/ta/reportportal/core/user/impl/EditUserHandlerImpl.java
+++ b/src/main/java/com/epam/ta/reportportal/core/user/impl/EditUserHandlerImpl.java
@@ -32,13 +32,12 @@
 import com.epam.ta.reportportal.entity.user.User;
 import com.epam.ta.reportportal.entity.user.UserRole;
 import com.epam.ta.reportportal.exception.ReportPortalException;
+import com.epam.ta.reportportal.model.user.ChangePasswordRQ;
+import com.epam.ta.reportportal.model.user.EditUserRQ;
 import com.epam.ta.reportportal.util.UserUtils;
 import com.epam.ta.reportportal.util.email.MailServiceFactory;
 import com.epam.ta.reportportal.ws.model.ErrorType;
 import com.epam.ta.reportportal.ws.model.OperationCompletionRS;
-import com.epam.ta.reportportal.ws.model.activity.UserActivityResource;
-import com.epam.ta.reportportal.ws.model.user.ChangePasswordRQ;
-import com.epam.ta.reportportal.ws.model.user.EditUserRQ;
 import org.apache.tika.io.TikaInputStream;
 import org.apache.tika.metadata.Metadata;
 import org.apache.tika.mime.MediaType;
diff --git a/src/main/java/com/epam/ta/reportportal/core/user/impl/GetUserHandlerImpl.java b/src/main/java/com/epam/ta/reportportal/core/user/impl/GetUserHandlerImpl.java
index 6459fbf948..feb74bcf85 100644
--- a/src/main/java/com/epam/ta/reportportal/core/user/impl/GetUserHandlerImpl.java
+++ b/src/main/java/com/epam/ta/reportportal/core/user/impl/GetUserHandlerImpl.java
@@ -42,13 +42,13 @@
 import com.epam.ta.reportportal.entity.user.User;
 import com.epam.ta.reportportal.entity.user.UserCreationBid;
 import com.epam.ta.reportportal.exception.ReportPortalException;
+import com.epam.ta.reportportal.model.YesNoRS;
+import com.epam.ta.reportportal.model.user.UserBidRS;
+import com.epam.ta.reportportal.model.user.UserResource;
 import com.epam.ta.reportportal.util.PersonalProjectService;
 import com.epam.ta.reportportal.ws.converter.PagedResourcesAssembler;
 import com.epam.ta.reportportal.ws.converter.converters.UserConverter;
 import com.epam.ta.reportportal.ws.model.ErrorType;
-import com.epam.ta.reportportal.ws.model.YesNoRS;
-import com.epam.ta.reportportal.ws.model.user.UserBidRS;
-import com.epam.ta.reportportal.ws.model.user.UserResource;
 import com.google.common.base.Preconditions;
 import java.io.OutputStream;
 import java.util.List;
diff --git a/src/main/java/com/epam/ta/reportportal/core/widget/CreateWidgetHandler.java b/src/main/java/com/epam/ta/reportportal/core/widget/CreateWidgetHandler.java
index 1d5c8cf0ab..73c073785e 100644
--- a/src/main/java/com/epam/ta/reportportal/core/widget/CreateWidgetHandler.java
+++ b/src/main/java/com/epam/ta/reportportal/core/widget/CreateWidgetHandler.java
@@ -17,8 +17,8 @@
 package com.epam.ta.reportportal.core.widget;
 
 import com.epam.ta.reportportal.commons.ReportPortalUser;
-import com.epam.ta.reportportal.ws.model.EntryCreatedRS;
-import com.epam.ta.reportportal.ws.model.widget.WidgetRQ;
+import com.epam.ta.reportportal.model.EntryCreatedRS;
+import com.epam.ta.reportportal.model.widget.WidgetRQ;
 
 /**
  * @author Pavel Bortnik
diff --git a/src/main/java/com/epam/ta/reportportal/core/widget/GetWidgetHandler.java b/src/main/java/com/epam/ta/reportportal/core/widget/GetWidgetHandler.java
index 422f7cf00c..2afccb76e3 100644
--- a/src/main/java/com/epam/ta/reportportal/core/widget/GetWidgetHandler.java
+++ b/src/main/java/com/epam/ta/reportportal/core/widget/GetWidgetHandler.java
@@ -18,8 +18,8 @@
 
 import com.epam.ta.reportportal.commons.ReportPortalUser;
 import com.epam.ta.reportportal.commons.querygen.Filter;
-import com.epam.ta.reportportal.ws.model.widget.WidgetPreviewRQ;
-import com.epam.ta.reportportal.ws.model.widget.WidgetResource;
+import com.epam.ta.reportportal.model.widget.WidgetPreviewRQ;
+import com.epam.ta.reportportal.model.widget.WidgetResource;
 import org.springframework.data.domain.Pageable;
 import org.springframework.util.MultiValueMap;
 
diff --git a/src/main/java/com/epam/ta/reportportal/core/widget/UpdateWidgetHandler.java b/src/main/java/com/epam/ta/reportportal/core/widget/UpdateWidgetHandler.java
index df8f2bea0d..ea2af6402b 100644
--- a/src/main/java/com/epam/ta/reportportal/core/widget/UpdateWidgetHandler.java
+++ b/src/main/java/com/epam/ta/reportportal/core/widget/UpdateWidgetHandler.java
@@ -17,10 +17,8 @@
 package com.epam.ta.reportportal.core.widget;
 
 import com.epam.ta.reportportal.commons.ReportPortalUser;
-import com.epam.ta.reportportal.entity.widget.Widget;
+import com.epam.ta.reportportal.model.widget.WidgetRQ;
 import com.epam.ta.reportportal.ws.model.OperationCompletionRS;
-import com.epam.ta.reportportal.ws.model.widget.WidgetRQ;
-import java.util.Collection;
 
 /**
  * @author Pavel Bortnik
@@ -30,14 +28,13 @@ public interface UpdateWidgetHandler {
   /**
    * Update a widget with a specified id.
    *
-   * @param widgetId The ID of the widget to be updated
-   * @param updateRQ The {@link WidgetRQ} containing the updated information for the widget
+   * @param widgetId       The ID of the widget to be updated
+   * @param updateRQ       The {@link WidgetRQ} containing the updated information for the widget
    * @param projectDetails The {@link ReportPortalUser.ProjectDetails} for the project associated with the widget
-   * @param user The {@link ReportPortalUser} who is updating the widget
+   * @param user           The {@link ReportPortalUser} who is updating the widget
    * @return An {@link OperationCompletionRS} instance indicating the result of the update operation
    */
   OperationCompletionRS updateWidget(Long widgetId, WidgetRQ updateRQ,
-      ReportPortalUser.ProjectDetails projectDetails,
-      ReportPortalUser user);
+      ReportPortalUser.ProjectDetails projectDetails, ReportPortalUser user);
 
 }
\ No newline at end of file
diff --git a/src/main/java/com/epam/ta/reportportal/core/widget/content/loader/materialized/HealthCheckTableReadyContentLoader.java b/src/main/java/com/epam/ta/reportportal/core/widget/content/loader/materialized/HealthCheckTableReadyContentLoader.java
index 53c981e08d..350b067035 100644
--- a/src/main/java/com/epam/ta/reportportal/core/widget/content/loader/materialized/HealthCheckTableReadyContentLoader.java
+++ b/src/main/java/com/epam/ta/reportportal/core/widget/content/loader/materialized/HealthCheckTableReadyContentLoader.java
@@ -20,8 +20,8 @@
 import com.epam.ta.reportportal.entity.widget.content.healthcheck.HealthCheckTableGetParams;
 import com.epam.ta.reportportal.entity.widget.content.healthcheck.LevelEntry;
 import com.epam.ta.reportportal.exception.ReportPortalException;
+import com.epam.ta.reportportal.model.widget.SortEntry;
 import com.epam.ta.reportportal.ws.model.ErrorType;
-import com.epam.ta.reportportal.ws.model.widget.SortEntry;
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.google.common.collect.ImmutableMap;
@@ -64,31 +64,25 @@ public HealthCheckTableReadyContentLoader(WidgetContentRepository widgetContentR
 
   @Override
   public Map<String, Object> loadContent(Widget widget, MultiValueMap<String, String> params) {
-    HealthCheckTableGetParams getParams = getParams(widget.getWidgetOptions(),
-        ofNullable(params.get(ATTRIBUTES)).map(attributes -> attributes.stream()
-            .filter(StringUtils::isNotBlank)
-            .collect(Collectors.toList())).orElseGet(Collections::emptyList)
-    );
-    List<HealthCheckTableContent> content = widgetContentRepository.componentHealthCheckTable(
-        getParams);
+    HealthCheckTableGetParams getParams =
+        getParams(widget.getWidgetOptions(), ofNullable(params.get(ATTRIBUTES)).map(
+            attributes -> attributes.stream().filter(StringUtils::isNotBlank)
+                .collect(Collectors.toList())).orElseGet(Collections::emptyList));
+    List<HealthCheckTableContent> content =
+        widgetContentRepository.componentHealthCheckTable(getParams);
 
     if (CollectionUtils.isEmpty(content)) {
       return emptyMap();
     }
 
-    Map<String, Integer> totalStatistics = content.stream()
-        .map(HealthCheckTableContent::getStatistics)
-        .map(Map::entrySet)
-        .flatMap(Collection::stream)
-        .collect(groupingBy(Map.Entry::getKey, Collectors.summingInt(Map.Entry::getValue)));
+    Map<String, Integer> totalStatistics =
+        content.stream().map(HealthCheckTableContent::getStatistics).map(Map::entrySet)
+            .flatMap(Collection::stream)
+            .collect(groupingBy(Map.Entry::getKey, Collectors.summingInt(Map.Entry::getValue)));
 
     return ImmutableMap.<String, Object>builder().put(RESULT, content)
-        .put(TOTAL,
-            ImmutableMap.<String, Object>builder().put(STATISTICS, totalStatistics)
-                .put(PASSING_RATE, calculatePassingRate(totalStatistics))
-                .build()
-        )
-        .build();
+        .put(TOTAL, ImmutableMap.<String, Object>builder().put(STATISTICS, totalStatistics)
+            .put(PASSING_RATE, calculatePassingRate(totalStatistics)).build()).build();
   }
 
   private HealthCheckTableGetParams getParams(WidgetOptions widgetOptions,
@@ -98,21 +92,17 @@ private HealthCheckTableGetParams getParams(WidgetOptions widgetOptions,
     BusinessRule.expect(attributeKeys, keys -> keys.size() > currentLevel)
         .verify(ErrorType.UNABLE_LOAD_WIDGET_CONTENT, "Incorrect level definition");
 
-    String viewName = ofNullable(
-        WidgetOptionUtil.getValueByKey(VIEW_NAME, widgetOptions)).orElseThrow(
-        () -> new ReportPortalException(
-            ErrorType.UNABLE_LOAD_WIDGET_CONTENT,
-            "Widget view name not provided"
-        ));
+    String viewName =
+        ofNullable(WidgetOptionUtil.getValueByKey(VIEW_NAME, widgetOptions)).orElseThrow(
+            () -> new ReportPortalException(ErrorType.UNABLE_LOAD_WIDGET_CONTENT,
+                "Widget view name not provided"
+            ));
     String currentLevelKey = attributeKeys.get(currentLevel);
-    boolean includeCustomColumn = ofNullable(
-        WidgetOptionUtil.getValueByKey(CUSTOM_COLUMN, widgetOptions)).isPresent();
-
-    return HealthCheckTableGetParams.of(viewName,
-        currentLevelKey,
-        resolveSort(widgetOptions),
-        includeCustomColumn,
-        getLevelEntries(attributeKeys, attributeValues),
+    boolean includeCustomColumn =
+        ofNullable(WidgetOptionUtil.getValueByKey(CUSTOM_COLUMN, widgetOptions)).isPresent();
+
+    return HealthCheckTableGetParams.of(viewName, currentLevelKey, resolveSort(widgetOptions),
+        includeCustomColumn, getLevelEntries(attributeKeys, attributeValues),
         WidgetOptionUtil.getBooleanByKey(EXCLUDE_SKIPPED, widgetOptions)
     );
 
@@ -122,16 +112,19 @@ private Sort resolveSort(WidgetOptions widgetOptions) {
     return ofNullable(widgetOptions).flatMap(
         wo -> ofNullable(wo.getOptions()).map(options -> options.get(SORT))).map(s -> {
       try {
-        SortEntry sortEntry = objectMapper.readValue(objectMapper.writeValueAsString(s),
-            SortEntry.class);
+        SortEntry sortEntry =
+            objectMapper.readValue(objectMapper.writeValueAsString(s), SortEntry.class);
         return Sort.by(sortEntry.isAsc() ? Sort.Direction.ASC : Sort.Direction.DESC,
-            sortEntry.getSortingColumn());
+            sortEntry.getSortingColumn()
+        );
       } catch (JsonProcessingException e) {
         throw new ReportPortalException(ErrorType.UNABLE_LOAD_WIDGET_CONTENT,
-            "Sort format error: " + e.getMessage());
+            "Sort format error: " + e.getMessage()
+        );
       }
     }).orElseThrow(() -> new ReportPortalException(ErrorType.UNABLE_LOAD_WIDGET_CONTENT,
-        "Sort parameter not provided"));
+        "Sort parameter not provided"
+    ));
   }
 
   private List<LevelEntry> getLevelEntries(List<String> attributeKeys,
diff --git a/src/main/java/com/epam/ta/reportportal/core/widget/impl/CreateWidgetHandlerImpl.java b/src/main/java/com/epam/ta/reportportal/core/widget/impl/CreateWidgetHandlerImpl.java
index c77fdbf3a3..905104b9bc 100644
--- a/src/main/java/com/epam/ta/reportportal/core/widget/impl/CreateWidgetHandlerImpl.java
+++ b/src/main/java/com/epam/ta/reportportal/core/widget/impl/CreateWidgetHandlerImpl.java
@@ -16,6 +16,10 @@
 
 package com.epam.ta.reportportal.core.widget.impl;
 
+import static com.epam.ta.reportportal.commons.Predicates.not;
+import static com.epam.ta.reportportal.commons.querygen.constant.GeneralCriteriaConstant.CRITERIA_ID;
+import static com.epam.ta.reportportal.ws.converter.converters.WidgetConverter.TO_ACTIVITY_RESOURCE;
+
 import com.epam.ta.reportportal.commons.ReportPortalUser;
 import com.epam.ta.reportportal.commons.querygen.Condition;
 import com.epam.ta.reportportal.commons.querygen.Filter;
@@ -31,85 +35,89 @@
 import com.epam.ta.reportportal.dao.WidgetRepository;
 import com.epam.ta.reportportal.entity.filter.UserFilter;
 import com.epam.ta.reportportal.entity.widget.Widget;
+import com.epam.ta.reportportal.model.EntryCreatedRS;
+import com.epam.ta.reportportal.model.widget.WidgetRQ;
 import com.epam.ta.reportportal.ws.converter.builders.WidgetBuilder;
-import com.epam.ta.reportportal.ws.model.EntryCreatedRS;
 import com.epam.ta.reportportal.ws.model.ErrorType;
-import com.epam.ta.reportportal.ws.model.widget.WidgetRQ;
+import java.util.Collections;
+import java.util.List;
+import java.util.stream.Collectors;
 import org.apache.commons.collections.CollectionUtils;
-import org.apache.commons.lang3.BooleanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.Pageable;
 import org.springframework.stereotype.Service;
 
-import java.util.Collections;
-import java.util.List;
-import java.util.stream.Collectors;
-
-import static com.epam.ta.reportportal.commons.Predicates.not;
-import static com.epam.ta.reportportal.commons.querygen.constant.GeneralCriteriaConstant.CRITERIA_ID;
-import static com.epam.ta.reportportal.ws.converter.converters.WidgetConverter.TO_ACTIVITY_RESOURCE;
-
 /**
  * @author Pavel Bortnik
  */
 @Service
 public class CreateWidgetHandlerImpl implements CreateWidgetHandler {
 
-	private final WidgetRepository widgetRepository;
-
-	private final UserFilterRepository filterRepository;
-
-	private final MessageBus messageBus;
-
-	private final UpdateUserFilterHandler updateUserFilterHandler;
-
-	private final List<WidgetPostProcessor> widgetPostProcessors;
-
-	private final WidgetValidator widgetContentFieldsValidator;
-
-	@Autowired
-	public CreateWidgetHandlerImpl(WidgetRepository widgetRepository, UserFilterRepository filterRepository, MessageBus messageBus,
-			UpdateUserFilterHandler updateUserFilterHandler,
-			List<WidgetPostProcessor> widgetPostProcessors, WidgetValidator widgetContentFieldsValidator) {
-		this.widgetRepository = widgetRepository;
-		this.filterRepository = filterRepository;
-		this.messageBus = messageBus;
-		this.updateUserFilterHandler = updateUserFilterHandler;
-		this.widgetPostProcessors = widgetPostProcessors;
-		this.widgetContentFieldsValidator = widgetContentFieldsValidator;
-	}
-
-	@Override
-	public EntryCreatedRS createWidget(WidgetRQ createWidgetRQ, ReportPortalUser.ProjectDetails projectDetails, ReportPortalUser user) {
-		List<UserFilter> userFilter = getUserFilters(createWidgetRQ.getFilterIds(), projectDetails.getProjectId(), user.getUsername());
-
-		Widget widget = new WidgetBuilder().addWidgetRq(createWidgetRQ)
-				.addProject(projectDetails.getProjectId())
-				.addFilters(userFilter)
-				.addOwner(user.getUsername())
-				.get();
-
-		widgetContentFieldsValidator.validate(widget);
-
-		widgetPostProcessors.stream()
-				.filter(widgetPostProcessor -> widgetPostProcessor.supports(widget))
-				.forEach(widgetPostProcessor -> widgetPostProcessor.postProcess(widget));
-
-		widgetRepository.save(widget);
-
-		messageBus.publishActivity(new WidgetCreatedEvent(TO_ACTIVITY_RESOURCE.apply(widget), user.getUserId(), user.getUsername()));
-		return new EntryCreatedRS(widget.getId());
-	}
-
-	private List<UserFilter> getUserFilters(List<Long> filterIds, Long projectId, String username) {
-		if (CollectionUtils.isNotEmpty(filterIds)) {
-			String ids = filterIds.stream().map(String::valueOf).collect(Collectors.joining(","));
-			Filter defaultFilter = new Filter(UserFilter.class, Condition.IN, false, ids, CRITERIA_ID);
-			List<UserFilter> userFilters = filterRepository.findByFilter(ProjectFilter.of(defaultFilter, projectId), Pageable.unpaged())
-					.getContent();
-			BusinessRule.expect(userFilters, not(List::isEmpty)).verify(ErrorType.USER_FILTER_NOT_FOUND, filterIds, projectId, username);
-			return userFilters;
-		}
-		return Collections.emptyList();
-	}
+  private final WidgetRepository widgetRepository;
+
+  private final UserFilterRepository filterRepository;
+
+  private final MessageBus messageBus;
+
+  private final UpdateUserFilterHandler updateUserFilterHandler;
+
+  private final List<WidgetPostProcessor> widgetPostProcessors;
+
+  private final WidgetValidator widgetContentFieldsValidator;
+
+  @Autowired
+  public CreateWidgetHandlerImpl(WidgetRepository widgetRepository,
+      UserFilterRepository filterRepository, MessageBus messageBus,
+      UpdateUserFilterHandler updateUserFilterHandler,
+      List<WidgetPostProcessor> widgetPostProcessors,
+      WidgetValidator widgetContentFieldsValidator) {
+    this.widgetRepository = widgetRepository;
+    this.filterRepository = filterRepository;
+    this.messageBus = messageBus;
+    this.updateUserFilterHandler = updateUserFilterHandler;
+    this.widgetPostProcessors = widgetPostProcessors;
+    this.widgetContentFieldsValidator = widgetContentFieldsValidator;
+  }
+
+  @Override
+  public EntryCreatedRS createWidget(WidgetRQ createWidgetRQ,
+      ReportPortalUser.ProjectDetails projectDetails, ReportPortalUser user) {
+    List<UserFilter> userFilter =
+        getUserFilters(createWidgetRQ.getFilterIds(), projectDetails.getProjectId(),
+            user.getUsername()
+        );
+
+    Widget widget =
+        new WidgetBuilder().addWidgetRq(createWidgetRQ).addProject(projectDetails.getProjectId())
+            .addFilters(userFilter).addOwner(user.getUsername()).get();
+
+    widgetContentFieldsValidator.validate(widget);
+
+    widgetPostProcessors.stream()
+        .filter(widgetPostProcessor -> widgetPostProcessor.supports(widget))
+        .forEach(widgetPostProcessor -> widgetPostProcessor.postProcess(widget));
+
+    widgetRepository.save(widget);
+
+    messageBus.publishActivity(
+        new WidgetCreatedEvent(TO_ACTIVITY_RESOURCE.apply(widget), user.getUserId(),
+            user.getUsername()
+        ));
+    return new EntryCreatedRS(widget.getId());
+  }
+
+  private List<UserFilter> getUserFilters(List<Long> filterIds, Long projectId, String username) {
+    if (CollectionUtils.isNotEmpty(filterIds)) {
+      String ids = filterIds.stream().map(String::valueOf).collect(Collectors.joining(","));
+      Filter defaultFilter = new Filter(UserFilter.class, Condition.IN, false, ids, CRITERIA_ID);
+      List<UserFilter> userFilters =
+          filterRepository.findByFilter(ProjectFilter.of(defaultFilter, projectId),
+              Pageable.unpaged()
+          ).getContent();
+      BusinessRule.expect(userFilters, not(List::isEmpty))
+          .verify(ErrorType.USER_FILTER_NOT_FOUND, filterIds, projectId, username);
+      return userFilters;
+    }
+    return Collections.emptyList();
+  }
 }
diff --git a/src/main/java/com/epam/ta/reportportal/core/widget/impl/GetWidgetHandlerImpl.java b/src/main/java/com/epam/ta/reportportal/core/widget/impl/GetWidgetHandlerImpl.java
index 28ed1ecbe3..878913db4a 100644
--- a/src/main/java/com/epam/ta/reportportal/core/widget/impl/GetWidgetHandlerImpl.java
+++ b/src/main/java/com/epam/ta/reportportal/core/widget/impl/GetWidgetHandlerImpl.java
@@ -16,6 +16,11 @@
 
 package com.epam.ta.reportportal.core.widget.impl;
 
+import static com.epam.ta.reportportal.commons.validation.BusinessRule.expect;
+import static com.epam.ta.reportportal.commons.validation.Suppliers.formattedSupplier;
+import static com.epam.ta.reportportal.core.widget.content.constant.ContentLoaderConstants.ATTRIBUTES;
+import static java.util.Optional.ofNullable;
+
 import com.epam.ta.reportportal.commons.ReportPortalUser;
 import com.epam.ta.reportportal.commons.querygen.Filter;
 import com.epam.ta.reportportal.commons.querygen.ProjectFilter;
@@ -30,13 +35,19 @@
 import com.epam.ta.reportportal.entity.widget.Widget;
 import com.epam.ta.reportportal.entity.widget.WidgetType;
 import com.epam.ta.reportportal.exception.ReportPortalException;
+import com.epam.ta.reportportal.model.widget.WidgetPreviewRQ;
+import com.epam.ta.reportportal.model.widget.WidgetResource;
 import com.epam.ta.reportportal.ws.converter.PagedResourcesAssembler;
 import com.epam.ta.reportportal.ws.converter.builders.WidgetBuilder;
 import com.epam.ta.reportportal.ws.converter.converters.WidgetConverter;
 import com.epam.ta.reportportal.ws.model.ErrorType;
-import com.epam.ta.reportportal.ws.model.widget.WidgetPreviewRQ;
-import com.epam.ta.reportportal.ws.model.widget.WidgetResource;
 import com.google.common.collect.Lists;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.function.Predicate;
 import org.apache.commons.collections.CollectionUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
@@ -45,199 +56,197 @@
 import org.springframework.stereotype.Service;
 import org.springframework.util.MultiValueMap;
 
-import java.util.*;
-import java.util.function.Predicate;
-
-import static com.epam.ta.reportportal.commons.validation.BusinessRule.expect;
-import static com.epam.ta.reportportal.commons.validation.Suppliers.formattedSupplier;
-import static com.epam.ta.reportportal.core.widget.content.constant.ContentLoaderConstants.ATTRIBUTES;
-import static java.util.Optional.ofNullable;
-
 /**
  * @author Pavel Bortnik
  */
 @Service
 public class GetWidgetHandlerImpl implements GetWidgetHandler {
 
-	private Map<WidgetType, BuildFilterStrategy> buildFilterStrategyMapping;
-
-	private Map<WidgetType, LoadContentStrategy> loadContentStrategy;
-
-	private Map<WidgetType, MultilevelLoadContentStrategy> multilevelLoadContentStrategy;
-
-	private MaterializedLoadContentStrategy materializedLoadContentStrategy;
-
-	private Set<WidgetType> unfilteredWidgetTypes;
-
-	@Autowired
-	private WidgetRepository widgetRepository;
-
-	@Autowired
-	private GetUserFilterHandler getUserFilterHandler;
-
-	@Autowired
-	@Qualifier("buildFilterStrategy")
-	public void setBuildFilterStrategy(Map<WidgetType, BuildFilterStrategy> buildFilterStrategyMapping) {
-		this.buildFilterStrategyMapping = buildFilterStrategyMapping;
-	}
-
-	@Autowired
-	@Qualifier("contentLoader")
-	public void setLoadContentStrategy(Map<WidgetType, LoadContentStrategy> loadContentStrategy) {
-		this.loadContentStrategy = loadContentStrategy;
-	}
-
-	@Autowired
-	@Qualifier("multilevelContentLoader")
-	public void setMultilevelLoadContentStrategy(Map<WidgetType, MultilevelLoadContentStrategy> multilevelLoadContentStrategy) {
-		this.multilevelLoadContentStrategy = multilevelLoadContentStrategy;
-	}
-
-	@Autowired
-	public void setMaterializedLoadContentStrategy(MaterializedLoadContentStrategy materializedLoadContentStrategy) {
-		this.materializedLoadContentStrategy = materializedLoadContentStrategy;
-	}
-
-	@Autowired
-	@Qualifier("unfilteredWidgetTypes")
-	public void setUnfilteredWidgetTypes(Set<WidgetType> unfilteredWidgetTypes) {
-		this.unfilteredWidgetTypes = unfilteredWidgetTypes;
-	}
-
-	@Override
-	public WidgetResource getWidget(Long widgetId, ReportPortalUser.ProjectDetails projectDetails, ReportPortalUser user) {
-		Widget widget = widgetRepository.findByIdAndProjectId(widgetId, projectDetails.getProjectId())
-				.orElseThrow(() -> new ReportPortalException(ErrorType.WIDGET_NOT_FOUND_IN_PROJECT,
-						widgetId,
-						projectDetails.getProjectName()
-				));
-
-		WidgetType widgetType = WidgetType.findByName(widget.getWidgetType())
-				.orElseThrow(() -> new ReportPortalException(ErrorType.INCORRECT_REQUEST,
-						formattedSupplier("Unsupported widget type '{}'", widget.getWidgetType())
-				));
-
-		expect(widgetType.isSupportMultilevelStructure(), Predicate.isEqual(false)).verify(ErrorType.INCORRECT_REQUEST,
-				formattedSupplier("Unsupported widget type '{}'", widgetType)
-		);
-
-		Map<String, ?> content;
-
-		if (unfilteredWidgetTypes.contains(widgetType) || isFilteredContentLoadAllowed(widget.getFilters(), projectDetails, user)) {
-			content = loadContentStrategy.get(widgetType).loadContent(Lists.newArrayList(widget.getContentFields()),
-					buildFilterStrategyMapping.get(widgetType).buildFilter(widget),
-					widget.getWidgetOptions(),
-					widget.getItemsCount()
-			);
-		} else {
-			content = Collections.emptyMap();
-		}
-
-		WidgetResource resource = WidgetConverter.TO_WIDGET_RESOURCE.apply(widget);
-		resource.setContent(content);
-		return resource;
-	}
-
-	@Override
-	public WidgetResource getWidget(Long widgetId, String[] attributes, MultiValueMap<String, String> params,
-			ReportPortalUser.ProjectDetails projectDetails, ReportPortalUser user) {
-		Widget widget = widgetRepository.findByIdAndProjectId(widgetId, projectDetails.getProjectId())
-				.orElseThrow(() -> new ReportPortalException(ErrorType.WIDGET_NOT_FOUND_IN_PROJECT,
-						widgetId,
-						projectDetails.getProjectName()
-				));
-
-		WidgetType widgetType = WidgetType.findByName(widget.getWidgetType())
-				.orElseThrow(() -> new ReportPortalException(ErrorType.INCORRECT_REQUEST,
-						formattedSupplier("Unsupported widget type '{}'", widget.getWidgetType())
-				));
-
-		expect(widgetType.isSupportMultilevelStructure(), Predicate.isEqual(true)).verify(ErrorType.INCORRECT_REQUEST,
-				formattedSupplier("Widget type '{}' does not support multilevel structure.", widgetType)
-		);
-		Map<String, ?> content;
-
-		if (unfilteredWidgetTypes.contains(widgetType) || isFilteredContentLoadAllowed(widget.getFilters(), projectDetails, user)) {
-			params.put(ATTRIBUTES, Lists.newArrayList(attributes));
-			content = ofNullable(multilevelLoadContentStrategy.get(widgetType)).map(strategy -> strategy.loadContent(Lists.newArrayList(
-							widget.getContentFields()),
-					buildFilterStrategyMapping.get(widgetType).buildFilter(widget),
-					widget.getWidgetOptions(),
-					attributes,
-					params,
-					widget.getItemsCount()
-			)).orElseGet(() -> materializedLoadContentStrategy.loadContent(widget, params));
-
-		} else {
-			content = Collections.emptyMap();
-		}
-
-		WidgetResource resource = WidgetConverter.TO_WIDGET_RESOURCE.apply(widget);
-		resource.setContent(content);
-		return resource;
-	}
-
-	private Boolean isFilteredContentLoadAllowed(Collection<UserFilter> userFilters, ReportPortalUser.ProjectDetails projectDetails,
-			ReportPortalUser user) {
-
-		if (CollectionUtils.isEmpty(userFilters)) {
-			return false;
-		}
-
-		Long[] ids = userFilters.stream().map(UserFilter::getId).toArray(Long[]::new);
-		List<UserFilter> permittedFilters = getPermittedFilters(ids, projectDetails, user);
-		return userFilters.size() == permittedFilters.size();
-
-	}
-
-	@Override
-	public Map<String, ?> getWidgetPreview(WidgetPreviewRQ previewRQ, ReportPortalUser.ProjectDetails projectDetails,
-			ReportPortalUser user) {
-
-		WidgetType widgetType = WidgetType.findByName(previewRQ.getWidgetType())
-				.orElseThrow(() -> new ReportPortalException(ErrorType.INCORRECT_REQUEST,
-						formattedSupplier("Unsupported widget type '{}'", previewRQ.getWidgetType())
-				));
-
-		List<UserFilter> userFilter = null;
-		if (CollectionUtils.isNotEmpty(previewRQ.getFilterIds())) {
-			userFilter = getPermittedFilters(previewRQ.getFilterIds().toArray(Long[]::new), projectDetails, user);
-		}
-
-		if (!unfilteredWidgetTypes.contains(widgetType) && CollectionUtils.isEmpty(userFilter)) {
-			return Collections.emptyMap();
-		}
-
-		Widget widget = new WidgetBuilder().addWidgetPreviewRq(previewRQ)
-				.addProject(projectDetails.getProjectId())
-				.addFilters(userFilter)
-				.get();
-
-		if (widgetType.isSupportMultilevelStructure()) {
-			return multilevelLoadContentStrategy.get(widgetType).loadContent(Lists.newArrayList(widget.getContentFields()),
-					buildFilterStrategyMapping.get(widgetType).buildFilter(widget),
-					widget.getWidgetOptions(),
-					null,
-					null,
-					widget.getItemsCount()
-			);
-		} else {
-			return loadContentStrategy.get(widgetType).loadContent(Lists.newArrayList(widget.getContentFields()),
-					buildFilterStrategyMapping.get(widgetType).buildFilter(widget),
-					widget.getWidgetOptions(),
-					widget.getItemsCount()
-			);
-		}
-	}
-
-	List<UserFilter> getPermittedFilters(Long[] ids, ReportPortalUser.ProjectDetails projectDetails, ReportPortalUser user) {
-		return getUserFilterHandler.getFiltersById(ids, projectDetails, user);
-	}
-
-	@Override
-	public Iterable<Object> getOwnNames(ReportPortalUser.ProjectDetails projectDetails, Pageable pageable, Filter filter,
-			ReportPortalUser user) {
-		final Page<Widget> widgets = widgetRepository.findByFilter(ProjectFilter.of(filter, projectDetails.getProjectId()), pageable);
-		return PagedResourcesAssembler.pageConverter().apply(widgets.map(Widget::getName));
-	}
+  private Map<WidgetType, BuildFilterStrategy> buildFilterStrategyMapping;
+
+  private Map<WidgetType, LoadContentStrategy> loadContentStrategy;
+
+  private Map<WidgetType, MultilevelLoadContentStrategy> multilevelLoadContentStrategy;
+
+  private MaterializedLoadContentStrategy materializedLoadContentStrategy;
+
+  private Set<WidgetType> unfilteredWidgetTypes;
+
+  @Autowired
+  private WidgetRepository widgetRepository;
+
+  @Autowired
+  private GetUserFilterHandler getUserFilterHandler;
+
+  @Autowired
+  @Qualifier("buildFilterStrategy")
+  public void setBuildFilterStrategy(
+      Map<WidgetType, BuildFilterStrategy> buildFilterStrategyMapping) {
+    this.buildFilterStrategyMapping = buildFilterStrategyMapping;
+  }
+
+  @Autowired
+  @Qualifier("contentLoader")
+  public void setLoadContentStrategy(Map<WidgetType, LoadContentStrategy> loadContentStrategy) {
+    this.loadContentStrategy = loadContentStrategy;
+  }
+
+  @Autowired
+  @Qualifier("multilevelContentLoader")
+  public void setMultilevelLoadContentStrategy(
+      Map<WidgetType, MultilevelLoadContentStrategy> multilevelLoadContentStrategy) {
+    this.multilevelLoadContentStrategy = multilevelLoadContentStrategy;
+  }
+
+  @Autowired
+  public void setMaterializedLoadContentStrategy(
+      MaterializedLoadContentStrategy materializedLoadContentStrategy) {
+    this.materializedLoadContentStrategy = materializedLoadContentStrategy;
+  }
+
+  @Autowired
+  @Qualifier("unfilteredWidgetTypes")
+  public void setUnfilteredWidgetTypes(Set<WidgetType> unfilteredWidgetTypes) {
+    this.unfilteredWidgetTypes = unfilteredWidgetTypes;
+  }
+
+  @Override
+  public WidgetResource getWidget(Long widgetId, ReportPortalUser.ProjectDetails projectDetails,
+      ReportPortalUser user) {
+    Widget widget = widgetRepository.findByIdAndProjectId(widgetId, projectDetails.getProjectId())
+        .orElseThrow(
+            () -> new ReportPortalException(ErrorType.WIDGET_NOT_FOUND_IN_PROJECT, widgetId,
+                projectDetails.getProjectName()
+            ));
+
+    WidgetType widgetType = WidgetType.findByName(widget.getWidgetType()).orElseThrow(
+        () -> new ReportPortalException(ErrorType.INCORRECT_REQUEST,
+            formattedSupplier("Unsupported widget type '{}'", widget.getWidgetType())
+        ));
+
+    expect(widgetType.isSupportMultilevelStructure(), Predicate.isEqual(false)).verify(
+        ErrorType.INCORRECT_REQUEST, formattedSupplier("Unsupported widget type '{}'", widgetType));
+
+    Map<String, ?> content;
+
+    if (unfilteredWidgetTypes.contains(widgetType) || isFilteredContentLoadAllowed(
+        widget.getFilters(), projectDetails, user)) {
+      content = loadContentStrategy.get(widgetType)
+          .loadContent(Lists.newArrayList(widget.getContentFields()),
+              buildFilterStrategyMapping.get(widgetType).buildFilter(widget),
+              widget.getWidgetOptions(), widget.getItemsCount()
+          );
+    } else {
+      content = Collections.emptyMap();
+    }
+
+    WidgetResource resource = WidgetConverter.TO_WIDGET_RESOURCE.apply(widget);
+    resource.setContent(content);
+    return resource;
+  }
+
+  @Override
+  public WidgetResource getWidget(Long widgetId, String[] attributes,
+      MultiValueMap<String, String> params, ReportPortalUser.ProjectDetails projectDetails,
+      ReportPortalUser user) {
+    Widget widget = widgetRepository.findByIdAndProjectId(widgetId, projectDetails.getProjectId())
+        .orElseThrow(
+            () -> new ReportPortalException(ErrorType.WIDGET_NOT_FOUND_IN_PROJECT, widgetId,
+                projectDetails.getProjectName()
+            ));
+
+    WidgetType widgetType = WidgetType.findByName(widget.getWidgetType()).orElseThrow(
+        () -> new ReportPortalException(ErrorType.INCORRECT_REQUEST,
+            formattedSupplier("Unsupported widget type '{}'", widget.getWidgetType())
+        ));
+
+    expect(widgetType.isSupportMultilevelStructure(), Predicate.isEqual(true)).verify(
+        ErrorType.INCORRECT_REQUEST,
+        formattedSupplier("Widget type '{}' does not support multilevel structure.", widgetType)
+    );
+    Map<String, ?> content;
+
+    if (unfilteredWidgetTypes.contains(widgetType) || isFilteredContentLoadAllowed(
+        widget.getFilters(), projectDetails, user)) {
+      params.put(ATTRIBUTES, Lists.newArrayList(attributes));
+      content = ofNullable(multilevelLoadContentStrategy.get(widgetType)).map(
+          strategy -> strategy.loadContent(Lists.newArrayList(widget.getContentFields()),
+              buildFilterStrategyMapping.get(widgetType).buildFilter(widget),
+              widget.getWidgetOptions(), attributes, params, widget.getItemsCount()
+          )).orElseGet(() -> materializedLoadContentStrategy.loadContent(widget, params));
+
+    } else {
+      content = Collections.emptyMap();
+    }
+
+    WidgetResource resource = WidgetConverter.TO_WIDGET_RESOURCE.apply(widget);
+    resource.setContent(content);
+    return resource;
+  }
+
+  private Boolean isFilteredContentLoadAllowed(Collection<UserFilter> userFilters,
+      ReportPortalUser.ProjectDetails projectDetails, ReportPortalUser user) {
+
+    if (CollectionUtils.isEmpty(userFilters)) {
+      return false;
+    }
+
+    Long[] ids = userFilters.stream().map(UserFilter::getId).toArray(Long[]::new);
+    List<UserFilter> permittedFilters = getPermittedFilters(ids, projectDetails, user);
+    return userFilters.size() == permittedFilters.size();
+
+  }
+
+  @Override
+  public Map<String, ?> getWidgetPreview(WidgetPreviewRQ previewRQ,
+      ReportPortalUser.ProjectDetails projectDetails, ReportPortalUser user) {
+
+    WidgetType widgetType = WidgetType.findByName(previewRQ.getWidgetType()).orElseThrow(
+        () -> new ReportPortalException(ErrorType.INCORRECT_REQUEST,
+            formattedSupplier("Unsupported widget type '{}'", previewRQ.getWidgetType())
+        ));
+
+    List<UserFilter> userFilter = null;
+    if (CollectionUtils.isNotEmpty(previewRQ.getFilterIds())) {
+      userFilter =
+          getPermittedFilters(previewRQ.getFilterIds().toArray(Long[]::new), projectDetails, user);
+    }
+
+    if (!unfilteredWidgetTypes.contains(widgetType) && CollectionUtils.isEmpty(userFilter)) {
+      return Collections.emptyMap();
+    }
+
+    Widget widget =
+        new WidgetBuilder().addWidgetPreviewRq(previewRQ).addProject(projectDetails.getProjectId())
+            .addFilters(userFilter).get();
+
+    if (widgetType.isSupportMultilevelStructure()) {
+      return multilevelLoadContentStrategy.get(widgetType)
+          .loadContent(Lists.newArrayList(widget.getContentFields()),
+              buildFilterStrategyMapping.get(widgetType).buildFilter(widget),
+              widget.getWidgetOptions(), null, null, widget.getItemsCount()
+          );
+    } else {
+      return loadContentStrategy.get(widgetType)
+          .loadContent(Lists.newArrayList(widget.getContentFields()),
+              buildFilterStrategyMapping.get(widgetType).buildFilter(widget),
+              widget.getWidgetOptions(), widget.getItemsCount()
+          );
+    }
+  }
+
+  List<UserFilter> getPermittedFilters(Long[] ids, ReportPortalUser.ProjectDetails projectDetails,
+      ReportPortalUser user) {
+    return getUserFilterHandler.getFiltersById(ids, projectDetails, user);
+  }
+
+  @Override
+  public Iterable<Object> getOwnNames(ReportPortalUser.ProjectDetails projectDetails,
+      Pageable pageable, Filter filter, ReportPortalUser user) {
+    final Page<Widget> widgets =
+        widgetRepository.findByFilter(ProjectFilter.of(filter, projectDetails.getProjectId()),
+            pageable
+        );
+    return PagedResourcesAssembler.pageConverter().apply(widgets.map(Widget::getName));
+  }
 }
\ No newline at end of file
diff --git a/src/main/java/com/epam/ta/reportportal/core/widget/impl/UpdateWidgetHandlerImpl.java b/src/main/java/com/epam/ta/reportportal/core/widget/impl/UpdateWidgetHandlerImpl.java
index c14f34e8eb..5df764f7f1 100644
--- a/src/main/java/com/epam/ta/reportportal/core/widget/impl/UpdateWidgetHandlerImpl.java
+++ b/src/main/java/com/epam/ta/reportportal/core/widget/impl/UpdateWidgetHandlerImpl.java
@@ -16,6 +16,9 @@
 
 package com.epam.ta.reportportal.core.widget.impl;
 
+import static com.epam.ta.reportportal.commons.querygen.constant.GeneralCriteriaConstant.CRITERIA_ID;
+import static com.epam.ta.reportportal.ws.converter.converters.WidgetConverter.TO_ACTIVITY_RESOURCE;
+
 import com.epam.ta.reportportal.commons.ReportPortalUser;
 import com.epam.ta.reportportal.commons.querygen.Condition;
 import com.epam.ta.reportportal.commons.querygen.Filter;
@@ -31,105 +34,97 @@
 import com.epam.ta.reportportal.entity.filter.UserFilter;
 import com.epam.ta.reportportal.entity.widget.Widget;
 import com.epam.ta.reportportal.exception.ReportPortalException;
+import com.epam.ta.reportportal.model.activity.WidgetActivityResource;
+import com.epam.ta.reportportal.model.widget.WidgetRQ;
 import com.epam.ta.reportportal.ws.converter.builders.WidgetBuilder;
 import com.epam.ta.reportportal.ws.model.ErrorType;
 import com.epam.ta.reportportal.ws.model.OperationCompletionRS;
-import com.epam.ta.reportportal.ws.model.activity.WidgetActivityResource;
-import com.epam.ta.reportportal.ws.model.widget.WidgetRQ;
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
+import java.util.Collections;
+import java.util.List;
+import java.util.stream.Collectors;
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.lang3.BooleanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.Pageable;
 import org.springframework.stereotype.Service;
 
-import java.util.Collections;
-import java.util.List;
-import java.util.stream.Collectors;
-
-import static com.epam.ta.reportportal.commons.querygen.constant.GeneralCriteriaConstant.CRITERIA_ID;
-import static com.epam.ta.reportportal.ws.converter.converters.WidgetConverter.TO_ACTIVITY_RESOURCE;
-
 /**
  * @author Pavel Bortnik
  */
 @Service
 public class UpdateWidgetHandlerImpl implements UpdateWidgetHandler {
 
-	private final WidgetRepository widgetRepository;
-	private final UserFilterRepository filterRepository;
-	private final MessageBus messageBus;
-	private final ObjectMapper objectMapper;
-	private final WidgetValidator widgetContentFieldsValidator;
-
-	@Autowired
-	public UpdateWidgetHandlerImpl(WidgetRepository widgetRepository, UserFilterRepository filterRepository, MessageBus messageBus,
-			ObjectMapper objectMapper, WidgetValidator widgetContentFieldsValidator) {
-		this.widgetRepository = widgetRepository;
-		this.filterRepository = filterRepository;
-		this.messageBus = messageBus;
-		this.objectMapper = objectMapper;
-		this.widgetContentFieldsValidator = widgetContentFieldsValidator;
-	}
-
-	@Override
-	public OperationCompletionRS updateWidget(Long widgetId, WidgetRQ updateRQ, ReportPortalUser.ProjectDetails projectDetails,
-			ReportPortalUser user) {
-		Widget widget = widgetRepository.findByIdAndProjectId(widgetId, projectDetails.getProjectId())
-				.orElseThrow(() -> new ReportPortalException(ErrorType.WIDGET_NOT_FOUND_IN_PROJECT,
-						widgetId,
-						projectDetails.getProjectName()
-				));
-
-		widgetContentFieldsValidator.validate(widget);
-
-		if (!widget.getName().equals(updateRQ.getName())) {
-			BusinessRule.expect(widgetRepository.existsByNameAndOwnerAndProjectId(updateRQ.getName(),
-							user.getUsername(),
-							projectDetails.getProjectId()
-					), BooleanUtils::isFalse)
-					.verify(ErrorType.RESOURCE_ALREADY_EXISTS, updateRQ.getName());
-		}
-
-		WidgetActivityResource before = TO_ACTIVITY_RESOURCE.apply(widget);
-
-		List<UserFilter> userFilter = getUserFilters(updateRQ.getFilterIds(), projectDetails.getProjectId());
-		String widgetOptionsBefore = parseWidgetOptions(widget);
-
-		widget = new WidgetBuilder(widget).addWidgetRq(updateRQ).addFilters(userFilter).get();
-		widgetRepository.save(widget);
-
-		messageBus.publishActivity(new WidgetUpdatedEvent(before,
-				TO_ACTIVITY_RESOURCE.apply(widget),
-				widgetOptionsBefore,
-				parseWidgetOptions(widget),
-				user.getUserId(),
-				user.getUsername()
-		));
-		return new OperationCompletionRS("Widget with ID = '" + widget.getId() + "' successfully updated.");
-	}
-
-	private List<UserFilter> getUserFilters(List<Long> filterIds, Long projectId) {
-		if (CollectionUtils.isNotEmpty(filterIds)) {
-			Filter defaultFilter = new Filter(UserFilter.class,
-					Condition.IN,
-					false,
-					filterIds.stream().map(String::valueOf).collect(Collectors.joining(",")),
-					CRITERIA_ID
-			);
-			return filterRepository.findByFilter(ProjectFilter.of(defaultFilter, projectId), Pageable.unpaged()).getContent();
-		}
-		return Collections.emptyList();
-	}
-
-	private String parseWidgetOptions(Widget widget) {
-		try {
-			return objectMapper.writeValueAsString(widget.getWidgetOptions());
-		} catch (JsonProcessingException e) {
-			throw new ReportPortalException(ErrorType.INCORRECT_REQUEST,
-					Suppliers.formattedSupplier("Error during parsing new widget options of widget with id = ", widget.getId())
-			);
-		}
-	}
+  private final WidgetRepository widgetRepository;
+  private final UserFilterRepository filterRepository;
+  private final MessageBus messageBus;
+  private final ObjectMapper objectMapper;
+  private final WidgetValidator widgetContentFieldsValidator;
+
+  @Autowired
+  public UpdateWidgetHandlerImpl(WidgetRepository widgetRepository,
+      UserFilterRepository filterRepository, MessageBus messageBus, ObjectMapper objectMapper,
+      WidgetValidator widgetContentFieldsValidator) {
+    this.widgetRepository = widgetRepository;
+    this.filterRepository = filterRepository;
+    this.messageBus = messageBus;
+    this.objectMapper = objectMapper;
+    this.widgetContentFieldsValidator = widgetContentFieldsValidator;
+  }
+
+  @Override
+  public OperationCompletionRS updateWidget(Long widgetId, WidgetRQ updateRQ,
+      ReportPortalUser.ProjectDetails projectDetails, ReportPortalUser user) {
+    Widget widget = widgetRepository.findByIdAndProjectId(widgetId, projectDetails.getProjectId())
+        .orElseThrow(
+            () -> new ReportPortalException(ErrorType.WIDGET_NOT_FOUND_IN_PROJECT, widgetId,
+                projectDetails.getProjectName()
+            ));
+
+    widgetContentFieldsValidator.validate(widget);
+
+    if (!widget.getName().equals(updateRQ.getName())) {
+      BusinessRule.expect(
+          widgetRepository.existsByNameAndOwnerAndProjectId(updateRQ.getName(), user.getUsername(),
+              projectDetails.getProjectId()
+          ), BooleanUtils::isFalse).verify(ErrorType.RESOURCE_ALREADY_EXISTS, updateRQ.getName());
+    }
+
+    WidgetActivityResource before = TO_ACTIVITY_RESOURCE.apply(widget);
+
+    List<UserFilter> userFilter =
+        getUserFilters(updateRQ.getFilterIds(), projectDetails.getProjectId());
+    String widgetOptionsBefore = parseWidgetOptions(widget);
+
+    widget = new WidgetBuilder(widget).addWidgetRq(updateRQ).addFilters(userFilter).get();
+    widgetRepository.save(widget);
+
+    messageBus.publishActivity(
+        new WidgetUpdatedEvent(before, TO_ACTIVITY_RESOURCE.apply(widget), widgetOptionsBefore,
+            parseWidgetOptions(widget), user.getUserId(), user.getUsername()
+        ));
+    return new OperationCompletionRS(
+        "Widget with ID = '" + widget.getId() + "' successfully updated.");
+  }
+
+  private List<UserFilter> getUserFilters(List<Long> filterIds, Long projectId) {
+    if (CollectionUtils.isNotEmpty(filterIds)) {
+      Filter defaultFilter = new Filter(UserFilter.class, Condition.IN, false,
+          filterIds.stream().map(String::valueOf).collect(Collectors.joining(",")), CRITERIA_ID
+      );
+      return filterRepository.findByFilter(
+          ProjectFilter.of(defaultFilter, projectId), Pageable.unpaged()).getContent();
+    }
+    return Collections.emptyList();
+  }
+
+  private String parseWidgetOptions(Widget widget) {
+    try {
+      return objectMapper.writeValueAsString(widget.getWidgetOptions());
+    } catch (JsonProcessingException e) {
+      throw new ReportPortalException(ErrorType.INCORRECT_REQUEST, Suppliers.formattedSupplier(
+          "Error during parsing new widget options of widget with id = ", widget.getId()));
+    }
+  }
 }
diff --git a/src/main/java/com/epam/ta/reportportal/demodata/service/DemoDashboardsService.java b/src/main/java/com/epam/ta/reportportal/demodata/service/DemoDashboardsService.java
index ac1ad9a2ae..51ec7a5ce1 100644
--- a/src/main/java/com/epam/ta/reportportal/demodata/service/DemoDashboardsService.java
+++ b/src/main/java/com/epam/ta/reportportal/demodata/service/DemoDashboardsService.java
@@ -16,12 +16,21 @@
 
 package com.epam.ta.reportportal.demodata.service;
 
+import static com.epam.ta.reportportal.commons.querygen.constant.GeneralCriteriaConstant.CRITERIA_NAME;
+import static com.epam.ta.reportportal.commons.querygen.constant.ItemAttributeConstant.CRITERIA_COMPOSITE_ATTRIBUTE;
+import static com.epam.ta.reportportal.ws.model.ErrorType.PROJECT_NOT_FOUND;
+import static java.util.stream.Collectors.toList;
+
 import com.epam.ta.reportportal.commons.ReportPortalUser;
 import com.epam.ta.reportportal.commons.querygen.Condition;
 import com.epam.ta.reportportal.commons.querygen.Filter;
 import com.epam.ta.reportportal.commons.querygen.FilterCondition;
 import com.epam.ta.reportportal.commons.querygen.ProjectFilter;
-import com.epam.ta.reportportal.dao.*;
+import com.epam.ta.reportportal.dao.DashboardRepository;
+import com.epam.ta.reportportal.dao.DashboardWidgetRepository;
+import com.epam.ta.reportportal.dao.ProjectRepository;
+import com.epam.ta.reportportal.dao.UserFilterRepository;
+import com.epam.ta.reportportal.dao.WidgetRepository;
 import com.epam.ta.reportportal.entity.dashboard.Dashboard;
 import com.epam.ta.reportportal.entity.dashboard.DashboardWidget;
 import com.epam.ta.reportportal.entity.dashboard.DashboardWidgetId;
@@ -32,12 +41,16 @@
 import com.epam.ta.reportportal.entity.widget.Widget;
 import com.epam.ta.reportportal.entity.widget.WidgetType;
 import com.epam.ta.reportportal.exception.ReportPortalException;
+import com.epam.ta.reportportal.model.widget.WidgetRQ;
 import com.epam.ta.reportportal.ws.converter.builders.WidgetBuilder;
 import com.epam.ta.reportportal.ws.model.ErrorType;
-import com.epam.ta.reportportal.ws.model.widget.WidgetRQ;
 import com.fasterxml.jackson.core.type.TypeReference;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.google.common.collect.Sets;
+import java.io.IOException;
+import java.time.LocalDateTime;
+import java.util.List;
+import java.util.Optional;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.core.io.Resource;
@@ -46,169 +59,173 @@
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
-import java.io.IOException;
-import java.time.LocalDateTime;
-import java.util.List;
-import java.util.Optional;
-
-import static com.epam.ta.reportportal.commons.querygen.constant.GeneralCriteriaConstant.CRITERIA_NAME;
-import static com.epam.ta.reportportal.commons.querygen.constant.ItemAttributeConstant.CRITERIA_COMPOSITE_ATTRIBUTE;
-import static com.epam.ta.reportportal.ws.model.ErrorType.PROJECT_NOT_FOUND;
-import static java.util.stream.Collectors.toList;
-
 @Service
 class DemoDashboardsService {
 
-	private static final String DASHBOARD_NAME = "DEMO DASHBOARD";
-	private static final String FILTER_NAME = "DEMO_FILTER";
-	private static final String START_TIME_SORTING = "startTime";
-	private static final boolean SHARED = true;
-
-	private final UserFilterRepository userFilterRepository;
-
-	private final DashboardRepository dashboardRepository;
-
-	private final DashboardWidgetRepository dashboardWidgetRepository;
-
-	private final WidgetRepository widgetRepository;
-
-	private final ProjectRepository projectRepository;
-
-	private final ObjectMapper objectMapper;
-
-	private Resource resource;
-
-	@Autowired
-	public DemoDashboardsService(UserFilterRepository userFilterRepository, DashboardRepository dashboardRepository,
-			DashboardWidgetRepository dashboardWidgetRepository, WidgetRepository widgetRepository, ProjectRepository projectRepository,
-			ObjectMapper objectMapper) {
-		this.userFilterRepository = userFilterRepository;
-		this.dashboardRepository = dashboardRepository;
-		this.dashboardWidgetRepository = dashboardWidgetRepository;
-		this.widgetRepository = widgetRepository;
-		this.projectRepository = projectRepository;
-		this.objectMapper = objectMapper;
-	}
-
-	@Value("classpath:demo/demo_widgets.json")
-	public void setResource(Resource resource) {
-		this.resource = resource;
-	}
-
-	@Transactional
-	public Optional<Dashboard> generate(ReportPortalUser user, Long projectId) {
-		Project project = projectRepository.findById(projectId).orElseThrow(() -> new ReportPortalException(PROJECT_NOT_FOUND, projectId));
-
-		if (dashboardRepository.existsByNameAndOwnerAndProjectId(DASHBOARD_NAME, user.getUsername(), projectId)) {
-			return Optional.empty();
-		}
-
-		UserFilter filter = createDemoFilter(user, project);
-		List<Widget> widgets = createWidgets(user, projectId, filter);
-		return Optional.of(createDemoDashboard(widgets, user, project, DASHBOARD_NAME));
-	}
-
-	private List<Widget> createWidgets(ReportPortalUser user, Long projectId, UserFilter filter) {
-		try {
-			TypeReference<List<WidgetRQ>> type = new TypeReference<>() {
-			};
-
-			List<Widget> widgets = objectMapper.readValue(resource.getURL(), type).stream().map(it -> {
-				final WidgetBuilder widgetBuilder = new WidgetBuilder().addWidgetRq(it).addProject(projectId).addOwner(user.getUsername());
-				final WidgetType widgetType = WidgetType.findByName(it.getWidgetType())
-						.orElseThrow(() -> new ReportPortalException(ErrorType.UNABLE_TO_CREATE_WIDGET,
-								"Widget type '" + it.getWidgetType() + "' does not exists"
-						));
-				if (!WidgetType.FLAKY_TEST_CASES.equals(widgetType) || !WidgetType.TOP_TEST_CASES.equals(widgetType)) {
-					widgetBuilder.addFilters(Sets.newHashSet(filter));
-				}
-				return widgetBuilder.get();
-			}).collect(toList());
-			widgetRepository.saveAll(widgets);
-			return widgets;
-		} catch (IOException e) {
-			throw new ReportPortalException("Unable to load demo_widgets.json. " + e.getMessage(), e);
-		}
-	}
-
-	private UserFilter createDemoFilter(ReportPortalUser user, Project project) {
-		List<UserFilter> existedFilterList = userFilterRepository.findByFilter(ProjectFilter.of(Filter.builder()
-				.withTarget(UserFilter.class)
-				.withCondition(FilterCondition.builder()
-						.withCondition(Condition.EQUALS)
-						.withSearchCriteria(CRITERIA_NAME)
-						.withValue(FILTER_NAME)
-						.build())
-				.build(), project.getId()), Pageable.unpaged()).getContent();
-
-		if (!existedFilterList.isEmpty()) {
-			return existedFilterList.get(0);
-		}
-
-		UserFilter userFilter = new UserFilter();
-		userFilter.setName(FILTER_NAME);
-		userFilter.setTargetClass(ObjectType.Launch);
-		userFilter.setProject(project);
-		userFilter.setFilterCondition(Sets.newHashSet(FilterCondition.builder()
-				.withSearchCriteria(CRITERIA_COMPOSITE_ATTRIBUTE)
-				.withCondition(Condition.HAS)
-				.withValue("demo")
-				.build()));
-
-		FilterSort filterSort = new FilterSort();
-		filterSort.setDirection(Sort.Direction.DESC);
-		filterSort.setField(START_TIME_SORTING);
-		userFilter.setFilterSorts(Sets.newHashSet(filterSort));
-
-		userFilter.setOwner(user.getUsername());
-
-		userFilterRepository.save(userFilter);
-
-		return userFilter;
-	}
-
-	private Dashboard createDemoDashboard(List<Widget> widgets, ReportPortalUser user, Project project, String name) {
-		Dashboard dashboard = new Dashboard();
-		dashboard.setName(name);
-		dashboard.setProject(project);
-		dashboard.setCreationDate(LocalDateTime.now());
-		dashboard.setOwner(user.getUsername());
-
-		dashboardRepository.save(dashboard);
-
-		dashboard.addWidget(createDashboardWidget(user.getUsername(), dashboard, widgets.get(0), 0, 0, 6, 5));
-		dashboard.addWidget(createDashboardWidget(user.getUsername(), dashboard, widgets.get(1), 6, 0, 6, 5));
-		dashboard.addWidget(createDashboardWidget(user.getUsername(), dashboard, widgets.get(2), 0, 5, 7, 5));
-		dashboard.addWidget(createDashboardWidget(user.getUsername(), dashboard, widgets.get(3), 7, 5, 5, 5));
-		dashboard.addWidget(createDashboardWidget(user.getUsername(), dashboard, widgets.get(4), 0, 10, 5, 5));
-		dashboard.addWidget(createDashboardWidget(user.getUsername(), dashboard, widgets.get(5), 5, 10, 7, 5));
-		dashboard.addWidget(createDashboardWidget(user.getUsername(), dashboard, widgets.get(6), 0, 15, 6, 5));
-		dashboard.addWidget(createDashboardWidget(user.getUsername(), dashboard, widgets.get(7), 6, 15, 6, 5));
-		dashboard.addWidget(createDashboardWidget(user.getUsername(), dashboard, widgets.get(8), 0, 20, 12, 4));
-		dashboard.addWidget(createDashboardWidget(user.getUsername(), dashboard, widgets.get(9), 0, 24, 7, 5));
-		dashboard.addWidget(createDashboardWidget(user.getUsername(), dashboard, widgets.get(10), 7, 24, 5, 5));
-		dashboard.addWidget(createDashboardWidget(user.getUsername(), dashboard, widgets.get(11), 0, 29, 12, 4));
-
-		return dashboard;
-	}
-
-	private DashboardWidget createDashboardWidget(String owner, Dashboard dashboard, Widget widget, int posX, int posY, int width,
-			int height) {
-		DashboardWidget dashboardWidget = new DashboardWidget();
-		dashboardWidget.setId(new DashboardWidgetId(dashboard.getId(), widget.getId()));
-
-		dashboardWidget.setDashboard(dashboard);
-		dashboardWidget.setWidget(widget);
-		dashboardWidget.setWidgetName(widget.getName());
-		dashboardWidget.setWidgetType(widget.getWidgetType());
-		dashboardWidget.setCreatedOn(true);
-		dashboardWidget.setWidgetOwner(owner);
-		dashboardWidget.setHeight(height);
-		dashboardWidget.setWidth(width);
-		dashboardWidget.setPositionX(posX);
-		dashboardWidget.setPositionY(posY);
-
-		dashboardWidgetRepository.save(dashboardWidget);
-		return dashboardWidget;
-	}
+  private static final String DASHBOARD_NAME = "DEMO DASHBOARD";
+  private static final String FILTER_NAME = "DEMO_FILTER";
+  private static final String START_TIME_SORTING = "startTime";
+  private static final boolean SHARED = true;
+
+  private final UserFilterRepository userFilterRepository;
+
+  private final DashboardRepository dashboardRepository;
+
+  private final DashboardWidgetRepository dashboardWidgetRepository;
+
+  private final WidgetRepository widgetRepository;
+
+  private final ProjectRepository projectRepository;
+
+  private final ObjectMapper objectMapper;
+
+  private Resource resource;
+
+  @Autowired
+  public DemoDashboardsService(UserFilterRepository userFilterRepository,
+      DashboardRepository dashboardRepository, DashboardWidgetRepository dashboardWidgetRepository,
+      WidgetRepository widgetRepository, ProjectRepository projectRepository,
+      ObjectMapper objectMapper) {
+    this.userFilterRepository = userFilterRepository;
+    this.dashboardRepository = dashboardRepository;
+    this.dashboardWidgetRepository = dashboardWidgetRepository;
+    this.widgetRepository = widgetRepository;
+    this.projectRepository = projectRepository;
+    this.objectMapper = objectMapper;
+  }
+
+  @Value("classpath:demo/demo_widgets.json")
+  public void setResource(Resource resource) {
+    this.resource = resource;
+  }
+
+  @Transactional
+  public Optional<Dashboard> generate(ReportPortalUser user, Long projectId) {
+    Project project = projectRepository.findById(projectId)
+        .orElseThrow(() -> new ReportPortalException(PROJECT_NOT_FOUND, projectId));
+
+    if (dashboardRepository.existsByNameAndOwnerAndProjectId(
+        DASHBOARD_NAME, user.getUsername(), projectId)) {
+      return Optional.empty();
+    }
+
+    UserFilter filter = createDemoFilter(user, project);
+    List<Widget> widgets = createWidgets(user, projectId, filter);
+    return Optional.of(createDemoDashboard(widgets, user, project, DASHBOARD_NAME));
+  }
+
+  private List<Widget> createWidgets(ReportPortalUser user, Long projectId, UserFilter filter) {
+    try {
+      TypeReference<List<WidgetRQ>> type = new TypeReference<>() {
+      };
+
+      List<Widget> widgets = objectMapper.readValue(resource.getURL(), type).stream().map(it -> {
+        final WidgetBuilder widgetBuilder =
+            new WidgetBuilder().addWidgetRq(it).addProject(projectId).addOwner(user.getUsername());
+        final WidgetType widgetType = WidgetType.findByName(it.getWidgetType()).orElseThrow(
+            () -> new ReportPortalException(ErrorType.UNABLE_TO_CREATE_WIDGET,
+                "Widget type '" + it.getWidgetType() + "' does not exists"
+            ));
+        if (!WidgetType.FLAKY_TEST_CASES.equals(widgetType) || !WidgetType.TOP_TEST_CASES.equals(
+            widgetType)) {
+          widgetBuilder.addFilters(Sets.newHashSet(filter));
+        }
+        return widgetBuilder.get();
+      }).collect(toList());
+      widgetRepository.saveAll(widgets);
+      return widgets;
+    } catch (IOException e) {
+      throw new ReportPortalException("Unable to load demo_widgets.json. " + e.getMessage(), e);
+    }
+  }
+
+  private UserFilter createDemoFilter(ReportPortalUser user, Project project) {
+    List<UserFilter> existedFilterList = userFilterRepository.findByFilter(ProjectFilter.of(
+        Filter.builder().withTarget(UserFilter.class).withCondition(
+            FilterCondition.builder().withCondition(Condition.EQUALS)
+                .withSearchCriteria(CRITERIA_NAME).withValue(FILTER_NAME).build()).build(),
+        project.getId()
+    ), Pageable.unpaged()).getContent();
+
+    if (!existedFilterList.isEmpty()) {
+      return existedFilterList.get(0);
+    }
+
+    UserFilter userFilter = new UserFilter();
+    userFilter.setName(FILTER_NAME);
+    userFilter.setTargetClass(ObjectType.Launch);
+    userFilter.setProject(project);
+    userFilter.setFilterCondition(Sets.newHashSet(
+        FilterCondition.builder().withSearchCriteria(CRITERIA_COMPOSITE_ATTRIBUTE)
+            .withCondition(Condition.HAS).withValue("demo").build()));
+
+    FilterSort filterSort = new FilterSort();
+    filterSort.setDirection(Sort.Direction.DESC);
+    filterSort.setField(START_TIME_SORTING);
+    userFilter.setFilterSorts(Sets.newHashSet(filterSort));
+
+    userFilter.setOwner(user.getUsername());
+
+    userFilterRepository.save(userFilter);
+
+    return userFilter;
+  }
+
+  private Dashboard createDemoDashboard(List<Widget> widgets, ReportPortalUser user,
+      Project project, String name) {
+    Dashboard dashboard = new Dashboard();
+    dashboard.setName(name);
+    dashboard.setProject(project);
+    dashboard.setCreationDate(LocalDateTime.now());
+    dashboard.setOwner(user.getUsername());
+
+    dashboardRepository.save(dashboard);
+
+    dashboard.addWidget(
+        createDashboardWidget(user.getUsername(), dashboard, widgets.get(0), 0, 0, 6, 5));
+    dashboard.addWidget(
+        createDashboardWidget(user.getUsername(), dashboard, widgets.get(1), 6, 0, 6, 5));
+    dashboard.addWidget(
+        createDashboardWidget(user.getUsername(), dashboard, widgets.get(2), 0, 5, 7, 5));
+    dashboard.addWidget(
+        createDashboardWidget(user.getUsername(), dashboard, widgets.get(3), 7, 5, 5, 5));
+    dashboard.addWidget(
+        createDashboardWidget(user.getUsername(), dashboard, widgets.get(4), 0, 10, 5, 5));
+    dashboard.addWidget(
+        createDashboardWidget(user.getUsername(), dashboard, widgets.get(5), 5, 10, 7, 5));
+    dashboard.addWidget(
+        createDashboardWidget(user.getUsername(), dashboard, widgets.get(6), 0, 15, 6, 5));
+    dashboard.addWidget(
+        createDashboardWidget(user.getUsername(), dashboard, widgets.get(7), 6, 15, 6, 5));
+    dashboard.addWidget(
+        createDashboardWidget(user.getUsername(), dashboard, widgets.get(8), 0, 20, 12, 4));
+    dashboard.addWidget(
+        createDashboardWidget(user.getUsername(), dashboard, widgets.get(9), 0, 24, 7, 5));
+    dashboard.addWidget(
+        createDashboardWidget(user.getUsername(), dashboard, widgets.get(10), 7, 24, 5, 5));
+    dashboard.addWidget(
+        createDashboardWidget(user.getUsername(), dashboard, widgets.get(11), 0, 29, 12, 4));
+
+    return dashboard;
+  }
+
+  private DashboardWidget createDashboardWidget(String owner, Dashboard dashboard, Widget widget,
+      int posX, int posY, int width, int height) {
+    DashboardWidget dashboardWidget = new DashboardWidget();
+    dashboardWidget.setId(new DashboardWidgetId(dashboard.getId(), widget.getId()));
+
+    dashboardWidget.setDashboard(dashboard);
+    dashboardWidget.setWidget(widget);
+    dashboardWidget.setWidgetName(widget.getName());
+    dashboardWidget.setWidgetType(widget.getWidgetType());
+    dashboardWidget.setCreatedOn(true);
+    dashboardWidget.setWidgetOwner(owner);
+    dashboardWidget.setHeight(height);
+    dashboardWidget.setWidth(width);
+    dashboardWidget.setPositionX(posX);
+    dashboardWidget.setPositionY(posY);
+
+    dashboardWidgetRepository.save(dashboardWidget);
+    return dashboardWidget;
+  }
 }
\ No newline at end of file
diff --git a/src/main/java/com/epam/ta/reportportal/job/FlushingDataJob.java b/src/main/java/com/epam/ta/reportportal/job/FlushingDataJob.java
index 7ab883321b..a70f813db2 100644
--- a/src/main/java/com/epam/ta/reportportal/job/FlushingDataJob.java
+++ b/src/main/java/com/epam/ta/reportportal/job/FlushingDataJob.java
@@ -29,10 +29,10 @@
 import com.epam.ta.reportportal.entity.project.ProjectIssueType;
 import com.epam.ta.reportportal.entity.user.User;
 import com.epam.ta.reportportal.entity.user.UserRole;
+import com.epam.ta.reportportal.model.user.CreateUserRQFull;
 import com.epam.ta.reportportal.util.FeatureFlagHandler;
 import com.epam.ta.reportportal.util.PersonalProjectService;
 import com.epam.ta.reportportal.ws.converter.builders.UserBuilder;
-import com.epam.ta.reportportal.ws.model.user.CreateUserRQFull;
 import java.util.Set;
 import java.util.stream.Collectors;
 import org.jclouds.blobstore.BlobStore;
@@ -47,7 +47,6 @@
 import org.springframework.transaction.annotation.Isolation;
 import org.springframework.transaction.annotation.Transactional;
 
-
 /**
  * @author <a href="mailto:pavel_bortnik@epam.com">Pavel Bortnik</a>
  */
@@ -107,12 +106,10 @@ public class FlushingDataJob implements Job {
   public void execute(JobExecutionContext context) {
     LOGGER.info("Flushing demo instance data is starting...");
     truncateTables();
-    projectRepository.findAllProjectNames()
-        .stream()
-        .filter(it -> !it.equalsIgnoreCase(SUPERADMIN_PERSONAL))
-        .collect(Collectors.toList())
+    projectRepository.findAllProjectNames().stream()
+        .filter(it -> !it.equalsIgnoreCase(SUPERADMIN_PERSONAL)).collect(Collectors.toList())
         .forEach(name -> projectRepository.findByName(name).ifPresent(this::deleteProject));
-    if (featureFlagHandler.isEnabled(FeatureFlag.SINGLE_BUCKET)){
+    if (featureFlagHandler.isEnabled(FeatureFlag.SINGLE_BUCKET)) {
       try {
         blobStore.deleteContainer(defaultBucketName);
       } catch (Exception e) {
@@ -130,8 +127,7 @@ public void execute(JobExecutionContext context) {
    * Get exclusive lock. Kill all running transactions. Truncate tables
    */
   private void truncateTables() {
-    jdbcTemplate.execute("BEGIN; "
-        + "TRUNCATE TABLE launch RESTART IDENTITY CASCADE;"
+    jdbcTemplate.execute("BEGIN; " + "TRUNCATE TABLE launch RESTART IDENTITY CASCADE;"
         + "TRUNCATE TABLE activity RESTART IDENTITY CASCADE;"
         + "TRUNCATE TABLE owned_entity RESTART IDENTITY CASCADE;"
         + "TRUNCATE TABLE ticket RESTART IDENTITY CASCADE;"
@@ -150,10 +146,8 @@ private void createDefaultUser() {
     request.setLogin("default");
     request.setPassword("1q2w3e");
     request.setEmail("defaultemail@domain.com");
-    User user = new UserBuilder().addCreateUserFullRQ(request)
-        .addUserRole(UserRole.USER)
-        .addPassword(passwordEncoder.encode(request.getPassword()))
-        .get();
+    User user = new UserBuilder().addCreateUserFullRQ(request).addUserRole(UserRole.USER)
+        .addPassword(passwordEncoder.encode(request.getPassword())).get();
     projectRepository.save(personalProjectService.generatePersonalProject(user));
     userRepository.save(user);
     LOGGER.info("Default user has been successfully created.");
@@ -167,15 +161,13 @@ private void deleteUser(User user) {
   }
 
   private void deleteProject(Project project) {
-    Set<Long> defaultIssueTypeIds = issueTypeRepository.getDefaultIssueTypes()
-        .stream()
-        .map(IssueType::getId)
-        .collect(Collectors.toSet());
-    Set<IssueType> issueTypesToRemove = project.getProjectIssueTypes()
-        .stream()
-        .map(ProjectIssueType::getIssueType)
-        .filter(issueType -> !defaultIssueTypeIds.contains(issueType.getId()))
-        .collect(Collectors.toSet());
+    Set<Long> defaultIssueTypeIds =
+        issueTypeRepository.getDefaultIssueTypes().stream().map(IssueType::getId)
+            .collect(Collectors.toSet());
+    Set<IssueType> issueTypesToRemove =
+        project.getProjectIssueTypes().stream().map(ProjectIssueType::getIssueType)
+            .filter(issueType -> !defaultIssueTypeIds.contains(issueType.getId()))
+            .collect(Collectors.toSet());
     projectRepository.delete(project);
     analyzerServiceClient.removeSuggest(project.getId());
     issueTypeRepository.deleteAll(issueTypesToRemove);
diff --git a/src/main/java/com/epam/ta/reportportal/model/ActivityEventResource.java b/src/main/java/com/epam/ta/reportportal/model/ActivityEventResource.java
new file mode 100644
index 0000000000..1997defaa8
--- /dev/null
+++ b/src/main/java/com/epam/ta/reportportal/model/ActivityEventResource.java
@@ -0,0 +1,98 @@
+/*
+ * Copyright 2023 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.ta.reportportal.model;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonInclude.Include;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import io.swagger.annotations.ApiModelProperty;
+import java.util.Date;
+import javax.validation.constraints.NotNull;
+import lombok.Builder;
+import lombok.Getter;
+import lombok.Setter;
+import lombok.ToString;
+
+/**
+ * JSON Representation of Report Portal's Activity domain object.
+ *
+ * @author Ryhor_Kukharenka
+ */
+@JsonInclude(Include.NON_NULL)
+@Getter
+@Setter
+@Builder
+@ToString
+public class ActivityEventResource {
+
+  @NotNull
+  @JsonProperty(value = "id", required = true)
+  @ApiModelProperty(required = true)
+  private Long id;
+
+  @NotNull
+  @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ssZ")
+  @JsonProperty(value = "created_at")
+  private Date createdAt;
+
+  @NotNull
+  @JsonProperty(value = "event_name", required = true)
+  @ApiModelProperty(required = true)
+  private String eventName;
+
+  @JsonProperty(value = "object_id")
+  @ApiModelProperty(required = true)
+  private Long objectId;
+
+  @NotNull
+  @JsonProperty(value = "object_name", required = true)
+  @ApiModelProperty(required = true)
+  private String objectName;
+
+  @NotNull
+  @JsonProperty(value = "object_type", required = true)
+  @ApiModelProperty(required = true)
+  private String objectType;
+
+  @JsonProperty(value = "project_id")
+  @ApiModelProperty(required = true)
+  private Long projectId;
+
+  @JsonProperty(value = "project_name")
+  @ApiModelProperty(required = true)
+  private String projectName;
+
+  @NotNull
+  @JsonProperty(value = "subject_name", required = true)
+  @ApiModelProperty(required = true)
+  private String subjectName;
+
+  @NotNull
+  @JsonProperty(value = "subject_type", required = true)
+  @ApiModelProperty(required = true)
+  private String subjectType;
+
+  @NotNull
+  @JsonProperty(value = "subject_id", required = true)
+  @ApiModelProperty(required = true)
+  private String subjectId;
+
+  @JsonProperty(value = "details")
+  private Object details;
+
+}
diff --git a/src/main/java/com/epam/ta/reportportal/model/ApiKeyRQ.java b/src/main/java/com/epam/ta/reportportal/model/ApiKeyRQ.java
new file mode 100644
index 0000000000..f7ed6fa678
--- /dev/null
+++ b/src/main/java/com/epam/ta/reportportal/model/ApiKeyRQ.java
@@ -0,0 +1,50 @@
+/*
+ * Copyright 2022 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.ta.reportportal.model;
+
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonInclude.Include;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import javax.validation.constraints.NotNull;
+
+/**
+ * Api key representation for request
+ *
+ * @author Andrei Piankouski
+ */
+@JsonInclude(Include.NON_NULL)
+public class ApiKeyRQ {
+
+  @NotNull
+  @JsonProperty(value = "name", required = true)
+  private String name;
+
+  public String getName() {
+    return name;
+  }
+
+  public void setName(String name) {
+    this.name = name;
+  }
+
+  @Override
+  public String toString() {
+    return "ApiKeyRQ{"
+        + "name='" + name + '\''
+        + '}';
+  }
+}
diff --git a/src/main/java/com/epam/ta/reportportal/model/ApiKeyRS.java b/src/main/java/com/epam/ta/reportportal/model/ApiKeyRS.java
new file mode 100644
index 0000000000..284b4167cb
--- /dev/null
+++ b/src/main/java/com/epam/ta/reportportal/model/ApiKeyRS.java
@@ -0,0 +1,112 @@
+/*
+ * Copyright 2023 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.ta.reportportal.model;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonInclude.Include;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import java.util.Date;
+import javax.validation.constraints.NotNull;
+
+/**
+ * Api key representation for response
+ *
+ * @author Andrei Piankouski
+ */
+@JsonInclude(Include.NON_NULL)
+public class ApiKeyRS {
+
+  @NotNull
+  @JsonProperty(value = "id", required = true)
+  private Long id;
+
+  @NotNull
+  @JsonProperty(value = "name", required = true)
+  private String name;
+
+  @NotNull
+  @JsonProperty(value = "user_id", required = true)
+  private Long userId;
+
+  @NotNull
+  @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ssZ")
+  @JsonProperty(value = "created_at")
+  private Date createdAt;
+
+  @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd")
+  @JsonProperty(value = "last_used_at")
+  private Date lastUsedAt;
+
+  @JsonProperty(value = "api_key")
+  private String apiKey;
+
+  public Long getId() {
+    return id;
+  }
+
+  public void setId(Long id) {
+    this.id = id;
+  }
+
+  public String getName() {
+    return name;
+  }
+
+  public void setName(String name) {
+    this.name = name;
+  }
+
+  public Long getUserId() {
+    return userId;
+  }
+
+  public void setUserId(Long userId) {
+    this.userId = userId;
+  }
+
+  public Date getCreatedAt() {
+    return createdAt;
+  }
+
+  public void setCreatedAt(Date createdAt) {
+    this.createdAt = createdAt;
+  }
+
+  public String getApiKey() {
+    return apiKey;
+  }
+
+  public void setApiKey(String apiKey) {
+    this.apiKey = apiKey;
+  }
+
+  public Date getLastUsedAt() {
+    return lastUsedAt;
+  }
+
+  public void setLastUsedAt(Date lastUsedAt) {
+    this.lastUsedAt = lastUsedAt;
+  }
+
+  @Override
+  public String toString() {
+    return "ApiKeyRS{" + "id=" + id + ", name='" + name + '\'' + ", userId=" + userId
+        + ", createdAt=" + createdAt + ", lastUsedAt=" + lastUsedAt + ", apiKey='" + apiKey + '\''
+        + '}';
+  }
+}
diff --git a/src/main/java/com/epam/ta/reportportal/model/ApiKeysRS.java b/src/main/java/com/epam/ta/reportportal/model/ApiKeysRS.java
new file mode 100644
index 0000000000..ac9108aec8
--- /dev/null
+++ b/src/main/java/com/epam/ta/reportportal/model/ApiKeysRS.java
@@ -0,0 +1,49 @@
+/*
+ * Copyright 2023 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.ta.reportportal.model;
+
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonInclude.Include;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import java.util.List;
+import javax.validation.constraints.NotNull;
+
+/**
+ * Container for ApiKeysRS
+ *
+ * @author Andrei Piankouski
+ */
+@JsonInclude(Include.NON_NULL)
+public class ApiKeysRS {
+
+  @NotNull
+  @JsonProperty(value = "items", required = true)
+  private List<ApiKeyRS> apiKeys;
+
+  public List<ApiKeyRS> getApiKeys() {
+    return apiKeys;
+  }
+
+  public void setApiKeys(List<ApiKeyRS> apiKeys) {
+    this.apiKeys = apiKeys;
+  }
+
+  @Override
+  public String toString() {
+    return "ApiKeysRS{" + "apiKeys=" + apiKeys + '}';
+  }
+}
diff --git a/src/main/java/com/epam/ta/reportportal/model/BaseEntityRQ.java b/src/main/java/com/epam/ta/reportportal/model/BaseEntityRQ.java
new file mode 100644
index 0000000000..a66b671f73
--- /dev/null
+++ b/src/main/java/com/epam/ta/reportportal/model/BaseEntityRQ.java
@@ -0,0 +1,46 @@
+/*
+ * 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.ta.reportportal.model;
+
+import static com.epam.ta.reportportal.ws.model.ValidationConstraints.MAX_ENTITY_DESCRIPTION;
+
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonInclude.Include;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import javax.validation.constraints.Size;
+
+/**
+ * Base entity for manipulating sharable resources
+ *
+ * @author Aliaksei_Makayed
+ */
+@JsonInclude(Include.NON_NULL)
+public class BaseEntityRQ {
+
+	@Size(max = MAX_ENTITY_DESCRIPTION)
+	@JsonProperty(value = "description")
+	private String description;
+
+	public String getDescription() {
+		return description;
+	}
+
+	public void setDescription(String description) {
+		this.description = description;
+	}
+
+}
\ No newline at end of file
diff --git a/src/main/java/com/epam/ta/reportportal/model/BulkInfoUpdateRQ.java b/src/main/java/com/epam/ta/reportportal/model/BulkInfoUpdateRQ.java
new file mode 100644
index 0000000000..f555aad24a
--- /dev/null
+++ b/src/main/java/com/epam/ta/reportportal/model/BulkInfoUpdateRQ.java
@@ -0,0 +1,91 @@
+/*
+ * 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.ta.reportportal.model;
+
+import com.epam.ta.reportportal.ws.model.attribute.UpdateItemAttributeRQ;
+import java.util.List;
+import javax.validation.Valid;
+import javax.validation.constraints.NotNull;
+import javax.validation.constraints.Size;
+
+/**
+ * @author <a href="mailto:ihar_kahadouski@epam.com">Ihar Kahadouski</a>
+ */
+public class BulkInfoUpdateRQ {
+
+	@NotNull
+	@Size(min = 1)
+	private List<Long> ids;
+
+	private Description description;
+
+	@Valid
+	private List<UpdateItemAttributeRQ> attributes;
+
+	public List<Long> getIds() {
+		return ids;
+	}
+
+	public void setIds(List<Long> ids) {
+		this.ids = ids;
+	}
+
+	public Description getDescription() {
+		return description;
+	}
+
+	public void setDescription(Description description) {
+		this.description = description;
+	}
+
+	public List<UpdateItemAttributeRQ> getAttributes() {
+		return attributes;
+	}
+
+	public void setAttributes(List<UpdateItemAttributeRQ> attributes) {
+		this.attributes = attributes;
+	}
+
+	public enum Action {
+		DELETE,
+		UPDATE,
+		CREATE
+	}
+
+	public static class Description {
+
+		String comment;
+
+		Action action;
+
+		public String getComment() {
+			return comment;
+		}
+
+		public void setComment(String comment) {
+			this.comment = comment;
+		}
+
+		public Action getAction() {
+			return action;
+		}
+
+		public void setAction(Action action) {
+			this.action = action;
+		}
+	}
+}
diff --git a/src/main/java/com/epam/ta/reportportal/model/BulkRQ.java b/src/main/java/com/epam/ta/reportportal/model/BulkRQ.java
new file mode 100644
index 0000000000..a22f6c9fdc
--- /dev/null
+++ b/src/main/java/com/epam/ta/reportportal/model/BulkRQ.java
@@ -0,0 +1,48 @@
+/*
+ * 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.ta.reportportal.model;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import java.util.Map;
+import javax.validation.Valid;
+import javax.validation.constraints.NotNull;
+
+/**
+ * @param <K> Type of Key
+ * @param <T> Type of Entity
+ * @author Dzmitry_Kavalets
+ */
+public class BulkRQ<K,T> {
+
+	@Valid
+	@NotNull
+	@JsonProperty(value = "entities", required = true)
+	private Map<K, T> entities;
+
+	public Map<K, T> getEntities() {
+		return entities;
+	}
+
+	public void setEntities(Map<K, T> entities) {
+		this.entities = entities;
+	}
+
+	@Override
+	public String toString() {
+		return "BulkRQ{" + "entities=" + entities + '}';
+	}
+}
diff --git a/src/main/java/com/epam/ta/reportportal/model/CollectionsRQ.java b/src/main/java/com/epam/ta/reportportal/model/CollectionsRQ.java
new file mode 100644
index 0000000000..718d526f3e
--- /dev/null
+++ b/src/main/java/com/epam/ta/reportportal/model/CollectionsRQ.java
@@ -0,0 +1,50 @@
+/*
+ * 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.ta.reportportal.model;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import java.util.List;
+import javax.validation.Valid;
+import javax.validation.constraints.NotNull;
+
+/**
+ * @deprecated use {@link BulkRQ} instead
+ */
+@Deprecated
+public class CollectionsRQ<T> {
+
+  @Valid
+  @NotNull
+  @JsonProperty(value = "elements", required = true)
+  private List<T> elements;
+
+  public List<T> getElements() {
+    return elements;
+  }
+
+  public void setElements(List<T> elements) {
+    this.elements = elements;
+  }
+
+  @Override
+  public String toString() {
+    final StringBuilder sb = new StringBuilder("CollectionsRQ{");
+    sb.append("elements=").append(elements);
+    sb.append('}');
+    return sb.toString();
+  }
+}
\ No newline at end of file
diff --git a/src/main/java/com/epam/ta/reportportal/model/DeleteBulkRQ.java b/src/main/java/com/epam/ta/reportportal/model/DeleteBulkRQ.java
new file mode 100644
index 0000000000..a64eed9377
--- /dev/null
+++ b/src/main/java/com/epam/ta/reportportal/model/DeleteBulkRQ.java
@@ -0,0 +1,51 @@
+/*
+ * 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.ta.reportportal.model;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import java.util.List;
+import javax.validation.constraints.NotEmpty;
+
+/**
+ * @author <a href="mailto:ivan_budayeu@epam.com">Ivan Budayeu</a>
+ */
+public class DeleteBulkRQ {
+
+	@NotEmpty
+	@JsonProperty(value = "ids")
+	private List<Long> ids;
+
+	public DeleteBulkRQ() {
+	}
+
+	public DeleteBulkRQ(@NotEmpty List<Long> ids) {
+		this.ids = ids;
+	}
+
+	public List<Long> getIds() {
+		return ids;
+	}
+
+	public void setIds(List<Long> ids) {
+		this.ids = ids;
+	}
+
+	@Override
+	public String toString() {
+		return "DeleteBulkRQ{" + "ids=" + ids + '}';
+	}
+}
diff --git a/src/main/java/com/epam/ta/reportportal/model/DeleteBulkRS.java b/src/main/java/com/epam/ta/reportportal/model/DeleteBulkRS.java
new file mode 100644
index 0000000000..509bcb660a
--- /dev/null
+++ b/src/main/java/com/epam/ta/reportportal/model/DeleteBulkRS.java
@@ -0,0 +1,74 @@
+/*
+ * 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.ta.reportportal.model;
+
+import com.epam.ta.reportportal.ws.model.ErrorRS;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import java.util.List;
+
+/**
+ * @author <a href="mailto:ihar_kahadouski@epam.com">Ihar Kahadouski</a>
+ */
+public class DeleteBulkRS {
+
+	@JsonProperty("successfullyDeleted")
+	private List<Long> deleted;
+
+	@JsonProperty("notFound")
+	private List<Long> notFound;
+
+	@JsonProperty("errors")
+	private List<ErrorRS> errors;
+
+	public DeleteBulkRS() {
+	}
+
+	public DeleteBulkRS(List<Long> deleted, List<Long> notFound, List<ErrorRS> errors) {
+		this.deleted = deleted;
+		this.notFound = notFound;
+		this.errors = errors;
+	}
+
+	public List<Long> getDeleted() {
+		return deleted;
+	}
+
+	public void setDeleted(List<Long> deleted) {
+		this.deleted = deleted;
+	}
+
+	public List<Long> getNotFound() {
+		return notFound;
+	}
+
+	public void setNotFound(List<Long> notFound) {
+		this.notFound = notFound;
+	}
+
+	public List<ErrorRS> getErrors() {
+		return errors;
+	}
+
+	public void setErrors(List<ErrorRS> errors) {
+		this.errors = errors;
+	}
+
+	@Override
+	public String toString() {
+		return "DeleteBulkRS{" + "deleted=" + deleted + ", notFound=" + notFound + ", errors=" + errors + '}';
+	}
+}
diff --git a/src/main/java/com/epam/ta/reportportal/model/EntryCreatedRS.java b/src/main/java/com/epam/ta/reportportal/model/EntryCreatedRS.java
new file mode 100644
index 0000000000..77bda905e8
--- /dev/null
+++ b/src/main/java/com/epam/ta/reportportal/model/EntryCreatedRS.java
@@ -0,0 +1,59 @@
+/*
+ * 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.ta.reportportal.model;
+
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonInclude.Include;
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * Response when some entry has been created and we need to return ID
+ * 
+ * @author Andrei Varabyeu
+ * 
+ */
+@JsonInclude(Include.NON_NULL)
+public class EntryCreatedRS {
+
+	@JsonProperty("id")
+	private Long id;
+
+	public EntryCreatedRS() {
+
+	}
+
+	public EntryCreatedRS(Long id) {
+		this.id = id;
+	}
+
+	public Long getId() {
+		return id;
+	}
+
+	public void setId(Long id) {
+		this.id = id;
+	}
+
+	@Override
+	public String toString() {
+		final StringBuilder sb = new StringBuilder("EntryCreatedRS{");
+		sb.append("id='").append(id).append('\'');
+		sb.append('}');
+		return sb.toString();
+	}
+
+}
\ No newline at end of file
diff --git a/src/main/java/com/epam/ta/reportportal/model/LaunchImportCompletionRS.java b/src/main/java/com/epam/ta/reportportal/model/LaunchImportCompletionRS.java
new file mode 100644
index 0000000000..d365ccdc80
--- /dev/null
+++ b/src/main/java/com/epam/ta/reportportal/model/LaunchImportCompletionRS.java
@@ -0,0 +1,42 @@
+/*
+ * Copyright 2023 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.ta.reportportal.model;
+
+import com.epam.ta.reportportal.ws.model.OperationCompletionRS;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+import lombok.ToString;
+
+/**
+ * Operation completion response for launch import.
+ *
+ * @author Siarhei Hrabko
+ */
+@Getter
+@Setter
+@ToString
+@AllArgsConstructor
+@NoArgsConstructor
+public class LaunchImportCompletionRS extends OperationCompletionRS {
+
+  @JsonProperty(value = "data")
+  private LaunchImportData data;
+
+}
diff --git a/src/main/java/com/epam/ta/reportportal/model/LaunchImportData.java b/src/main/java/com/epam/ta/reportportal/model/LaunchImportData.java
new file mode 100644
index 0000000000..dff3b92a01
--- /dev/null
+++ b/src/main/java/com/epam/ta/reportportal/model/LaunchImportData.java
@@ -0,0 +1,47 @@
+/*
+ * Copyright 2023 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.ta.reportportal.model;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+import lombok.ToString;
+
+/**
+ * Operation completion response extension for launch import.
+ *
+ * @author Siarhei Hrabko
+ */
+@Getter
+@Setter
+@ToString
+@AllArgsConstructor
+@NoArgsConstructor
+public class LaunchImportData {
+
+  @JsonProperty("id")
+  private String id;
+
+  @JsonProperty("name")
+  private String name;
+
+  @JsonProperty("number")
+  private Long number;
+
+}
diff --git a/src/main/java/com/epam/ta/reportportal/model/ModelViews.java b/src/main/java/com/epam/ta/reportportal/model/ModelViews.java
new file mode 100644
index 0000000000..f7c9468c25
--- /dev/null
+++ b/src/main/java/com/epam/ta/reportportal/model/ModelViews.java
@@ -0,0 +1,35 @@
+/*
+ * 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.ta.reportportal.model;
+
+/**
+ * Container of view classes
+ * 
+ * @author Andrei Varabyeu
+ * 
+ */
+public class ModelViews {
+
+	public static class DefaultView {
+	}
+
+	public static class FullUserView extends DefaultView {
+	}
+
+	public static class FullProjectInfoView extends DefaultView {
+	}
+}
\ No newline at end of file
diff --git a/src/main/java/com/epam/ta/reportportal/model/NestedStepResource.java b/src/main/java/com/epam/ta/reportportal/model/NestedStepResource.java
new file mode 100644
index 0000000000..a23bba970e
--- /dev/null
+++ b/src/main/java/com/epam/ta/reportportal/model/NestedStepResource.java
@@ -0,0 +1,143 @@
+/*
+ * 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.ta.reportportal.model;
+
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonInclude.Include;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * @author <a href="mailto:ivan_budayeu@epam.com">Ivan Budayeu</a>
+ */
+@JsonInclude(Include.NON_NULL)
+public class NestedStepResource implements Serializable {
+
+	@JsonProperty(value = "id")
+	private Long id;
+
+	@JsonProperty(value = "name")
+	private String name;
+
+	@JsonProperty(value = "uuid")
+	private String uuid;
+
+	@JsonProperty(value = "type")
+	private String type;
+
+	@JsonProperty(value = "startTime")
+	private Date startTime;
+
+	@JsonProperty(value = "endTime")
+	private Date endTime;
+
+	@JsonProperty(value = "status")
+	private String status;
+
+	@JsonProperty(value = "duration")
+	private Double duration;
+
+	@JsonProperty(value = "hasContent")
+	private Boolean hasContent;
+
+	@JsonProperty(value = "attachmentsCount")
+	private Integer attachmentsCount;
+
+	public NestedStepResource() {
+	}
+
+	public Long getId() {
+		return id;
+	}
+
+	public void setId(Long id) {
+		this.id = id;
+	}
+
+	public String getName() {
+		return name;
+	}
+
+	public void setName(String name) {
+		this.name = name;
+	}
+
+	public String getType() {
+		return type;
+	}
+
+	public void setType(String type) {
+		this.type = type;
+	}
+
+	public Date getStartTime() {
+		return startTime;
+	}
+
+	public void setStartTime(Date startTime) {
+		this.startTime = startTime;
+	}
+
+	public Date getEndTime() {
+		return endTime;
+	}
+
+	public void setEndTime(Date endTime) {
+		this.endTime = endTime;
+	}
+
+	public String getStatus() {
+		return status;
+	}
+
+	public void setStatus(String status) {
+		this.status = status;
+	}
+
+	public Double getDuration() {
+		return duration;
+	}
+
+	public void setDuration(Double duration) {
+		this.duration = duration;
+	}
+
+	public Boolean getHasContent() {
+		return hasContent;
+	}
+
+	public void setHasContent(Boolean hasContent) {
+		this.hasContent = hasContent;
+	}
+
+	public Integer getAttachmentsCount() {
+		return attachmentsCount;
+	}
+
+	public void setAttachmentsCount(Integer attachmentsCount) {
+		this.attachmentsCount = attachmentsCount;
+	}
+
+	public String getUuid() {
+		return uuid;
+	}
+
+	public void setUuid(String uuid) {
+		this.uuid = uuid;
+	}
+}
diff --git a/src/main/java/com/epam/ta/reportportal/model/OwnedEntityResource.java b/src/main/java/com/epam/ta/reportportal/model/OwnedEntityResource.java
new file mode 100644
index 0000000000..2f0d3b2fb9
--- /dev/null
+++ b/src/main/java/com/epam/ta/reportportal/model/OwnedEntityResource.java
@@ -0,0 +1,86 @@
+/*
+ * 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.ta.reportportal.model;
+
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonInclude.Include;
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * Shared entity can used for sending information to client about shared resource.
+ * Contains only information about name and owner of entity.
+ * 
+ * @author Aliaksei_Makayed
+ *
+ */
+@JsonInclude(Include.NON_NULL)
+public class OwnedEntityResource {
+
+	@JsonProperty(value = "id")
+	private String id;
+
+	@JsonProperty(value = "name")
+	private String name;
+
+	@JsonProperty(value = "owner")
+	private String owner;
+
+	@JsonProperty(value = "description")
+	private String description;
+
+	public String getId() {
+		return id;
+	}
+
+	public void setId(String id) {
+		this.id = id;
+	}
+
+	public String getName() {
+		return name;
+	}
+
+	public void setName(String name) {
+		this.name = name;
+	}
+
+	public String getOwner() {
+		return owner;
+	}
+
+	public void setOwner(String owner) {
+		this.owner = owner;
+	}
+
+	public String getDescription() {
+		return description;
+	}
+
+	public void setDescription(String description) {
+		this.description = description;
+	}
+
+	@Override
+	public String toString() {
+		final StringBuilder sb = new StringBuilder("OwnedEntity{");
+		sb.append("name='").append(name).append('\'');
+		sb.append(", owner='").append(owner).append('\'');
+		sb.append(", description='").append(description).append('\'');
+		sb.append('}');
+		return sb.toString();
+	}
+}
diff --git a/src/main/java/com/epam/ta/reportportal/model/Page.java b/src/main/java/com/epam/ta/reportportal/model/Page.java
new file mode 100644
index 0000000000..24f49479cb
--- /dev/null
+++ b/src/main/java/com/epam/ta/reportportal/model/Page.java
@@ -0,0 +1,139 @@
+/*
+ * 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.ta.reportportal.model;
+
+
+import java.util.Collection;
+import java.util.Iterator;
+
+/**
+ * Paged response  representation
+ * Re-implementation of Spring's HATEAOS Page implementation to get rid of Spring's deps in model package
+ *
+ * @author Andrei Varabyeu
+ */
+public class Page<T> implements Iterable<T> {
+
+	private final Collection<T> content;
+	private final PageMetadata page;
+
+	/**
+	 * Visible for deserializer
+	 */
+	Page() {
+		this(null, null);
+	}
+
+	public Page(Collection<T> content, PageMetadata page) {
+		this.content = content;
+		this.page = page;
+	}
+
+	public Page(Collection<T> content, long size, long number, long totalElements, long totalPages) {
+		this.content = content;
+		this.page = new PageMetadata(size, number, totalElements, totalPages);
+	}
+
+	public Page(Collection<T> content, long size, long number, long totalElements) {
+		this.content = content;
+		this.page = new PageMetadata(size, number, totalElements);
+	}
+
+	public Collection<T> getContent() {
+		return content;
+	}
+
+	public PageMetadata getPage() {
+		return page;
+	}
+
+	@Override
+	public Iterator<T> iterator() {
+		return content.iterator();
+	}
+
+	public static class PageMetadata {
+		long number;
+		long size;
+		long totalElements;
+		long totalPages;
+
+		/**
+		 * Visible for deserializer
+		 */
+		PageMetadata(){
+		}
+
+		public PageMetadata(long size, long number, long totalElements, long totalPages) {
+			checkArgument(size > -1, "Size must not be negative!");
+			checkArgument(number > -1, "Number must not be negative!");
+			checkArgument(totalElements > -1, "Total elements must not be negative!");
+			checkArgument(totalPages > -1, "Total pages must not be negative!");
+
+			this.number = number;
+			this.size = size;
+			this.totalElements = totalElements;
+			this.totalPages = totalPages;
+
+		}
+
+		public PageMetadata(long size, long number, long totalElements) {
+			this(size, number, totalElements, size == 0 ? 0 : (long) Math.ceil((double) totalElements / (double) size));
+		}
+
+		public long getNumber() {
+			return number;
+		}
+
+		public long getSize() {
+			return size;
+		}
+
+		public long getTotalElements() {
+			return totalElements;
+		}
+
+		public long getTotalPages() {
+			return totalPages;
+		}
+
+		@Override
+		public String toString() {
+			final StringBuilder sb = new StringBuilder("PageMetadata{");
+			sb.append("number=").append(number);
+			sb.append(", size=").append(size);
+			sb.append(", totalElements=").append(totalElements);
+			sb.append(", totalPages=").append(totalPages);
+			sb.append('}');
+			return sb.toString();
+		}
+	}
+
+	@Override
+	public String toString() {
+		final StringBuilder sb = new StringBuilder("Page{");
+		sb.append("content=").append(content);
+		sb.append(", page=").append(page);
+		sb.append('}');
+		return sb.toString();
+	}
+
+	private static void checkArgument(boolean expression, String errorMessage) {
+		if (!expression) {
+			throw new IllegalArgumentException(errorMessage);
+		}
+	}
+}
diff --git a/src/main/java/com/epam/ta/reportportal/model/PagedResponse.java b/src/main/java/com/epam/ta/reportportal/model/PagedResponse.java
new file mode 100644
index 0000000000..a97497dfd0
--- /dev/null
+++ b/src/main/java/com/epam/ta/reportportal/model/PagedResponse.java
@@ -0,0 +1,118 @@
+/*
+ * Copyright 2023 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.ta.reportportal.model;
+
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonInclude.Include;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import java.util.List;
+import javax.validation.constraints.NotNull;
+
+/**
+ * Paged representation.
+ *
+ * @param <T> Type of items
+ */
+@JsonInclude(Include.NON_NULL)
+public class PagedResponse<T> {
+
+  @NotNull
+  @JsonProperty(value = "offset")
+  private Long offset;
+
+  @NotNull
+  @JsonProperty(value = "limit")
+  private Integer limit;
+
+  @NotNull
+  @JsonProperty(value = "total_count")
+  private Long totalCount;
+
+  @NotNull
+  @JsonProperty(value = "sort")
+  private String sort;
+
+  @NotNull
+  @JsonProperty(value = "order")
+  private String order;
+
+  @NotNull
+  @JsonProperty(value = "items")
+  private List<T> items;
+
+  public PagedResponse() {
+  }
+
+  public PagedResponse(Long offset, Integer limit, Long totalCount, String sort, String order,
+      List<T> items) {
+    this.offset = offset;
+    this.limit = limit;
+    this.totalCount = totalCount;
+    this.sort = sort;
+    this.order = order;
+    this.items = items;
+  }
+
+  public Long getOffset() {
+    return offset;
+  }
+
+  public void setOffset(Long offset) {
+    this.offset = offset;
+  }
+
+  public Integer getLimit() {
+    return limit;
+  }
+
+  public void setLimit(Integer limit) {
+    this.limit = limit;
+  }
+
+  public Long getTotalCount() {
+    return totalCount;
+  }
+
+  public void setTotalCount(Long totalCount) {
+    this.totalCount = totalCount;
+  }
+
+  public String getSort() {
+    return sort;
+  }
+
+  public void setSort(String sort) {
+    this.sort = sort;
+  }
+
+  public String getOrder() {
+    return order;
+  }
+
+  public void setOrder(String order) {
+    this.order = order;
+  }
+
+  public List<T> getItems() {
+    return items;
+  }
+
+  public void setItems(List<T> items) {
+    this.items = items;
+  }
+
+}
\ No newline at end of file
diff --git a/src/main/java/com/epam/ta/reportportal/model/Position.java b/src/main/java/com/epam/ta/reportportal/model/Position.java
new file mode 100644
index 0000000000..9eaca2ff26
--- /dev/null
+++ b/src/main/java/com/epam/ta/reportportal/model/Position.java
@@ -0,0 +1,81 @@
+/*
+ * 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.ta.reportportal.model;
+
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * @author Pavel Bortnik
+ */
+@JsonInclude(JsonInclude.Include.NON_NULL)
+public class Position {
+
+	@JsonProperty(value = "positionX")
+	private int x;
+
+	@JsonProperty(value = "positionY")
+	private int y;
+
+	public Position() {
+	}
+
+	public Position(int x, int y) {
+		this.x = x;
+		this.y = y;
+	}
+
+	public int getX() {
+		return x;
+	}
+
+	public void setX(int x) {
+		this.x = x;
+	}
+
+	public int getY() {
+		return y;
+	}
+
+	public void setY(int y) {
+		this.y = y;
+	}
+
+	@Override
+	public boolean equals(Object o) {
+		if (this == o) {
+			return true;
+		}
+		if (o == null || getClass() != o.getClass()) {
+			return false;
+		}
+
+		Position position = (Position) o;
+
+		if (x != position.x) {
+			return false;
+		}
+		return y == position.y;
+	}
+
+	@Override
+	public int hashCode() {
+		int result = x;
+		result = 31 * result + y;
+		return result;
+	}
+}
diff --git a/src/main/java/com/epam/ta/reportportal/model/SearchCriteria.java b/src/main/java/com/epam/ta/reportportal/model/SearchCriteria.java
new file mode 100644
index 0000000000..685062a432
--- /dev/null
+++ b/src/main/java/com/epam/ta/reportportal/model/SearchCriteria.java
@@ -0,0 +1,97 @@
+/*
+ * Copyright 2023 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.ta.reportportal.model;
+
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonInclude.Include;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import io.swagger.annotations.ApiModelProperty;
+import java.util.Objects;
+import javax.validation.constraints.NotNull;
+
+/**
+ * Search Criteria used for a compound query and subsequent conversion to a filter.
+ *
+ * @author Ryhor_Kukharenka
+ */
+@JsonInclude(Include.NON_NULL)
+public class SearchCriteria {
+
+  @NotNull
+  @JsonProperty(value = "filter_key", required = true)
+  @ApiModelProperty(required = true)
+  private String filterKey;
+
+  @JsonProperty(value = "operation")
+  @ApiModelProperty(allowableValues = "EQ, NE, CNT, NON_CNT, BTW, IN")
+  private String operation;
+
+  @NotNull
+  @JsonProperty(value = "value", required = true)
+  @ApiModelProperty(required = true)
+  private String value;
+
+  public SearchCriteria() {
+  }
+
+  public SearchCriteria(String filterKey, String operation, String value) {
+    this.filterKey = filterKey;
+    this.operation = operation;
+    this.value = value;
+  }
+
+  public String getFilterKey() {
+    return filterKey;
+  }
+
+  public void setFilterKey(String filterKey) {
+    this.filterKey = filterKey;
+  }
+
+  public String getOperation() {
+    return operation;
+  }
+
+  public void setOperation(String operation) {
+    this.operation = operation;
+  }
+
+  public String getValue() {
+    return value;
+  }
+
+  public void setValue(String value) {
+    this.value = value;
+  }
+
+  @Override
+  public boolean equals(Object o) {
+    if (this == o) {
+      return true;
+    }
+    if (o == null || getClass() != o.getClass()) {
+      return false;
+    }
+    SearchCriteria that = (SearchCriteria) o;
+    return Objects.equals(filterKey, that.filterKey);
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(filterKey);
+  }
+}
\ No newline at end of file
diff --git a/src/main/java/com/epam/ta/reportportal/model/SearchCriteriaRQ.java b/src/main/java/com/epam/ta/reportportal/model/SearchCriteriaRQ.java
new file mode 100644
index 0000000000..58e0cde7ec
--- /dev/null
+++ b/src/main/java/com/epam/ta/reportportal/model/SearchCriteriaRQ.java
@@ -0,0 +1,52 @@
+/*
+ * Copyright 2023 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.ta.reportportal.model;
+
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonInclude.Include;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import java.util.Set;
+import javax.validation.constraints.NotNull;
+
+/**
+ * Keep all search criteria for request.
+ *
+ * @author Ryhor_Kukharenka
+ */
+@JsonInclude(Include.NON_NULL)
+public class SearchCriteriaRQ {
+
+  @NotNull
+  @JsonProperty(value = "search_criterias")
+  private Set<SearchCriteria> criteriaList;
+
+  public SearchCriteriaRQ() {
+  }
+
+  public SearchCriteriaRQ(Set<SearchCriteria> criteriaList) {
+    this.criteriaList = criteriaList;
+  }
+
+  public Set<SearchCriteria> getCriteriaList() {
+    return criteriaList;
+  }
+
+  public void setCriteriaList(Set<SearchCriteria> criteriaList) {
+    this.criteriaList = criteriaList;
+  }
+
+}
\ No newline at end of file
diff --git a/src/main/java/com/epam/ta/reportportal/model/Size.java b/src/main/java/com/epam/ta/reportportal/model/Size.java
new file mode 100644
index 0000000000..a58c43b76d
--- /dev/null
+++ b/src/main/java/com/epam/ta/reportportal/model/Size.java
@@ -0,0 +1,81 @@
+/*
+ * 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.ta.reportportal.model;
+
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * @author Pavel Bortnik
+ */
+@JsonInclude(JsonInclude.Include.NON_NULL)
+public class Size {
+
+	@JsonProperty(value = "width")
+	private int width;
+
+	@JsonProperty(value = "height")
+	private int height;
+
+	public Size() {
+	}
+
+	public Size(int width, int height) {
+		this.width = width;
+		this.height = height;
+	}
+
+	public int getWidth() {
+		return width;
+	}
+
+	public void setWidth(int width) {
+		this.width = width;
+	}
+
+	public int getHeight() {
+		return height;
+	}
+
+	public void setHeight(int height) {
+		this.height = height;
+	}
+
+	@Override
+	public boolean equals(Object o) {
+		if (this == o) {
+			return true;
+		}
+		if (o == null || getClass() != o.getClass()) {
+			return false;
+		}
+
+		Size size = (Size) o;
+
+		if (width != size.width) {
+			return false;
+		}
+		return height == size.height;
+	}
+
+	@Override
+	public int hashCode() {
+		int result = width;
+		result = 31 * result + height;
+		return result;
+	}
+}
diff --git a/src/main/java/com/epam/ta/reportportal/model/SystemInfoRS.java b/src/main/java/com/epam/ta/reportportal/model/SystemInfoRS.java
new file mode 100644
index 0000000000..98dcb7af04
--- /dev/null
+++ b/src/main/java/com/epam/ta/reportportal/model/SystemInfoRS.java
@@ -0,0 +1,62 @@
+/*
+ * 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.ta.reportportal.model;
+
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonInclude.Include;
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * System information response
+ * 
+ * @author Andrei_Ramanchuk
+ */
+@JsonInclude(Include.NON_NULL)
+public class SystemInfoRS {
+
+	@JsonProperty("os")
+	private String osVersion;
+
+	@JsonProperty("cpuUsage")
+	private float cpuUsage;
+
+	@JsonProperty("memUsage")
+	private float memUsage;
+
+	public void setOsVersion(String value) {
+		this.osVersion = value;
+	}
+
+	public String getOsVersion() {
+		return osVersion;
+	}
+
+	public void setCpuUsage(float value) {
+		this.cpuUsage = value;
+	}
+
+	public float getCpuUsage() {
+		return cpuUsage;
+	}
+
+	public void setMemUsage(float value) {
+		this.memUsage = value;
+	}
+
+	public float getMemUsage() {
+		return memUsage;
+	}
+}
\ No newline at end of file
diff --git a/src/main/java/com/epam/ta/reportportal/model/TestItemHistoryElement.java b/src/main/java/com/epam/ta/reportportal/model/TestItemHistoryElement.java
new file mode 100644
index 0000000000..c5c26592d3
--- /dev/null
+++ b/src/main/java/com/epam/ta/reportportal/model/TestItemHistoryElement.java
@@ -0,0 +1,57 @@
+/*
+ * 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.ta.reportportal.model;
+
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonInclude.Include;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import java.util.List;
+
+@JsonInclude(Include.NON_NULL)
+public class TestItemHistoryElement {
+
+  @JsonProperty(value = "groupingField")
+  private String groupingField;
+
+  @JsonProperty(value = "resources")
+  private List<TestItemResource> resources;
+
+  public TestItemHistoryElement() {
+  }
+
+  public String getGroupingField() {
+    return groupingField;
+  }
+
+  public void setGroupingField(String groupingField) {
+    this.groupingField = groupingField;
+  }
+
+  public List<TestItemResource> getResources() {
+    return resources;
+  }
+
+  public void setResources(List<TestItemResource> resources) {
+    this.resources = resources;
+  }
+
+  @Override
+  public String toString() {
+    return "TestItemHistoryElement{" + "groupingField=" + groupingField + ", resources=" + resources
+        + '}';
+  }
+}
\ No newline at end of file
diff --git a/src/main/java/com/epam/ta/reportportal/model/TestItemResource.java b/src/main/java/com/epam/ta/reportportal/model/TestItemResource.java
new file mode 100644
index 0000000000..dcf9550152
--- /dev/null
+++ b/src/main/java/com/epam/ta/reportportal/model/TestItemResource.java
@@ -0,0 +1,345 @@
+/*
+ * 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.ta.reportportal.model;
+
+import com.epam.ta.reportportal.ws.model.ParameterResource;
+import com.epam.ta.reportportal.ws.model.attribute.ItemAttributeResource;
+import com.epam.ta.reportportal.ws.model.issue.Issue;
+import com.epam.ta.reportportal.ws.model.item.PathNameResource;
+import com.epam.ta.reportportal.ws.model.statistics.StatisticsResource;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonInclude.Include;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import java.util.Date;
+import java.util.List;
+import java.util.Set;
+
+/**
+ * JSON Representation of Report Portal domain object
+ *
+ * @author Andrei Varabyeu
+ */
+@JsonInclude(Include.NON_NULL)
+public class TestItemResource {
+
+	@JsonProperty(value = "id")
+	private Long itemId;
+
+	@JsonProperty(value = "uuid")
+	private String uuid;
+
+	@JsonProperty(value = "name")
+	private String name;
+
+	@JsonProperty(value = "codeRef")
+	private String codeRef;
+
+	@JsonProperty(value = "description")
+	private String description;
+
+	@JsonProperty(value = "parameters")
+	private List<ParameterResource> parameters;
+
+	@JsonProperty(value = "attributes")
+	private Set<ItemAttributeResource> attributes;
+
+	@JsonProperty(value = "type")
+	private String type;
+
+	@JsonProperty(value = "startTime")
+	private Date startTime;
+
+	@JsonProperty(value = "endTime")
+	private Date endTime;
+
+	@JsonProperty(value = "status")
+	private String status;
+
+	@JsonProperty(value = "statistics")
+	private StatisticsResource statisticsResource;
+
+	@JsonProperty(value = "parent")
+	private Long parent;
+
+	@JsonProperty(value = "pathNames")
+	private PathNameResource pathNames;
+
+	@JsonProperty(value = "launchStatus")
+	private String launchStatus;
+
+	@JsonProperty(value = "issue")
+	private Issue issue;
+
+	@JsonProperty(value = "hasChildren")
+	private boolean hasChildren;
+
+	@JsonProperty(value = "hasStats")
+	private boolean hasStats;
+
+	@JsonProperty(value = "launchId")
+	private Long launchId;
+
+	@JsonProperty(value = "uniqueId")
+	private String uniqueId;
+
+	@JsonProperty(value = "testCaseId")
+	private String testCaseId;
+
+	@JsonProperty(value = "testCaseHash")
+	private Integer testCaseHash;
+
+	@JsonProperty(value = "patternTemplates")
+	private Set<String> patternTemplates;
+
+	@JsonProperty(value = "retries")
+	private List<TestItemResource> retries;
+
+	@JsonProperty(value = "path")
+	private String path;
+
+	public List<TestItemResource> getRetries() {
+		return retries;
+	}
+
+	public void setRetries(List<TestItemResource> retries) {
+		this.retries = retries;
+	}
+
+	public Long getLaunchId() {
+		return launchId;
+	}
+
+	public void setLaunchId(Long launchId) {
+		this.launchId = launchId;
+	}
+
+	public String getUuid() {
+		return uuid;
+	}
+
+	public void setUuid(String uuid) {
+		this.uuid = uuid;
+	}
+
+	public Long getItemId() {
+		return itemId;
+	}
+
+	public void setItemId(Long itemId) {
+		this.itemId = itemId;
+	}
+
+	public Issue getIssue() {
+		return issue;
+	}
+
+	public void setIssue(Issue issue) {
+		this.issue = issue;
+	}
+
+	public String getName() {
+		return name;
+	}
+
+	public void setName(String name) {
+		this.name = name;
+	}
+
+	public String getCodeRef() {
+		return codeRef;
+	}
+
+	public void setCodeRef(String codeRef) {
+		this.codeRef = codeRef;
+	}
+
+	public String getDescription() {
+		return description;
+	}
+
+	public void setDescription(String description) {
+		this.description = description;
+	}
+
+	public List<ParameterResource> getParameters() {
+		return parameters;
+	}
+
+	public void setParameters(List<ParameterResource> parameters) {
+		this.parameters = parameters;
+	}
+
+	public Set<ItemAttributeResource> getAttributes() {
+		return attributes;
+	}
+
+	public void setAttributes(Set<ItemAttributeResource> attributes) {
+		this.attributes = attributes;
+	}
+
+	public String getType() {
+		return type;
+	}
+
+	public void setType(String type) {
+		this.type = type;
+	}
+
+	public Date getStartTime() {
+		return startTime;
+	}
+
+	public void setStartTime(Date startTime) {
+		this.startTime = startTime;
+	}
+
+	public Date getEndTime() {
+		return endTime;
+	}
+
+	public void setEndTime(Date endTime) {
+		this.endTime = endTime;
+	}
+
+	public String getStatus() {
+		return status;
+	}
+
+	public void setStatus(String status) {
+		this.status = status;
+	}
+
+	public Long getParent() {
+		return parent;
+	}
+
+	public void setParent(Long parent) {
+		this.parent = parent;
+	}
+
+	public PathNameResource getPathNames() {
+		return pathNames;
+	}
+
+	public void setPathNames(PathNameResource pathNames) {
+		this.pathNames = pathNames;
+	}
+
+	public void setLaunchStatus(String value) {
+		this.launchStatus = value;
+	}
+
+	public String getLaunchStatus() {
+		return launchStatus;
+	}
+
+	public StatisticsResource getStatisticsResource() {
+		return statisticsResource;
+	}
+
+	public void setStatisticsResource(StatisticsResource statisticsResource) {
+		this.statisticsResource = statisticsResource;
+	}
+
+	public boolean isHasChildren() {
+		return hasChildren;
+	}
+
+	public void setHasChildren(boolean hasChildren) {
+		this.hasChildren = hasChildren;
+	}
+
+	public boolean isHasStats() {
+		return hasStats;
+	}
+
+	public void setHasStats(boolean hasStats) {
+		this.hasStats = hasStats;
+	}
+
+	public String getUniqueId() {
+		return uniqueId;
+	}
+
+	public void setUniqueId(String uniqueId) {
+		this.uniqueId = uniqueId;
+	}
+
+	public String getTestCaseId() {
+		return testCaseId;
+	}
+
+	public void setTestCaseId(String testCaseId) {
+		this.testCaseId = testCaseId;
+	}
+
+	public Integer getTestCaseHash() {
+		return testCaseHash;
+	}
+
+	public void setTestCaseHash(Integer testCaseHash) {
+		this.testCaseHash = testCaseHash;
+	}
+
+	public String getPath() {
+		return path;
+	}
+
+	public void setPath(String path) {
+		this.path = path;
+	}
+
+	public Set<String> getPatternTemplates() {
+		return patternTemplates;
+	}
+
+	public void setPatternTemplates(Set<String> patternTemplates) {
+		this.patternTemplates = patternTemplates;
+	}
+
+	@Override
+	public String toString() {
+		final StringBuilder sb = new StringBuilder("TestItemResource{");
+		sb.append("itemId=").append(itemId);
+		sb.append(", uuid='").append(uuid).append('\'');
+		sb.append(", name='").append(name).append('\'');
+		sb.append(", codeRef='").append(codeRef).append('\'');
+		sb.append(", description='").append(description).append('\'');
+		sb.append(", parameters=").append(parameters);
+		sb.append(", attributes=").append(attributes);
+		sb.append(", type='").append(type).append('\'');
+		sb.append(", startTime=").append(startTime);
+		sb.append(", endTime=").append(endTime);
+		sb.append(", status='").append(status).append('\'');
+		sb.append(", statisticsResource=").append(statisticsResource);
+		sb.append(", parent=").append(parent);
+		sb.append(", pathNames=").append(pathNames);
+		sb.append(", launchStatus='").append(launchStatus).append('\'');
+		sb.append(", issue=").append(issue);
+		sb.append(", hasChildren=").append(hasChildren);
+		sb.append(", hasStats=").append(hasStats);
+		sb.append(", launchId=").append(launchId);
+		sb.append(", uniqueId='").append(uniqueId).append('\'');
+		sb.append(", testCaseId='").append(testCaseId).append('\'');
+		sb.append(", testCaseHash='").append(testCaseHash).append('\'');
+		sb.append(", patternTemplates=").append(patternTemplates);
+		sb.append(", retries=").append(retries);
+		sb.append(", path='").append(path).append('\'');
+		sb.append('}');
+		return sb.toString();
+	}
+}
diff --git a/src/main/java/com/epam/ta/reportportal/model/TokenCreatedRS.java b/src/main/java/com/epam/ta/reportportal/model/TokenCreatedRS.java
new file mode 100644
index 0000000000..03f12da368
--- /dev/null
+++ b/src/main/java/com/epam/ta/reportportal/model/TokenCreatedRS.java
@@ -0,0 +1,55 @@
+/*
+ * 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.ta.reportportal.model;
+
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonInclude.Include;
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * Basic token creation response
+ * 
+ * @author Andrei_Ramanchuk
+ */
+@JsonInclude(Include.NON_NULL)
+public class TokenCreatedRS {
+	@JsonProperty("accessToken")
+	private String token;
+
+	public TokenCreatedRS() {
+	}
+
+	public TokenCreatedRS(String token) {
+		this.token = token;
+	}
+
+	public void setId(String token) {
+		this.token = token;
+	}
+
+	public String getToken() {
+		return token;
+	}
+
+	@Override
+	public String toString() {
+		final StringBuilder sb = new StringBuilder("TokenCreatedRS{");
+		sb.append("access_token='").append(token).append('\'');
+		sb.append('}');
+		return sb.toString();
+	}
+}
\ No newline at end of file
diff --git a/src/main/java/com/epam/ta/reportportal/model/WarningAwareRS.java b/src/main/java/com/epam/ta/reportportal/model/WarningAwareRS.java
new file mode 100644
index 0000000000..6a2669cba9
--- /dev/null
+++ b/src/main/java/com/epam/ta/reportportal/model/WarningAwareRS.java
@@ -0,0 +1,40 @@
+/*
+ * 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.ta.reportportal.model;
+
+/**
+ * @author Andrei Varabyeu
+ */
+public class WarningAwareRS {
+
+	private String warning;
+
+	public String getWarning() {
+		return warning;
+	}
+
+	public void setWarning(String warning) {
+		this.warning = warning;
+	}
+
+	@Override
+	public String toString() {
+		final StringBuilder sb = new StringBuilder("WarningAwareRS{");
+		sb.append("warning='").append(warning).append('\'');
+		sb.append('}');
+		return sb.toString();
+	}
+}
diff --git a/src/main/java/com/epam/ta/reportportal/model/YesNoRS.java b/src/main/java/com/epam/ta/reportportal/model/YesNoRS.java
new file mode 100644
index 0000000000..fee32044c8
--- /dev/null
+++ b/src/main/java/com/epam/ta/reportportal/model/YesNoRS.java
@@ -0,0 +1,70 @@
+/*
+ * 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.ta.reportportal.model;
+
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonInclude.Include;
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+@JsonInclude(Include.NON_NULL)
+public class YesNoRS {
+
+	@JsonProperty("is")
+	private boolean is;
+
+	public YesNoRS() {
+	}
+
+	public YesNoRS(boolean param) {
+		this.is = param;
+	}
+
+	public void setIs(boolean value) {
+		this.is = value;
+	}
+
+	public boolean getIs() {
+		return is;
+	}
+
+	@Override
+	public String toString() {
+		return "YesNoRS [is=" + is + "]";
+	}
+
+	@Override
+	public int hashCode() {
+		final int prime = 31;
+		int result = 1;
+		result = prime * result + (is ? 1231 : 1237);
+		return result;
+	}
+
+	@Override
+	public boolean equals(Object obj) {
+		if (this == obj)
+			return true;
+		if (obj == null)
+			return false;
+		if (getClass() != obj.getClass())
+			return false;
+		YesNoRS other = (YesNoRS) obj;
+		if (is != other.is)
+			return false;
+		return true;
+	}
+}
\ No newline at end of file
diff --git a/src/main/java/com/epam/ta/reportportal/model/activity/DashboardActivityResource.java b/src/main/java/com/epam/ta/reportportal/model/activity/DashboardActivityResource.java
new file mode 100644
index 0000000000..cb7622110c
--- /dev/null
+++ b/src/main/java/com/epam/ta/reportportal/model/activity/DashboardActivityResource.java
@@ -0,0 +1,80 @@
+/*
+ * 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.ta.reportportal.model.activity;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * @author <a href="mailto:ihar_kahadouski@epam.com">Ihar Kahadouski</a>
+ */
+public class DashboardActivityResource {
+
+	@JsonProperty(value = "id", required = true)
+	private Long id;
+
+	@JsonProperty(value = "name", required = true)
+	private String name;
+
+	@JsonProperty(value = "projectId", required = true)
+	private Long projectId;
+
+	@JsonProperty(value = "description")
+	private String description;
+
+	public Long getId() {
+		return id;
+	}
+
+	public void setId(Long id) {
+		this.id = id;
+	}
+
+	public String getName() {
+		return name;
+	}
+
+	public void setName(String name) {
+		this.name = name;
+	}
+
+	public Long getProjectId() {
+		return projectId;
+	}
+
+	public void setProjectId(Long projectId) {
+		this.projectId = projectId;
+	}
+
+	public String getDescription() {
+		return description;
+	}
+
+	public void setDescription(String description) {
+		this.description = description;
+	}
+
+	@Override
+	public String toString() {
+		final StringBuilder sb = new StringBuilder("DashboardActivityResource{");
+		sb.append("id=").append(id);
+		sb.append(", name='").append(name).append('\'');
+		sb.append(", projectId=").append(projectId);
+		sb.append(", description='").append(description).append('\'');
+		sb.append('}');
+		return sb.toString();
+	}
+}
diff --git a/src/main/java/com/epam/ta/reportportal/model/activity/IntegrationActivityResource.java b/src/main/java/com/epam/ta/reportportal/model/activity/IntegrationActivityResource.java
new file mode 100644
index 0000000000..6393ba1a9b
--- /dev/null
+++ b/src/main/java/com/epam/ta/reportportal/model/activity/IntegrationActivityResource.java
@@ -0,0 +1,92 @@
+/*
+ * 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.ta.reportportal.model.activity;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * @author <a href="mailto:ihar_kahadouski@epam.com">Ihar Kahadouski</a>
+ */
+public class IntegrationActivityResource {
+
+	@JsonProperty(value = "id", required = true)
+	private Long id;
+
+	@JsonProperty(value = "projectId", required = true)
+	private Long projectId;
+
+	@JsonProperty(value = "name")
+	private String name;
+
+	@JsonProperty(value = "projectName", required = true)
+	private String projectName;
+
+	@JsonProperty(value = "typeName", required = true)
+	private String typeName;
+
+	public Long getId() {
+		return id;
+	}
+
+	public void setId(Long id) {
+		this.id = id;
+	}
+
+	public Long getProjectId() {
+		return projectId;
+	}
+
+	public void setProjectId(Long projectId) {
+		this.projectId = projectId;
+	}
+
+	public String getName() {
+		return name;
+	}
+
+	public void setName(String name) {
+		this.name = name;
+	}
+
+	public String getProjectName() {
+		return projectName;
+	}
+
+	public void setProjectName(String projectName) {
+		this.projectName = projectName;
+	}
+
+	public String getTypeName() {
+		return typeName;
+	}
+
+	public void setTypeName(String typeName) {
+		this.typeName = typeName;
+	}
+
+	@Override
+	public String toString() {
+		final StringBuilder sb = new StringBuilder("IntegrationActivityResource{");
+		sb.append("id=").append(id);
+		sb.append(", projectId=").append(projectId);
+		sb.append(", name='").append(name).append('\'');
+		sb.append(", projectName='").append(projectName).append('\'');
+		sb.append(", typeName='").append(typeName).append('\'');
+		sb.append('}');
+		return sb.toString();
+	}
+}
diff --git a/src/main/java/com/epam/ta/reportportal/model/activity/IssueTypeActivityResource.java b/src/main/java/com/epam/ta/reportportal/model/activity/IssueTypeActivityResource.java
new file mode 100644
index 0000000000..395d8f0028
--- /dev/null
+++ b/src/main/java/com/epam/ta/reportportal/model/activity/IssueTypeActivityResource.java
@@ -0,0 +1,56 @@
+/*
+ * 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.ta.reportportal.model.activity;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * @author <a href="mailto:ihar_kahadouski@epam.com">Ihar Kahadouski</a>
+ */
+public class IssueTypeActivityResource {
+
+	@JsonProperty(value = "id", required = true)
+	private Long id;
+
+	@JsonProperty(value = "longName", required = true)
+	private String longName;
+
+	public Long getId() {
+		return id;
+	}
+
+	public void setId(Long id) {
+		this.id = id;
+	}
+
+	public String getLongName() {
+		return longName;
+	}
+
+	public void setLongName(String longName) {
+		this.longName = longName;
+	}
+
+	@Override
+	public String toString() {
+		final StringBuilder sb = new StringBuilder("IssueTypeActivityResource{");
+		sb.append("id=").append(id);
+		sb.append(", longName='").append(longName).append('\'');
+		sb.append('}');
+		return sb.toString();
+	}
+}
diff --git a/src/main/java/com/epam/ta/reportportal/model/activity/LaunchActivityResource.java b/src/main/java/com/epam/ta/reportportal/model/activity/LaunchActivityResource.java
new file mode 100644
index 0000000000..4a18163619
--- /dev/null
+++ b/src/main/java/com/epam/ta/reportportal/model/activity/LaunchActivityResource.java
@@ -0,0 +1,68 @@
+/*
+ * 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.ta.reportportal.model.activity;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * @author <a href="mailto:ihar_kahadouski@epam.com">Ihar Kahadouski</a>
+ */
+public class LaunchActivityResource {
+
+	@JsonProperty(value = "id", required = true)
+	private Long id;
+
+	@JsonProperty(value = "projectId", required = true)
+	private Long projectId;
+
+	@JsonProperty(value = "name", required = true)
+	private String name;
+
+	public Long getId() {
+		return id;
+	}
+
+	public void setId(Long id) {
+		this.id = id;
+	}
+
+	public Long getProjectId() {
+		return projectId;
+	}
+
+	public void setProjectId(Long projectId) {
+		this.projectId = projectId;
+	}
+
+	public String getName() {
+		return name;
+	}
+
+	public void setName(String name) {
+		this.name = name;
+	}
+
+	@Override
+	public String toString() {
+		final StringBuilder sb = new StringBuilder("LaunchActivityResource{");
+		sb.append("id=").append(id);
+		sb.append(", projectId=").append(projectId);
+		sb.append(", name='").append(name).append('\'');
+		sb.append('}');
+		return sb.toString();
+	}
+}
diff --git a/src/main/java/com/epam/ta/reportportal/model/activity/PatternTemplateActivityResource.java b/src/main/java/com/epam/ta/reportportal/model/activity/PatternTemplateActivityResource.java
new file mode 100644
index 0000000000..31fff45e94
--- /dev/null
+++ b/src/main/java/com/epam/ta/reportportal/model/activity/PatternTemplateActivityResource.java
@@ -0,0 +1,74 @@
+/*
+ * 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.ta.reportportal.model.activity;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * @author <a href="mailto:ivan_budayeu@epam.com">Ivan Budayeu</a>
+ */
+public class PatternTemplateActivityResource {
+
+	@JsonProperty(value = "id", required = true)
+	private Long id;
+
+	@JsonProperty(value = "projectId", required = true)
+	private Long projectId;
+
+	@JsonProperty(value = "name", required = true)
+	private String name;
+
+	@JsonProperty(value = "enabled", required = true)
+	private boolean enabled;
+
+	public Long getId() {
+		return id;
+	}
+
+	public void setId(Long id) {
+		this.id = id;
+	}
+
+	public Long getProjectId() {
+		return projectId;
+	}
+
+	public void setProjectId(Long projectId) {
+		this.projectId = projectId;
+	}
+
+	public String getName() {
+		return name;
+	}
+
+	public void setName(String name) {
+		this.name = name;
+	}
+
+	public boolean isEnabled() {
+		return enabled;
+	}
+
+	public void setEnabled(boolean enabled) {
+		this.enabled = enabled;
+	}
+
+	@Override
+	public String toString() {
+		return "PatternTemplateActivityResource{" + "id=" + id + ", projectId=" + projectId + ", name='" + name + '\'' + ", enabled=" + enabled + '}';
+	}
+}
diff --git a/src/main/java/com/epam/ta/reportportal/model/activity/PluginActivityResource.java b/src/main/java/com/epam/ta/reportportal/model/activity/PluginActivityResource.java
new file mode 100644
index 0000000000..8f38083d02
--- /dev/null
+++ b/src/main/java/com/epam/ta/reportportal/model/activity/PluginActivityResource.java
@@ -0,0 +1,54 @@
+package com.epam.ta.reportportal.model.activity;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+public class PluginActivityResource {
+  @JsonProperty(value = "id", required = true)
+  private Long id;
+  @JsonProperty(value = "name")
+  private String name;
+
+  @JsonProperty(value = "enabled")
+  private boolean enabled;
+
+  @JsonProperty(value = "version")
+  private String version;
+
+  public Long getId() {
+    return id;
+  }
+
+  public void setId(Long id) {
+    this.id = id;
+  }
+
+  public String getName() {
+    return name;
+  }
+
+  public void setName(String name) {
+    this.name = name;
+  }
+
+  public boolean isEnabled() {
+    return enabled;
+  }
+
+  public void setEnabled(boolean enabled) {
+    this.enabled = enabled;
+  }
+
+  public String getVersion() {
+    return version;
+  }
+
+  public void setVersion(String version) {
+    this.version = version;
+  }
+
+  @Override
+  public String toString() {
+    return "PluginActivityResource{" + "id=" + id + ", name='" + name + '\'' + ", enabled="
+        + enabled + ", version='" + version + '\'' + '}';
+  }
+}
diff --git a/src/main/java/com/epam/ta/reportportal/model/activity/ProjectAttributesActivityResource.java b/src/main/java/com/epam/ta/reportportal/model/activity/ProjectAttributesActivityResource.java
new file mode 100644
index 0000000000..4cf01baef6
--- /dev/null
+++ b/src/main/java/com/epam/ta/reportportal/model/activity/ProjectAttributesActivityResource.java
@@ -0,0 +1,72 @@
+/*
+ * 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.ta.reportportal.model.activity;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * @author <a href="mailto:ihar_kahadouski@epam.com">Ihar Kahadouski</a>
+ */
+public class ProjectAttributesActivityResource {
+
+	@JsonProperty(value = "projectId", required = true)
+	private Long projectId;
+
+	@JsonProperty(value = "projectName", required = true)
+	private String projectName;
+
+	@JsonProperty(value = "config")
+	@JsonDeserialize(as = HashMap.class)
+	private Map<String, String> config;
+
+	public Long getProjectId() {
+		return projectId;
+	}
+
+	public void setProjectId(Long projectId) {
+		this.projectId = projectId;
+	}
+
+	public String getProjectName() {
+		return projectName;
+	}
+
+	public void setProjectName(String projectName) {
+		this.projectName = projectName;
+	}
+
+	public Map<String, String> getConfig() {
+		return config;
+	}
+
+	public void setConfig(Map<String, String> config) {
+		this.config = config;
+	}
+
+	@Override
+	public String toString() {
+		final StringBuilder sb = new StringBuilder("ProjectAttributesActivityResource{");
+		sb.append("projectId=").append(projectId);
+		sb.append(", projectName='").append(projectName).append('\'');
+		sb.append(", config=").append(config);
+		sb.append('}');
+		return sb.toString();
+	}
+}
diff --git a/src/main/java/com/epam/ta/reportportal/model/activity/TestItemActivityResource.java b/src/main/java/com/epam/ta/reportportal/model/activity/TestItemActivityResource.java
new file mode 100644
index 0000000000..61cbbd09ab
--- /dev/null
+++ b/src/main/java/com/epam/ta/reportportal/model/activity/TestItemActivityResource.java
@@ -0,0 +1,140 @@
+/*
+ * 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.ta.reportportal.model.activity;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * @author <a href="mailto:ihar_kahadouski@epam.com">Ihar Kahadouski</a>
+ */
+public class TestItemActivityResource {
+
+	@JsonProperty(value = "id", required = true)
+	private Long id;
+
+	@JsonProperty(value = "projectId", required = true)
+	private Long projectId;
+
+	@JsonProperty(value = "name", required = true)
+	private String name;
+
+	@JsonProperty(value = "issueDescription")
+	private String issueDescription;
+
+	@JsonProperty(value = "issueTypeLongName")
+	private String issueTypeLongName;
+
+	@JsonProperty(value = "ignoreAnalyzer")
+	private boolean ignoreAnalyzer;
+
+	@JsonProperty(value = "autoAnalyzed")
+	private boolean autoAnalyzed;
+
+	@JsonProperty(value = "tickets")
+	private String tickets;
+
+	@JsonProperty(value = "status")
+	private String status;
+
+	public Long getId() {
+		return id;
+	}
+
+	public void setId(Long id) {
+		this.id = id;
+	}
+
+	public Long getProjectId() {
+		return projectId;
+	}
+
+	public void setProjectId(Long projectId) {
+		this.projectId = projectId;
+	}
+
+	public String getName() {
+		return name;
+	}
+
+	public void setName(String name) {
+		this.name = name;
+	}
+
+	public String getIssueDescription() {
+		return issueDescription;
+	}
+
+	public void setIssueDescription(String issueDescription) {
+		this.issueDescription = issueDescription;
+	}
+
+	public String getIssueTypeLongName() {
+		return issueTypeLongName;
+	}
+
+	public void setIssueTypeLongName(String issueTypeLongName) {
+		this.issueTypeLongName = issueTypeLongName;
+	}
+
+	public boolean isIgnoreAnalyzer() {
+		return ignoreAnalyzer;
+	}
+
+	public void setIgnoreAnalyzer(boolean ignoreAnalyzer) {
+		this.ignoreAnalyzer = ignoreAnalyzer;
+	}
+
+	public boolean isAutoAnalyzed() {
+		return autoAnalyzed;
+	}
+
+	public void setAutoAnalyzed(boolean autoAnalyzed) {
+		this.autoAnalyzed = autoAnalyzed;
+	}
+
+	public String getTickets() {
+		return tickets;
+	}
+
+	public void setTickets(String tickets) {
+		this.tickets = tickets;
+	}
+
+	public String getStatus() {
+		return status;
+	}
+
+	public void setStatus(String status) {
+		this.status = status;
+	}
+
+	@Override
+	public String toString() {
+		final StringBuilder sb = new StringBuilder("TestItemActivityResource{");
+		sb.append("id=").append(id);
+		sb.append(", projectId=").append(projectId);
+		sb.append(", name='").append(name).append('\'');
+		sb.append(", issueDescription='").append(issueDescription).append('\'');
+		sb.append(", issueTypeLongName='").append(issueTypeLongName).append('\'');
+		sb.append(", ignoreAnalyzer=").append(ignoreAnalyzer);
+		sb.append(", autoAnalyzed=").append(autoAnalyzed);
+		sb.append(", tickets='").append(tickets).append('\'');
+		sb.append(", status='").append(status).append('\'');
+		sb.append('}');
+		return sb.toString();
+	}
+}
diff --git a/src/main/java/com/epam/ta/reportportal/model/activity/UserActivityResource.java b/src/main/java/com/epam/ta/reportportal/model/activity/UserActivityResource.java
new file mode 100644
index 0000000000..5f88457605
--- /dev/null
+++ b/src/main/java/com/epam/ta/reportportal/model/activity/UserActivityResource.java
@@ -0,0 +1,77 @@
+/*
+ * 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.ta.reportportal.model.activity;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * @author <a href="mailto:ihar_kahadouski@epam.com">Ihar Kahadouski</a>
+ */
+public class UserActivityResource {
+
+  @JsonProperty(value = "id", required = true)
+  private Long id;
+
+  @JsonProperty(value = "defaultProjectId", required = true)
+  private Long defaultProjectId;
+
+  @JsonProperty(value = "fullName", required = true)
+  private String fullName;
+
+  public UserActivityResource() {
+  }
+
+  public UserActivityResource(Long id, Long defaultProjectId, String fullName) {
+    this.id = id;
+    this.defaultProjectId = defaultProjectId;
+    this.fullName = fullName;
+  }
+
+  public Long getId() {
+    return id;
+  }
+
+  public void setId(Long id) {
+    this.id = id;
+  }
+
+  public Long getDefaultProjectId() {
+    return defaultProjectId;
+  }
+
+  public void setDefaultProjectId(Long defaultProjectId) {
+    this.defaultProjectId = defaultProjectId;
+  }
+
+  public String getFullName() {
+    return fullName;
+  }
+
+  public void setFullName(String fullName) {
+    this.fullName = fullName;
+  }
+
+  @Override
+  public String toString() {
+    final StringBuilder sb = new StringBuilder("UserActivityResource{");
+    sb.append("id=").append(id);
+    sb.append(", defaultProjectId=").append(defaultProjectId);
+    sb.append(", fullName='").append(fullName).append('\'');
+    sb.append('}');
+    return sb.toString();
+  }
+}
diff --git a/src/main/java/com/epam/ta/reportportal/model/activity/UserFilterActivityResource.java b/src/main/java/com/epam/ta/reportportal/model/activity/UserFilterActivityResource.java
new file mode 100644
index 0000000000..7f90abcad9
--- /dev/null
+++ b/src/main/java/com/epam/ta/reportportal/model/activity/UserFilterActivityResource.java
@@ -0,0 +1,80 @@
+/*
+ * 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.ta.reportportal.model.activity;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * @author <a href="mailto:ihar_kahadouski@epam.com">Ihar Kahadouski</a>
+ */
+public class UserFilterActivityResource {
+
+	@JsonProperty(value = "id", required = true)
+	private Long id;
+
+	@JsonProperty(value = "projectId", required = true)
+	private Long projectId;
+
+	@JsonProperty(value = "name", required = true)
+	private String name;
+
+	@JsonProperty(value = "description")
+	private String description;
+
+	public Long getId() {
+		return id;
+	}
+
+	public void setId(Long id) {
+		this.id = id;
+	}
+
+	public Long getProjectId() {
+		return projectId;
+	}
+
+	public void setProjectId(Long projectId) {
+		this.projectId = projectId;
+	}
+
+	public String getName() {
+		return name;
+	}
+
+	public void setName(String name) {
+		this.name = name;
+	}
+
+	public String getDescription() {
+		return description;
+	}
+
+	public void setDescription(String description) {
+		this.description = description;
+	}
+
+	@Override
+	public String toString() {
+		final StringBuilder sb = new StringBuilder("UserFilterActivityResource{");
+		sb.append("id=").append(id);
+		sb.append(", projectId=").append(projectId);
+		sb.append(", name='").append(name).append('\'');
+		sb.append(", description='").append(description).append('\'');
+		sb.append('}');
+		return sb.toString();
+	}
+}
diff --git a/src/main/java/com/epam/ta/reportportal/model/activity/WidgetActivityResource.java b/src/main/java/com/epam/ta/reportportal/model/activity/WidgetActivityResource.java
new file mode 100644
index 0000000000..bfb00d7aef
--- /dev/null
+++ b/src/main/java/com/epam/ta/reportportal/model/activity/WidgetActivityResource.java
@@ -0,0 +1,123 @@
+/*
+ * 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.ta.reportportal.model.activity;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
+import java.util.LinkedHashMap;
+import java.util.LinkedHashSet;
+import java.util.Map;
+import java.util.Set;
+
+/**
+ * @author <a href="mailto:ihar_kahadouski@epam.com">Ihar Kahadouski</a>
+ */
+public class WidgetActivityResource {
+
+	@JsonProperty(value = "id", required = true)
+	private Long id;
+
+	@JsonProperty(value = "projectId", required = true)
+	private Long projectId;
+
+	@JsonProperty(value = "name", required = true)
+	private String name;
+
+	@JsonProperty(value = "description")
+	private String description;
+
+	@JsonProperty(value = "itemsCount")
+	private int itemsCount;
+
+	@JsonProperty(value = "contentFields")
+	@JsonDeserialize(as = LinkedHashSet.class)
+	private Set<String> contentFields;
+
+	@JsonProperty(value = "widgetOptions")
+	@JsonDeserialize(as = LinkedHashMap.class)
+	private Map<String, Object> widgetOptions;
+
+	public Long getId() {
+		return id;
+	}
+
+	public void setId(Long id) {
+		this.id = id;
+	}
+
+	public Long getProjectId() {
+		return projectId;
+	}
+
+	public void setProjectId(Long projectId) {
+		this.projectId = projectId;
+	}
+
+	public String getName() {
+		return name;
+	}
+
+	public void setName(String name) {
+		this.name = name;
+	}
+
+	public String getDescription() {
+		return description;
+	}
+
+	public void setDescription(String description) {
+		this.description = description;
+	}
+
+	public int getItemsCount() {
+		return itemsCount;
+	}
+
+	public void setItemsCount(int itemsCount) {
+		this.itemsCount = itemsCount;
+	}
+
+	public Set<String> getContentFields() {
+		return contentFields;
+	}
+
+	public void setContentFields(Set<String> contentFields) {
+		this.contentFields = contentFields;
+	}
+
+	public Map<String, Object> getWidgetOptions() {
+		return widgetOptions;
+	}
+
+	public void setWidgetOptions(Map<String, Object> widgetOptions) {
+		this.widgetOptions = widgetOptions;
+	}
+
+	@Override
+	public String toString() {
+		final StringBuilder sb = new StringBuilder("WidgetActivityResource{");
+		sb.append("id=").append(id);
+		sb.append(", projectId=").append(projectId);
+		sb.append(", name='").append(name).append('\'');
+		sb.append(", description='").append(description).append('\'');
+		sb.append(", itemsCount=").append(itemsCount);
+		sb.append(", contentFields=").append(contentFields);
+		sb.append(", widgetOptions=").append(widgetOptions);
+		sb.append('}');
+		return sb.toString();
+	}
+}
diff --git a/src/main/java/com/epam/ta/reportportal/model/analyzer/AnalyzedItemRs.java b/src/main/java/com/epam/ta/reportportal/model/analyzer/AnalyzedItemRs.java
new file mode 100644
index 0000000000..4228a840ce
--- /dev/null
+++ b/src/main/java/com/epam/ta/reportportal/model/analyzer/AnalyzedItemRs.java
@@ -0,0 +1,81 @@
+/*
+ * 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.ta.reportportal.model.analyzer;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import java.util.Objects;
+
+/**
+ * @author Pavel Bortnik
+ */
+public class AnalyzedItemRs {
+
+	@JsonProperty("testItem")
+	private Long itemId;
+
+	@JsonProperty("relevantItem")
+	private Long relevantItemId;
+
+	@JsonProperty("issueType")
+	private String locator;
+
+	public Long getItemId() {
+		return itemId;
+	}
+
+	public void setItemId(Long itemId) {
+		this.itemId = itemId;
+	}
+
+	public Long getRelevantItemId() {
+		return relevantItemId;
+	}
+
+	public void setRelevantItemId(Long relevantItemId) {
+		this.relevantItemId = relevantItemId;
+	}
+
+	public String getLocator() {
+		return locator;
+	}
+
+	public void setLocator(String locator) {
+		this.locator = locator;
+	}
+
+	@Override
+	public boolean equals(Object o) {
+		if (this == o) {
+			return true;
+		}
+		if (o == null || getClass() != o.getClass()) {
+			return false;
+		}
+		AnalyzedItemRs that = (AnalyzedItemRs) o;
+		return Objects.equals(itemId, that.itemId);
+	}
+
+	@Override
+	public int hashCode() {
+		return Objects.hash(itemId);
+	}
+
+	@Override
+	public String toString() {
+		return "AnalyzedItemRs{" + "itemId=" + itemId + ", relevantItemId=" + relevantItemId + ", issueTypeLocator=" + locator + '}';
+	}
+}
diff --git a/src/main/java/com/epam/ta/reportportal/model/analyzer/CleanIndexRq.java b/src/main/java/com/epam/ta/reportportal/model/analyzer/CleanIndexRq.java
new file mode 100644
index 0000000000..3825bc8284
--- /dev/null
+++ b/src/main/java/com/epam/ta/reportportal/model/analyzer/CleanIndexRq.java
@@ -0,0 +1,56 @@
+/*
+ * 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.ta.reportportal.model.analyzer;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import java.util.List;
+
+/**
+ * @author <a href="mailto:ihar_kahadouski@epam.com">Ihar Kahadouski</a>
+ */
+public class CleanIndexRq {
+
+	@JsonProperty("project")
+	private Long projectId;
+
+	@JsonProperty("ids")
+	private List<Long> logIds;
+
+	public CleanIndexRq() {
+	}
+
+	public CleanIndexRq(Long projectId, List<Long> logIds) {
+		this.projectId = projectId;
+		this.logIds = logIds;
+	}
+
+	public Long getProjectId() {
+		return projectId;
+	}
+
+	public void setProjectId(Long projectId) {
+		this.projectId = projectId;
+	}
+
+	public List<Long> getLogIds() {
+		return logIds;
+	}
+
+	public void setLogIds(List<Long> logIds) {
+		this.logIds = logIds;
+	}
+}
diff --git a/src/main/java/com/epam/ta/reportportal/model/analyzer/IndexRs.java b/src/main/java/com/epam/ta/reportportal/model/analyzer/IndexRs.java
new file mode 100644
index 0000000000..91f01e399c
--- /dev/null
+++ b/src/main/java/com/epam/ta/reportportal/model/analyzer/IndexRs.java
@@ -0,0 +1,64 @@
+/*
+ * 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.ta.reportportal.model.analyzer;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import java.util.List;
+
+/**
+ * Represents indexing operation response.
+ *
+ * @author Ivan Sharamet
+ */
+public class IndexRs {
+
+  @JsonProperty("took")
+  private int took;
+
+  @JsonProperty("errors")
+  private boolean errors;
+
+  @JsonProperty("items")
+  private List<IndexRsItem> items;
+
+  public IndexRs() {
+  }
+
+  public int getTook() {
+    return took;
+  }
+
+  public void setTook(int took) {
+    this.took = took;
+  }
+
+  public boolean isErrors() {
+    return errors;
+  }
+
+  public void setErrors(boolean errors) {
+    this.errors = errors;
+  }
+
+  public List<IndexRsItem> getItems() {
+    return items;
+  }
+
+  public void setItems(List<IndexRsItem> items) {
+    this.items = items;
+  }
+}
diff --git a/src/main/java/com/epam/ta/reportportal/model/analyzer/IndexRsIndex.java b/src/main/java/com/epam/ta/reportportal/model/analyzer/IndexRsIndex.java
new file mode 100644
index 0000000000..185b0858a6
--- /dev/null
+++ b/src/main/java/com/epam/ta/reportportal/model/analyzer/IndexRsIndex.java
@@ -0,0 +1,114 @@
+/*
+ * 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.ta.reportportal.model.analyzer;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * Represents detailed index information in indexing operation response.
+ *
+ * @author Ivan Sharamet
+ */
+public class IndexRsIndex {
+
+	public static final int STATUS_UPDATED = 200;
+	public static final int STATUS_CREATED = 201;
+
+	@JsonProperty("_index")
+	private String index;
+
+	@JsonProperty("_type")
+	private String type;
+
+	@JsonProperty("_id")
+	private String id;
+
+	@JsonProperty("_version")
+	private int version;
+
+	@JsonProperty("result")
+	private String result;
+
+	@JsonProperty("created")
+	private boolean created;
+
+	@JsonProperty("status")
+	private int status;
+
+	public IndexRsIndex() {
+	}
+
+	public String getIndex() {
+		return index;
+	}
+
+	public void setIndex(String index) {
+		this.index = index;
+	}
+
+	public String getType() {
+		return type;
+	}
+
+	public void setType(String type) {
+		this.type = type;
+	}
+
+	public String getId() {
+		return id;
+	}
+
+	public void setId(String id) {
+		this.id = id;
+	}
+
+	public int getVersion() {
+		return version;
+	}
+
+	public void setVersion(int version) {
+		this.version = version;
+	}
+
+	public String getResult() {
+		return result;
+	}
+
+	public void setResult(String result) {
+		this.result = result;
+	}
+
+	public boolean isCreated() {
+		return created;
+	}
+
+	public void setCreated(boolean created) {
+		this.created = created;
+	}
+
+	public int getStatus() {
+		return status;
+	}
+
+	public void setStatus(int status) {
+		this.status = status;
+	}
+
+	public boolean failed() {
+		return status != STATUS_CREATED && status != STATUS_UPDATED;
+	}
+}
diff --git a/src/main/java/com/epam/ta/reportportal/model/analyzer/IndexRsItem.java b/src/main/java/com/epam/ta/reportportal/model/analyzer/IndexRsItem.java
new file mode 100644
index 0000000000..ece1c27aa6
--- /dev/null
+++ b/src/main/java/com/epam/ta/reportportal/model/analyzer/IndexRsItem.java
@@ -0,0 +1,42 @@
+/*
+ * 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.ta.reportportal.model.analyzer;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * Represents single item in indexing operation response.
+ *
+ * @author Ivan Sharamet
+ */
+public class IndexRsItem {
+
+  @JsonProperty("index")
+  private IndexRsIndex index;
+
+  public IndexRsItem() {
+  }
+
+  public IndexRsIndex getIndex() {
+    return index;
+  }
+
+  public void setIndex(IndexRsIndex index) {
+    this.index = index;
+  }
+
+}
diff --git a/src/main/java/com/epam/ta/reportportal/model/analyzer/RelevantItemInfo.java b/src/main/java/com/epam/ta/reportportal/model/analyzer/RelevantItemInfo.java
new file mode 100644
index 0000000000..11c16ae5e5
--- /dev/null
+++ b/src/main/java/com/epam/ta/reportportal/model/analyzer/RelevantItemInfo.java
@@ -0,0 +1,65 @@
+/*
+ * 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.ta.reportportal.model.analyzer;
+
+import java.io.Serializable;
+
+/**
+ * @author <a href="mailto:ihar_kahadouski@epam.com">Ihar Kahadouski</a>
+ */
+public class RelevantItemInfo implements Serializable {
+
+	private String itemId;
+
+	private String path;
+
+	private String launchId;
+
+	public String getItemId() {
+		return itemId;
+	}
+
+	public void setItemId(String itemId) {
+		this.itemId = itemId;
+	}
+
+	public String getPath() {
+		return path;
+	}
+
+	public void setPath(String path) {
+		this.path = path;
+	}
+
+	public String getLaunchId() {
+		return launchId;
+	}
+
+	public void setLaunchId(String launchId) {
+		this.launchId = launchId;
+	}
+
+	@Override
+	public String toString() {
+		final StringBuilder sb = new StringBuilder("RelevantItemInfo{");
+		sb.append("itemId='").append(itemId).append('\'');
+		sb.append(", path='").append(path).append('\'');
+		sb.append(", launchId='").append(launchId).append('\'');
+		sb.append('}');
+		return sb.toString();
+	}
+}
diff --git a/src/main/java/com/epam/ta/reportportal/model/analyzer/SearchRq.java b/src/main/java/com/epam/ta/reportportal/model/analyzer/SearchRq.java
new file mode 100644
index 0000000000..01970d8b3c
--- /dev/null
+++ b/src/main/java/com/epam/ta/reportportal/model/analyzer/SearchRq.java
@@ -0,0 +1,106 @@
+/*
+ * 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.ta.reportportal.model.analyzer;
+
+import com.epam.ta.reportportal.ws.model.project.AnalyzerConfig;
+import java.util.List;
+
+/**
+ * @author <a href="mailto:ihar_kahadouski@epam.com">Ihar Kahadouski</a>
+ */
+public class SearchRq {
+
+	private Long launchId;
+
+	private String launchName;
+
+	private Long itemId;
+
+	private Long projectId;
+
+	private List<Long> filteredLaunchIds;
+
+	private List<String> logMessages;
+
+	private Integer logLines;
+
+	private AnalyzerConfig analyzerConfig;
+
+	public Long getLaunchId() {
+		return launchId;
+	}
+
+	public void setLaunchId(Long launchId) {
+		this.launchId = launchId;
+	}
+
+	public String getLaunchName() {
+		return launchName;
+	}
+
+	public void setLaunchName(String launchName) {
+		this.launchName = launchName;
+	}
+
+	public Long getItemId() {
+		return itemId;
+	}
+
+	public void setItemId(Long itemId) {
+		this.itemId = itemId;
+	}
+
+	public Long getProjectId() {
+		return projectId;
+	}
+
+	public void setProjectId(Long projectId) {
+		this.projectId = projectId;
+	}
+
+	public Integer getLogLines() {
+		return logLines;
+	}
+
+	public void setLogLines(Integer logLines) {
+		this.logLines = logLines;
+	}
+
+	public List<Long> getFilteredLaunchIds() {
+		return filteredLaunchIds;
+	}
+
+	public void setFilteredLaunchIds(List<Long> filteredLaunchIds) {
+		this.filteredLaunchIds = filteredLaunchIds;
+	}
+
+	public List<String> getLogMessages() {
+		return logMessages;
+	}
+
+	public void setLogMessages(List<String> logMessages) {
+		this.logMessages = logMessages;
+	}
+
+	public AnalyzerConfig getAnalyzerConfig() {
+		return analyzerConfig;
+	}
+
+	public void setAnalyzerConfig(AnalyzerConfig analyzerConfig) {
+		this.analyzerConfig = analyzerConfig;
+	}
+}
diff --git a/src/main/java/com/epam/ta/reportportal/model/analyzer/SearchRs.java b/src/main/java/com/epam/ta/reportportal/model/analyzer/SearchRs.java
new file mode 100644
index 0000000000..f9ce27413d
--- /dev/null
+++ b/src/main/java/com/epam/ta/reportportal/model/analyzer/SearchRs.java
@@ -0,0 +1,65 @@
+/*
+ * Copyright 2020 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.ta.reportportal.model.analyzer;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import java.util.Objects;
+
+/**
+ * @author <a href="mailto:ivan_budayeu@epam.com">Ivan Budayeu</a>
+ */
+public class SearchRs {
+
+	@JsonProperty(value = "logId")
+	private Long logId;
+
+	@JsonProperty(value = "testItemId")
+	private Long testItemId;
+
+	public Long getLogId() {
+		return logId;
+	}
+
+	public void setLogId(Long logId) {
+		this.logId = logId;
+	}
+
+	public Long getTestItemId() {
+		return testItemId;
+	}
+
+	public void setTestItemId(Long testItemId) {
+		this.testItemId = testItemId;
+	}
+
+	@Override
+	public boolean equals(Object o) {
+		if (this == o) {
+			return true;
+		}
+		if (o == null || getClass() != o.getClass()) {
+			return false;
+		}
+		SearchRs searchRs = (SearchRs) o;
+		return Objects.equals(logId, searchRs.logId) && Objects.equals(testItemId, searchRs.testItemId);
+	}
+
+	@Override
+	public int hashCode() {
+		return Objects.hash(logId, testItemId);
+	}
+}
diff --git a/src/main/java/com/epam/ta/reportportal/model/dashboard/AddWidgetRq.java b/src/main/java/com/epam/ta/reportportal/model/dashboard/AddWidgetRq.java
new file mode 100644
index 0000000000..8e563ae71b
--- /dev/null
+++ b/src/main/java/com/epam/ta/reportportal/model/dashboard/AddWidgetRq.java
@@ -0,0 +1,42 @@
+/*
+ * 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.ta.reportportal.model.dashboard;
+
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import javax.validation.Valid;
+import javax.validation.constraints.NotNull;
+
+/**
+ * @author Pavel Bortnik
+ */
+@JsonInclude(JsonInclude.Include.NON_NULL)
+public class AddWidgetRq {
+
+  @Valid
+  @NotNull
+  @JsonProperty(value = "addWidget")
+  private DashboardResource.WidgetObjectModel addWidget;
+
+  public DashboardResource.WidgetObjectModel getAddWidget() {
+    return addWidget;
+  }
+
+  public void setAddWidget(DashboardResource.WidgetObjectModel addWidget) {
+    this.addWidget = addWidget;
+  }
+}
diff --git a/src/main/java/com/epam/ta/reportportal/model/dashboard/CreateDashboardRQ.java b/src/main/java/com/epam/ta/reportportal/model/dashboard/CreateDashboardRQ.java
new file mode 100644
index 0000000000..f770456896
--- /dev/null
+++ b/src/main/java/com/epam/ta/reportportal/model/dashboard/CreateDashboardRQ.java
@@ -0,0 +1,57 @@
+/*
+ * 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.ta.reportportal.model.dashboard;
+
+import com.epam.ta.reportportal.model.BaseEntityRQ;
+import com.epam.ta.reportportal.ws.annotations.NotBlankWithSize;
+import com.epam.ta.reportportal.ws.model.ValidationConstraints;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonInclude.Include;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+
+/**
+ * Domain object for creating dashboards.
+ *
+ * @author Aliaksei_Makayed
+ */
+@JsonInclude(Include.NON_NULL)
+@ApiModel
+public class CreateDashboardRQ extends BaseEntityRQ {
+
+  @NotBlankWithSize(min = ValidationConstraints.MIN_NAME_LENGTH, max = ValidationConstraints.MAX_DASHBOARD_NAME_LENGTH)
+  @JsonProperty(value = "name", required = true)
+  @ApiModelProperty(required = true)
+  private String name;
+
+  public String getName() {
+    return name;
+  }
+
+  public void setName(String name) {
+    this.name = name;
+  }
+
+  @Override
+  public String toString() {
+    final StringBuilder sb = new StringBuilder("CreateDashboardRQ{");
+    sb.append("name='").append(name).append('\'');
+    sb.append('}');
+    return sb.toString();
+  }
+}
\ No newline at end of file
diff --git a/src/main/java/com/epam/ta/reportportal/model/dashboard/DashboardResource.java b/src/main/java/com/epam/ta/reportportal/model/dashboard/DashboardResource.java
new file mode 100644
index 0000000000..3c100a2e8e
--- /dev/null
+++ b/src/main/java/com/epam/ta/reportportal/model/dashboard/DashboardResource.java
@@ -0,0 +1,182 @@
+/*
+ * 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.ta.reportportal.model.dashboard;
+
+import com.epam.ta.reportportal.model.Position;
+import com.epam.ta.reportportal.ws.model.OwnedResource;
+import com.epam.ta.reportportal.ws.model.ValidationConstraints;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonInclude.Include;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import io.swagger.annotations.ApiModelProperty;
+import java.util.List;
+import java.util.Map;
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+import javax.validation.constraints.Size;
+
+/**
+ * Domain model DashBoard resource object. JSON Representation of Report Portal
+ * domain object.
+ *
+ * @author Aliaksei_Makayed
+ */
+@JsonInclude(Include.NON_NULL)
+public class DashboardResource extends OwnedResource {
+
+	@NotNull
+	@JsonProperty(value = "id", required = true)
+	@ApiModelProperty(required = true)
+	private Long dashboardId;
+
+	@NotBlank
+	@Size(min = ValidationConstraints.MIN_NAME_LENGTH, max = ValidationConstraints.MAX_DASHBOARD_NAME_LENGTH)
+	@JsonProperty(value = "name", required = true)
+	@ApiModelProperty(required = true)
+	private String name;
+
+	@JsonProperty(value = "widgets")
+	private List<WidgetObjectModel> widgets;
+
+	public Long getDashboardId() {
+		return dashboardId;
+	}
+
+	public void setDashboardId(Long dashboardId) {
+		this.dashboardId = dashboardId;
+	}
+
+	public String getName() {
+		return name;
+	}
+
+	public void setName(String name) {
+		this.name = name;
+	}
+
+	public List<WidgetObjectModel> getWidgets() {
+		return widgets;
+	}
+
+	public void setWidgets(List<WidgetObjectModel> widgets) {
+		this.widgets = widgets;
+	}
+
+	@JsonInclude(Include.NON_NULL)
+	public static class WidgetObjectModel {
+
+		@JsonProperty(value = "widgetName")
+		private String name;
+
+		@NotNull
+		@JsonProperty(value = "widgetId")
+		private Long widgetId;
+
+		@JsonProperty(value = "widgetType")
+		private String widgetType;
+
+		@JsonProperty(value = "widgetSize")
+		private com.epam.ta.reportportal.model.Size widgetSize = new com.epam.ta.reportportal.model.Size();
+
+		@JsonProperty(value = "widgetPosition")
+		private Position widgetPosition = new Position();
+
+		@JsonProperty(value = "widgetOptions")
+		private Map<String, Object> widgetOptions;
+
+		public WidgetObjectModel() {
+		}
+
+		public WidgetObjectModel(String name, Long widgetId, com.epam.ta.reportportal.model.Size widgetSize, Position widgetPosition) {
+			this.name = name;
+			this.widgetId = widgetId;
+			this.widgetSize = widgetSize;
+			this.widgetPosition = widgetPosition;
+		}
+
+		public Long getWidgetId() {
+			return widgetId;
+		}
+
+		public void setWidgetId(Long widgetId) {
+			this.widgetId = widgetId;
+		}
+
+		public String getWidgetType() {
+			return widgetType;
+		}
+
+		public void setWidgetType(String widgetType) {
+			this.widgetType = widgetType;
+		}
+
+		public String getName() {
+			return name;
+		}
+
+		public void setName(String name) {
+			this.name = name;
+		}
+
+		public com.epam.ta.reportportal.model.Size getWidgetSize() {
+			return widgetSize;
+		}
+
+		public void setWidgetSize(com.epam.ta.reportportal.model.Size widgetSize) {
+			this.widgetSize = widgetSize;
+		}
+
+		public Position getWidgetPosition() {
+			return widgetPosition;
+		}
+
+		public void setWidgetPosition(Position widgetPosition) {
+			this.widgetPosition = widgetPosition;
+		}
+
+		public Map<String, Object> getWidgetOptions() {
+			return widgetOptions;
+		}
+
+		public void setWidgetOptions(Map<String, Object> widgetOptions) {
+			this.widgetOptions = widgetOptions;
+		}
+
+		@Override
+		public String toString() {
+			final StringBuilder sb = new StringBuilder("WidgetObjectModel{");
+			sb.append("name='").append(name).append('\'');
+			sb.append(", widgetId=").append(widgetId);
+			sb.append(", widgetType='").append(widgetType).append('\'');
+			sb.append(", widgetSize=").append(widgetSize);
+			sb.append(", widgetPosition=").append(widgetPosition);
+			sb.append(", widgetOptions=").append(widgetOptions);
+			sb.append('}');
+			return sb.toString();
+		}
+	}
+
+	@Override
+	public String toString() {
+		final StringBuilder sb = new StringBuilder("DashboardResource{");
+		sb.append("dashboardId='").append(dashboardId).append('\'');
+		sb.append(", name='").append(name).append('\'');
+		sb.append(", widgets=").append(widgets);
+		sb.append('}');
+		return sb.toString();
+	}
+}
diff --git a/src/main/java/com/epam/ta/reportportal/model/dashboard/UpdateDashboardRQ.java b/src/main/java/com/epam/ta/reportportal/model/dashboard/UpdateDashboardRQ.java
new file mode 100644
index 0000000000..cea6643035
--- /dev/null
+++ b/src/main/java/com/epam/ta/reportportal/model/dashboard/UpdateDashboardRQ.java
@@ -0,0 +1,66 @@
+/*
+ * 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.ta.reportportal.model.dashboard;
+
+import com.epam.ta.reportportal.model.BaseEntityRQ;
+import com.epam.ta.reportportal.ws.annotations.NotBlankWithSize;
+import com.epam.ta.reportportal.ws.model.ValidationConstraints;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonInclude.Include;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import io.swagger.annotations.ApiModelProperty;
+import java.util.List;
+import javax.validation.Valid;
+
+/**
+ * Domain object for updating widget positions.
+ *
+ * @author Pavel Bortnik
+ */
+@JsonInclude(Include.NON_NULL)
+public class UpdateDashboardRQ extends BaseEntityRQ {
+
+	@NotBlankWithSize(min = ValidationConstraints.MIN_NAME_LENGTH, max = ValidationConstraints.MAX_DASHBOARD_NAME_LENGTH)
+	@JsonProperty(value = "name", required = true)
+	@ApiModelProperty(required = true)
+	private String name;
+
+	@Valid
+	@JsonProperty(value = "updateWidgets")
+	private List<DashboardResource.WidgetObjectModel> widgets;
+
+	public String getName() {
+		return name;
+	}
+
+	public void setName(String name) {
+		this.name = name;
+	}
+
+	public void setWidgets(List<DashboardResource.WidgetObjectModel> value) {
+		this.widgets = value;
+	}
+
+	public List<DashboardResource.WidgetObjectModel> getWidgets() {
+		return widgets;
+	}
+
+	@Override
+	public String toString() {
+		return "UpdateDashboardRQ{" + "name='" + name + '\'' + ", widgets=" + widgets + '}';
+	}
+}
\ No newline at end of file
diff --git a/src/main/java/com/epam/ta/reportportal/model/externalsystem/BtsConnectionTestRQ.java b/src/main/java/com/epam/ta/reportportal/model/externalsystem/BtsConnectionTestRQ.java
new file mode 100644
index 0000000000..8432bb86cd
--- /dev/null
+++ b/src/main/java/com/epam/ta/reportportal/model/externalsystem/BtsConnectionTestRQ.java
@@ -0,0 +1,52 @@
+/*
+ * 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.ta.reportportal.model.externalsystem;
+
+import com.fasterxml.jackson.annotation.JsonInclude;
+import javax.validation.constraints.NotBlank;
+
+/**
+ * @author <a href="mailto:ivan_budayeu@epam.com">Ivan Budayeu</a>
+ */
+@JsonInclude(JsonInclude.Include.NON_NULL)
+public class BtsConnectionTestRQ {
+
+	@NotBlank
+	private String url;
+
+	@NotBlank
+	private String btsProject;
+
+	public BtsConnectionTestRQ() {
+	}
+
+	public String getUrl() {
+		return url;
+	}
+
+	public void setUrl(String url) {
+		this.url = url;
+	}
+
+	public String getBtsProject() {
+		return btsProject;
+	}
+
+	public void setBtsProject(String btsProject) {
+		this.btsProject = btsProject;
+	}
+}
diff --git a/src/main/java/com/epam/ta/reportportal/model/externalsystem/UpdateBugTrackingSystemRQ.java b/src/main/java/com/epam/ta/reportportal/model/externalsystem/UpdateBugTrackingSystemRQ.java
new file mode 100644
index 0000000000..a4e50707c2
--- /dev/null
+++ b/src/main/java/com/epam/ta/reportportal/model/externalsystem/UpdateBugTrackingSystemRQ.java
@@ -0,0 +1,43 @@
+/*
+ * 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.ta.reportportal.model.externalsystem;
+
+import com.epam.ta.reportportal.ws.model.externalsystem.PostFormField;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonInclude.Include;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import java.util.List;
+
+/**
+ * Request model for external system update
+ *
+ * @author Andrei_Ramanchuk
+ */
+@JsonInclude(Include.NON_NULL)
+public class UpdateBugTrackingSystemRQ {
+
+	@JsonProperty(value = "fields")
+	private List<PostFormField> fields;
+
+	public void setFields(List<PostFormField> form) {
+		this.fields = form;
+	}
+
+	public List<PostFormField> getFields() {
+		return fields;
+	}
+}
\ No newline at end of file
diff --git a/src/main/java/com/epam/ta/reportportal/model/filter/BulkUpdateFilterRQ.java b/src/main/java/com/epam/ta/reportportal/model/filter/BulkUpdateFilterRQ.java
new file mode 100644
index 0000000000..8e7df6bf70
--- /dev/null
+++ b/src/main/java/com/epam/ta/reportportal/model/filter/BulkUpdateFilterRQ.java
@@ -0,0 +1,47 @@
+/*
+ * 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.ta.reportportal.model.filter;
+
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import javax.validation.constraints.NotBlank;
+
+/**
+ * @deprecated use {@link UpdateUserFilterRQ} in conjunction with
+ * {@link com.epam.ta.reportportal.model.BulkRQ}
+ */
+@Deprecated
+@JsonInclude(JsonInclude.Include.NON_NULL)
+public class BulkUpdateFilterRQ extends UpdateUserFilterRQ {
+
+  @NotBlank
+  @JsonProperty(value = "id")
+  private String id;
+
+  public String getId() {
+    return id;
+  }
+
+  public void setId(String id) {
+    this.id = id;
+  }
+
+  @Override
+  public String toString() {
+    return "BulkUpdateFilterRQ{" + "id='" + id + '\'' + '}';
+  }
+}
\ No newline at end of file
diff --git a/src/main/java/com/epam/ta/reportportal/model/filter/Order.java b/src/main/java/com/epam/ta/reportportal/model/filter/Order.java
new file mode 100644
index 0000000000..e18ca361d8
--- /dev/null
+++ b/src/main/java/com/epam/ta/reportportal/model/filter/Order.java
@@ -0,0 +1,80 @@
+/*
+ * 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.ta.reportportal.model.filter;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+import javax.validation.constraints.NotNull;
+
+/**
+ * @author Pavel Bortnik
+ */
+public class Order {
+
+	@NotNull
+	@JsonProperty(value = "sortingColumn", required = true)
+	private String sortingColumnName;
+
+	@NotNull
+	@JsonProperty(value = "isAsc", required = true)
+	private boolean isAsc;
+
+	public String getSortingColumnName() {
+		return sortingColumnName;
+	}
+
+	public void setSortingColumnName(String sortingColumnName) {
+		this.sortingColumnName = sortingColumnName;
+	}
+
+	public boolean getIsAsc() {
+		return isAsc;
+	}
+
+	public void setIsAsc(boolean isAsc) {
+		this.isAsc = isAsc;
+	}
+
+	@Override
+	public boolean equals(Object o) {
+		if (this == o) {
+			return true;
+		}
+		if (o == null || getClass() != o.getClass()) {
+			return false;
+		}
+
+		Order order = (Order) o;
+
+		if (isAsc != order.isAsc) {
+			return false;
+		}
+		return sortingColumnName != null ? sortingColumnName.equals(order.sortingColumnName) : order.sortingColumnName == null;
+	}
+
+	@Override
+	public int hashCode() {
+		int result = sortingColumnName != null ? sortingColumnName.hashCode() : 0;
+		result = 31 * result + (isAsc ? 1 : 0);
+		return result;
+	}
+
+	@Override
+	public String toString() {
+		return "Order{" + "sortingColumnName='" + sortingColumnName + '\'' + ", isAsc=" + isAsc + '}';
+	}
+}
diff --git a/src/main/java/com/epam/ta/reportportal/model/filter/UpdateUserFilterRQ.java b/src/main/java/com/epam/ta/reportportal/model/filter/UpdateUserFilterRQ.java
new file mode 100644
index 0000000000..bb2f2905e1
--- /dev/null
+++ b/src/main/java/com/epam/ta/reportportal/model/filter/UpdateUserFilterRQ.java
@@ -0,0 +1,112 @@
+/*
+ * 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.ta.reportportal.model.filter;
+
+import static com.epam.ta.reportportal.ws.model.ValidationConstraints.MAX_NUMBER_OF_FILTER_ENTITIES;
+import static com.epam.ta.reportportal.ws.model.ValidationConstraints.MAX_USER_FILTER_NAME_LENGTH;
+import static com.epam.ta.reportportal.ws.model.ValidationConstraints.MIN_COLLECTION_SIZE;
+import static com.epam.ta.reportportal.ws.model.ValidationConstraints.MIN_NAME_LENGTH;
+
+import com.epam.ta.reportportal.model.BaseEntityRQ;
+import com.epam.ta.reportportal.ws.annotations.In;
+import com.epam.ta.reportportal.ws.annotations.NotBlankWithSize;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonInclude.Include;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
+import io.swagger.annotations.ApiModelProperty;
+import java.util.LinkedHashSet;
+import java.util.List;
+import java.util.Set;
+import javax.validation.Valid;
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+import javax.validation.constraints.Size;
+
+/**
+ * Domain object for filter actions
+ *
+ * @author Aliaksei_Makayed
+ */
+@JsonInclude(Include.NON_NULL)
+public class UpdateUserFilterRQ extends BaseEntityRQ {
+
+  @NotBlankWithSize(min = MIN_NAME_LENGTH, max = MAX_USER_FILTER_NAME_LENGTH)
+  @JsonProperty(value = "name", required = true)
+  @ApiModelProperty(required = true)
+  private String name;
+
+  @NotBlank
+  @JsonProperty(value = "type", required = true)
+  @In(allowedValues = { "launch", "testItem", "log" })
+  @ApiModelProperty(required = true, allowableValues = "launch, testitem, log")
+  private String objectType;
+
+  @Valid
+  @NotNull
+  @Size(min = MIN_COLLECTION_SIZE, max = MAX_NUMBER_OF_FILTER_ENTITIES)
+  @JsonProperty(value = "conditions", required = true)
+  @JsonDeserialize(as = LinkedHashSet.class)
+  @ApiModelProperty(required = true)
+  private Set<UserFilterCondition> conditions;
+
+  @Valid
+  @NotNull
+  @Size(min = MIN_COLLECTION_SIZE)
+  @JsonProperty(value = "orders", required = true)
+  @ApiModelProperty(required = true)
+  private List<Order> orders;
+
+  public String getName() {
+    return name;
+  }
+
+  public void setName(String name) {
+    this.name = name;
+  }
+
+  @NotNull
+  public Set<UserFilterCondition> getConditions() {
+    return conditions;
+  }
+
+  public void setConditions(@NotNull Set<UserFilterCondition> conditions) {
+    this.conditions = conditions;
+  }
+
+  public String getObjectType() {
+    return objectType;
+  }
+
+  public void setObjectType(String objectType) {
+    this.objectType = objectType;
+  }
+
+  public List<Order> getOrders() {
+    return orders;
+  }
+
+  public void setOrders(List<Order> orders) {
+    this.orders = orders;
+  }
+
+  @Override
+  public String toString() {
+    return "UpdateUserFilterRQ{" + "name='" + name + '\'' + ", objectType='" + objectType + '\''
+        + ", conditions=" + conditions + ", orders=" + orders + '}';
+  }
+}
\ No newline at end of file
diff --git a/src/main/java/com/epam/ta/reportportal/model/filter/UserFilterCondition.java b/src/main/java/com/epam/ta/reportportal/model/filter/UserFilterCondition.java
new file mode 100644
index 0000000000..187915929d
--- /dev/null
+++ b/src/main/java/com/epam/ta/reportportal/model/filter/UserFilterCondition.java
@@ -0,0 +1,134 @@
+/*
+ * 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.ta.reportportal.model.filter;
+
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonInclude.Include;
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+import javax.validation.constraints.NotBlank;
+
+/**
+ * Filter entity domain model object.
+ *
+ * @author Aliaksei_Makayed
+ * @author Andrei_Ramanchuk
+ */
+@JsonInclude(Include.NON_NULL)
+public class UserFilterCondition {
+
+	@NotBlank
+	@JsonProperty(value = "filteringField", required = true)
+	private String filteringField;
+
+	@NotBlank
+	@JsonProperty(value = "condition", required = true)
+	private String condition;
+
+	@NotBlank
+	@JsonProperty(value = "value", required = true)
+	private String value;
+
+	public UserFilterCondition() {
+	}
+
+	public UserFilterCondition(String field, String condition, String value) {
+		this.filteringField = field;
+		this.condition = condition;
+		this.value = value;
+	}
+
+	public String getCondition() {
+		return condition;
+	}
+
+	public void setCondition(String condition) {
+		this.condition = condition;
+	}
+
+	public String getValue() {
+		return value;
+	}
+
+	public void setValue(String value) {
+		this.value = value;
+	}
+
+	public String getFilteringField() {
+		return filteringField;
+	}
+
+	public void setFilteringField(String filteringField) {
+		this.filteringField = filteringField;
+	}
+
+	@Override
+	public int hashCode() {
+		final int prime = 31;
+		int result = 1;
+		result = prime * result + ((condition == null) ? 0 : condition.hashCode());
+		result = prime * result + ((filteringField == null) ? 0 : filteringField.hashCode());
+		result = prime * result + ((value == null) ? 0 : value.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;
+		}
+		UserFilterCondition other = (UserFilterCondition) obj;
+		if (condition == null) {
+			if (other.condition != null) {
+				return false;
+			}
+		} else if (!condition.equals(other.condition)) {
+			return false;
+		}
+		if (filteringField == null) {
+			if (other.filteringField != null) {
+				return false;
+			}
+		} else if (!filteringField.equals(other.filteringField)) {
+			return false;
+		}
+		if (value == null) {
+			if (other.value != null) {
+				return false;
+			}
+		} else if (!value.equals(other.value)) {
+			return false;
+		}
+		return true;
+	}
+
+	@Override
+	public String toString() {
+		final StringBuilder sb = new StringBuilder("UserFilterEntity{");
+		sb.append("filteringField='").append(filteringField).append('\'');
+		sb.append(", condition='").append(condition).append('\'');
+		sb.append(", value='").append(value).append('\'');
+		sb.append('}');
+		return sb.toString();
+	}
+}
\ No newline at end of file
diff --git a/src/main/java/com/epam/ta/reportportal/model/filter/UserFilterResource.java b/src/main/java/com/epam/ta/reportportal/model/filter/UserFilterResource.java
new file mode 100644
index 0000000000..64f7e1fe7c
--- /dev/null
+++ b/src/main/java/com/epam/ta/reportportal/model/filter/UserFilterResource.java
@@ -0,0 +1,126 @@
+/*
+ * 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.ta.reportportal.model.filter;
+
+import static com.epam.ta.reportportal.ws.model.ValidationConstraints.MAX_USER_FILTER_NAME_LENGTH;
+import static com.epam.ta.reportportal.ws.model.ValidationConstraints.MIN_COLLECTION_SIZE;
+import static com.epam.ta.reportportal.ws.model.ValidationConstraints.MIN_NAME_LENGTH;
+
+import com.epam.ta.reportportal.ws.annotations.In;
+import com.epam.ta.reportportal.ws.model.OwnedResource;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonInclude.Include;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import java.util.List;
+import java.util.Set;
+import javax.validation.Valid;
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+import javax.validation.constraints.Size;
+
+/**
+ * JSON Representation of Report Portal's UserFilter domain object
+ *
+ * @author Aliaksei_Makayed
+ */
+
+@JsonInclude(Include.NON_NULL)
+public class UserFilterResource extends OwnedResource {
+
+  @NotNull
+  @JsonProperty(value = "id", required = true)
+  private Long filterId;
+
+  @NotBlank
+  @Size(min = MIN_NAME_LENGTH, max = MAX_USER_FILTER_NAME_LENGTH)
+  @JsonProperty(value = "name", required = true)
+  private String name;
+
+  @Valid
+  @NotNull
+  @Size(min = MIN_COLLECTION_SIZE)
+  @JsonProperty(value = "conditions", required = true)
+  private Set<UserFilterCondition> conditions;
+
+  @Size(min = MIN_COLLECTION_SIZE)
+  @JsonProperty(value = "orders", required = true)
+  private List<Order> orders;
+
+  @In(allowedValues = { "launch", "testItem", "log" })
+  @NotNull
+  @JsonProperty(value = "type", required = true)
+  private String objectType;
+
+  @NotNull
+  @JsonProperty(value = "owner", required = true)
+  private String owner;
+
+  public String getOwner() {
+    return owner;
+  }
+
+  public void setOwner(String owner) {
+    this.owner = owner;
+  }
+
+  public String getName() {
+    return name;
+  }
+
+  public void setName(String name) {
+    this.name = name;
+  }
+
+  public Set<UserFilterCondition> getConditions() {
+    return conditions;
+  }
+
+  public void setConditions(Set<UserFilterCondition> conditions) {
+    this.conditions = conditions;
+  }
+
+  public List<Order> getOrders() {
+    return orders;
+  }
+
+  public void setOrders(List<Order> orders) {
+    this.orders = orders;
+  }
+
+  public Long getFilterId() {
+    return filterId;
+  }
+
+  public void setFilterId(Long filterId) {
+    this.filterId = filterId;
+  }
+
+  public String getObjectType() {
+    return objectType;
+  }
+
+  public void setObjectType(String objectType) {
+    this.objectType = objectType;
+  }
+
+  @Override
+  public String toString() {
+    return "UserFilterResource{" + "filterId='" + filterId + '\'' + ", name='" + name + '\''
+        + ", conditions=" + conditions + ", orders=" + orders + ", objectType='" + objectType + '\''
+        + ", owner='" + owner + '\'' + "} " + super.toString();
+  }
+}
diff --git a/src/main/java/com/epam/ta/reportportal/model/integration/AuthFlowEnum.java b/src/main/java/com/epam/ta/reportportal/model/integration/AuthFlowEnum.java
new file mode 100644
index 0000000000..157235ecee
--- /dev/null
+++ b/src/main/java/com/epam/ta/reportportal/model/integration/AuthFlowEnum.java
@@ -0,0 +1,28 @@
+/*
+ * 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.ta.reportportal.model.integration;
+
+/**
+ * @author Pavel Bortnik
+ */
+public enum AuthFlowEnum {
+	OAUTH,
+	BASIC,
+	TOKEN,
+	FORM,
+	LDAP
+}
diff --git a/src/main/java/com/epam/ta/reportportal/model/integration/CreateIntegrationRQ.java b/src/main/java/com/epam/ta/reportportal/model/integration/CreateIntegrationRQ.java
new file mode 100644
index 0000000000..5ca4cc7c05
--- /dev/null
+++ b/src/main/java/com/epam/ta/reportportal/model/integration/CreateIntegrationRQ.java
@@ -0,0 +1 @@
+package com.epam.ta.reportportal.model.integration;
\ No newline at end of file
diff --git a/src/main/java/com/epam/ta/reportportal/model/integration/IntegrationRQ.java b/src/main/java/com/epam/ta/reportportal/model/integration/IntegrationRQ.java
new file mode 100644
index 0000000000..4455341b85
--- /dev/null
+++ b/src/main/java/com/epam/ta/reportportal/model/integration/IntegrationRQ.java
@@ -0,0 +1,61 @@
+/*
+ * 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.ta.reportportal.model.integration;
+
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import java.util.Map;
+
+/**
+ * @author <a href="mailto:pavel_bortnik@epam.com">Pavel Bortnik</a>
+ */
+@JsonInclude(JsonInclude.Include.NON_NULL)
+public class IntegrationRQ {
+
+	@JsonProperty("name")
+	private String name;
+
+	@JsonProperty("integrationParameters")
+	private Map<String, Object> integrationParams;
+
+	@JsonProperty("enabled")
+	private Boolean enabled;
+
+	public String getName() {
+		return name;
+	}
+
+	public void setName(String name) {
+		this.name = name;
+	}
+
+	public Map<String, Object> getIntegrationParams() {
+		return integrationParams;
+	}
+
+	public void setIntegrationParams(Map<String, Object> integrationParams) {
+		this.integrationParams = integrationParams;
+	}
+
+	public Boolean getEnabled() {
+		return enabled;
+	}
+
+	public void setEnabled(Boolean enabled) {
+		this.enabled = enabled;
+	}
+}
diff --git a/src/main/java/com/epam/ta/reportportal/model/integration/IntegrationResource.java b/src/main/java/com/epam/ta/reportportal/model/integration/IntegrationResource.java
new file mode 100644
index 0000000000..79840b6611
--- /dev/null
+++ b/src/main/java/com/epam/ta/reportportal/model/integration/IntegrationResource.java
@@ -0,0 +1,118 @@
+/*
+ * Copyright 2021 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.ta.reportportal.model.integration;
+
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import java.io.Serializable;
+import java.util.Date;
+import java.util.Map;
+
+/**
+ * @author Pavel Bortnik
+ */
+@JsonInclude(JsonInclude.Include.NON_NULL)
+public class IntegrationResource implements Serializable {
+
+	@JsonProperty("id")
+	private Long id;
+
+	@JsonProperty("projectId")
+	private Long projectId;
+
+	@JsonProperty("name")
+	private String name;
+
+	@JsonProperty("integrationType")
+	private IntegrationTypeResource integrationType;
+
+	@JsonProperty("integrationParameters")
+	private Map<String, Object> integrationParams;
+
+	@JsonProperty("enabled")
+	private Boolean enabled;
+
+	@JsonProperty("creator")
+	private String creator;
+
+	@JsonProperty("creationDate")
+	private Date creationDate;
+
+	public Long getId() {
+		return id;
+	}
+
+	public void setId(Long id) {
+		this.id = id;
+	}
+
+	public Long getProjectId() {
+		return projectId;
+	}
+
+	public void setProjectId(Long projectId) {
+		this.projectId = projectId;
+	}
+
+	public String getName() {
+		return name;
+	}
+
+	public void setName(String name) {
+		this.name = name;
+	}
+
+	public IntegrationTypeResource getIntegrationType() {
+		return integrationType;
+	}
+
+	public void setIntegrationType(IntegrationTypeResource integrationType) {
+		this.integrationType = integrationType;
+	}
+
+	public Map<String, Object> getIntegrationParams() {
+		return integrationParams;
+	}
+
+	public void setIntegrationParams(Map<String, Object> integrationParams) {
+		this.integrationParams = integrationParams;
+	}
+
+	public Boolean getEnabled() {
+		return enabled;
+	}
+
+	public void setEnabled(Boolean enabled) {
+		this.enabled = enabled;
+	}
+
+	public String getCreator() {
+		return creator;
+	}
+
+	public void setCreator(String creator) {
+		this.creator = creator;
+	}
+
+	public Date getCreationDate() {
+		return creationDate;
+	}
+
+	public void setCreationDate(Date creationDate) {
+		this.creationDate = creationDate;
+	}
+}
diff --git a/src/main/java/com/epam/ta/reportportal/model/integration/IntegrationTypeResource.java b/src/main/java/com/epam/ta/reportportal/model/integration/IntegrationTypeResource.java
new file mode 100644
index 0000000000..dbecced8de
--- /dev/null
+++ b/src/main/java/com/epam/ta/reportportal/model/integration/IntegrationTypeResource.java
@@ -0,0 +1,108 @@
+/*
+ * 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.ta.reportportal.model.integration;
+
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import java.io.Serializable;
+import java.util.Date;
+import java.util.Map;
+
+/**
+ * @author Pavel Bortnik
+ */
+@JsonInclude(JsonInclude.Include.NON_NULL)
+public class IntegrationTypeResource implements Serializable {
+
+	@JsonProperty("type")
+	private Long id;
+
+	@JsonProperty("name")
+	private String name;
+
+	@JsonProperty("enabled")
+	private boolean enabled;
+
+	@JsonProperty("authFlow")
+	private AuthFlowEnum authFlow;
+
+	@JsonProperty("creationDate")
+	private Date creationDate;
+
+	@JsonProperty("groupType")
+	private String groupType;
+
+	@JsonProperty("details")
+	private Map<String, Object> details;
+
+	public Long getId() {
+		return id;
+	}
+
+	public void setId(Long id) {
+		this.id = id;
+	}
+
+	public String getName() {
+		return name;
+	}
+
+	public void setName(String name) {
+		this.name = name;
+	}
+
+	@JsonProperty("enabled")
+	public boolean isEnabled() {
+		return enabled;
+	}
+
+	public void setEnabled(boolean enabled) {
+		this.enabled = enabled;
+	}
+
+	public AuthFlowEnum getAuthFlow() {
+		return authFlow;
+	}
+
+	public void setAuthFlow(AuthFlowEnum authFlow) {
+		this.authFlow = authFlow;
+	}
+
+	public Date getCreationDate() {
+		return creationDate;
+	}
+
+	public void setCreationDate(Date creationDate) {
+		this.creationDate = creationDate;
+	}
+
+	public String getGroupType() {
+		return groupType;
+	}
+
+	public void setGroupType(String groupType) {
+		this.groupType = groupType;
+	}
+
+	public Map<String, Object> getDetails() {
+		return details;
+	}
+
+	public void setDetails(Map<String, Object> details) {
+		this.details = details;
+	}
+}
diff --git a/src/main/java/com/epam/ta/reportportal/model/integration/UpdatePluginStateRQ.java b/src/main/java/com/epam/ta/reportportal/model/integration/UpdatePluginStateRQ.java
new file mode 100644
index 0000000000..3b81382bba
--- /dev/null
+++ b/src/main/java/com/epam/ta/reportportal/model/integration/UpdatePluginStateRQ.java
@@ -0,0 +1,61 @@
+/*
+ * 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.ta.reportportal.model.integration;
+
+import com.fasterxml.jackson.annotation.JsonInclude;
+import java.io.Serializable;
+import javax.validation.constraints.NotNull;
+
+/**
+ * @author <a href="mailto:ivan_budayeu@epam.com">Ivan Budayeu</a>
+ */
+@JsonInclude(JsonInclude.Include.NON_NULL)
+public class UpdatePluginStateRQ implements Serializable {
+
+	@NotNull
+	private Boolean isEnabled;
+
+	public UpdatePluginStateRQ() {
+	}
+
+	public Boolean getEnabled() {
+		return isEnabled;
+	}
+
+	public void setEnabled(Boolean enabled) {
+		isEnabled = enabled;
+	}
+
+	@Override
+	public boolean equals(Object o) {
+		if (this == o) {
+			return true;
+		}
+		if (o == null || getClass() != o.getClass()) {
+			return false;
+		}
+
+		UpdatePluginStateRQ that = (UpdatePluginStateRQ) o;
+
+		return isEnabled != null ? isEnabled.equals(that.isEnabled) : that.isEnabled == null;
+	}
+
+	@Override
+	public int hashCode() {
+		return isEnabled != null ? isEnabled.hashCode() : 0;
+	}
+}
diff --git a/src/main/java/com/epam/ta/reportportal/model/issue/DefineIssueRQ.java b/src/main/java/com/epam/ta/reportportal/model/issue/DefineIssueRQ.java
new file mode 100644
index 0000000000..6fa0266ffd
--- /dev/null
+++ b/src/main/java/com/epam/ta/reportportal/model/issue/DefineIssueRQ.java
@@ -0,0 +1,56 @@
+/*
+ * 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.ta.reportportal.model.issue;
+
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonInclude.Include;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import java.util.List;
+import javax.validation.Valid;
+import javax.validation.constraints.NotNull;
+import javax.validation.constraints.Size;
+
+/**
+ * Request for test items issue types definition (defect block)
+ *
+ * @author Dzianis Shlychkou
+ */
+@JsonInclude(Include.NON_NULL)
+public class DefineIssueRQ {
+
+  @NotNull
+  @Valid
+  @Size(max = 300)
+  @JsonProperty(value = "issues", required = true)
+  private List<IssueDefinition> issues;
+
+  public List<IssueDefinition> getIssues() {
+    return issues;
+  }
+
+  public void setIssues(List<IssueDefinition> issues) {
+    this.issues = issues;
+  }
+
+  @Override
+  public String toString() {
+    final StringBuilder sb = new StringBuilder("DefineIssueRQ{");
+    sb.append("issues=").append(issues);
+    sb.append('}');
+    return sb.toString();
+  }
+}
\ No newline at end of file
diff --git a/src/main/java/com/epam/ta/reportportal/model/issue/IssueDefinition.java b/src/main/java/com/epam/ta/reportportal/model/issue/IssueDefinition.java
new file mode 100644
index 0000000000..c02a8c4ab4
--- /dev/null
+++ b/src/main/java/com/epam/ta/reportportal/model/issue/IssueDefinition.java
@@ -0,0 +1,66 @@
+/*
+ * 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.ta.reportportal.model.issue;
+
+import com.epam.ta.reportportal.ws.model.issue.Issue;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonInclude.Include;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import io.swagger.annotations.ApiModelProperty;
+import javax.validation.Valid;
+import javax.validation.constraints.NotNull;
+
+/**
+ * Test item issue with provided it
+ * 
+ * @author Dzianis Shlychkou
+ * 
+ */
+@JsonInclude(Include.NON_NULL)
+public class IssueDefinition {
+
+	@NotNull
+	@JsonProperty(value = "testItemId", required = true)
+	@ApiModelProperty(required = true)
+	private Long id;
+
+	@NotNull
+	@Valid
+	@JsonProperty(value = "issue", required = true)
+	private Issue issue;
+
+	public Long getId() {
+		return id;
+	}
+
+	public void setId(Long id) {
+		this.id = id;
+	}
+
+	public Issue getIssue() {
+		return issue;
+	}
+
+	public void setIssue(Issue issue) {
+		this.issue = issue;
+	}
+
+	@Override
+	public String toString() {
+		return "IssueDefinition{" + "id=" + id + ", issue=" + issue + '}';
+	}
+}
\ No newline at end of file
diff --git a/src/main/java/com/epam/ta/reportportal/model/item/ExternalIssueRQ.java b/src/main/java/com/epam/ta/reportportal/model/item/ExternalIssueRQ.java
new file mode 100644
index 0000000000..6672a2ca49
--- /dev/null
+++ b/src/main/java/com/epam/ta/reportportal/model/item/ExternalIssueRQ.java
@@ -0,0 +1,43 @@
+/*
+ * 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.ta.reportportal.model.item;
+
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import java.util.List;
+import javax.validation.constraints.NotEmpty;
+import javax.validation.constraints.Size;
+
+/**
+ * @author <a href="mailto:ihar_kahadouski@epam.com">Ihar Kahadouski</a>
+ */
+@JsonInclude(JsonInclude.Include.NON_NULL)
+public abstract class ExternalIssueRQ {
+
+	@NotEmpty
+	@Size(max = 300)
+	@JsonProperty(value = "testItemIds")
+	private List<Long> testItemIds;
+
+	public List<Long> getTestItemIds() {
+		return testItemIds;
+	}
+
+	public void setTestItemIds(List<Long> testItemIds) {
+		this.testItemIds = testItemIds;
+	}
+}
diff --git a/src/main/java/com/epam/ta/reportportal/model/item/LinkExternalIssueRQ.java b/src/main/java/com/epam/ta/reportportal/model/item/LinkExternalIssueRQ.java
new file mode 100644
index 0000000000..7b82954281
--- /dev/null
+++ b/src/main/java/com/epam/ta/reportportal/model/item/LinkExternalIssueRQ.java
@@ -0,0 +1,56 @@
+/*
+ * 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.ta.reportportal.model.item;
+
+import com.epam.ta.reportportal.ws.model.issue.Issue;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import io.swagger.annotations.ApiModelProperty;
+import java.util.List;
+import javax.validation.Valid;
+import javax.validation.constraints.NotEmpty;
+import javax.validation.constraints.Size;
+
+/**
+ * Request model for add link to external system issue
+ *
+ * @author Dzmitry_Kavalets
+ * @author Andrei_Ramanchuk
+ */
+@JsonInclude(JsonInclude.Include.NON_NULL)
+public class LinkExternalIssueRQ extends ExternalIssueRQ {
+
+  @NotEmpty
+  @Valid
+  @Size(max = 300)
+  @JsonProperty(value = "issues")
+  @ApiModelProperty(reference = "Issue.ExternalSystemIssue")
+  private List<Issue.ExternalSystemIssue> issues;
+
+  public void setIssues(List<Issue.ExternalSystemIssue> values) {
+    this.issues = values;
+  }
+
+  public List<Issue.ExternalSystemIssue> getIssues() {
+    return issues;
+  }
+
+  @Override
+  public String toString() {
+    return "LinkExternalIssueRQ{" + "issues=" + issues + '}';
+  }
+}
\ No newline at end of file
diff --git a/src/main/java/com/epam/ta/reportportal/model/item/UnlinkExternalIssueRQ.java b/src/main/java/com/epam/ta/reportportal/model/item/UnlinkExternalIssueRQ.java
new file mode 100644
index 0000000000..e954a5f22c
--- /dev/null
+++ b/src/main/java/com/epam/ta/reportportal/model/item/UnlinkExternalIssueRQ.java
@@ -0,0 +1,55 @@
+/*
+ * 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.ta.reportportal.model.item;
+
+import com.epam.ta.reportportal.ws.annotations.NotBlankStringCollection;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import java.util.List;
+import javax.validation.Valid;
+import javax.validation.constraints.NotEmpty;
+import javax.validation.constraints.Size;
+
+/**
+ * @author Pavel Bortnik
+ */
+@JsonInclude(JsonInclude.Include.NON_NULL)
+public class UnlinkExternalIssueRQ extends ExternalIssueRQ {
+
+  @Valid
+  @NotEmpty
+  @NotBlankStringCollection
+  @Size(max = 300)
+  @JsonProperty(value = "ticketIds")
+  private List<String> ticketIds;
+
+  public List<String> getTicketIds() {
+    return ticketIds;
+  }
+
+  public void setTicketIds(List<String> ticketIds) {
+    this.ticketIds = ticketIds;
+  }
+
+  @Override
+  public String toString() {
+    final StringBuilder sb = new StringBuilder("UnlinkExternalIssueRQ{");
+    sb.append("ticketIds=").append(ticketIds);
+    sb.append('}');
+    return sb.toString();
+  }
+}
diff --git a/src/main/java/com/epam/ta/reportportal/model/item/UpdateTestItemRQ.java b/src/main/java/com/epam/ta/reportportal/model/item/UpdateTestItemRQ.java
new file mode 100644
index 0000000000..0a1fdce5bd
--- /dev/null
+++ b/src/main/java/com/epam/ta/reportportal/model/item/UpdateTestItemRQ.java
@@ -0,0 +1,68 @@
+/*
+ * 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.ta.reportportal.model.item;
+
+import static com.epam.ta.reportportal.ws.model.ValidationConstraints.MAX_PARAMETERS_LENGTH;
+
+import com.epam.ta.reportportal.ws.model.attribute.ItemAttributeResource;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import java.util.Set;
+import javax.validation.Valid;
+import javax.validation.constraints.Size;
+
+/**
+ * @author Dzmitry_Kavalets
+ */
+@JsonInclude(JsonInclude.Include.NON_NULL)
+public class UpdateTestItemRQ {
+
+	@Size(max = MAX_PARAMETERS_LENGTH)
+	@Valid
+	@JsonProperty(value = "attributes")
+	private Set<ItemAttributeResource> attributes;
+
+	@JsonProperty(value = "description")
+	private String description;
+
+	@JsonProperty(value = "status")
+	private String status;
+
+	public Set<ItemAttributeResource> getAttributes() {
+		return attributes;
+	}
+
+	public void setAttributes(Set<ItemAttributeResource> attributes) {
+		this.attributes = attributes;
+	}
+
+	public String getDescription() {
+		return description;
+	}
+
+	public void setDescription(String description) {
+		this.description = description;
+	}
+
+	public String getStatus() {
+		return status;
+	}
+
+	public void setStatus(String status) {
+		this.status = status;
+	}
+}
\ No newline at end of file
diff --git a/src/main/java/com/epam/ta/reportportal/model/launch/AnalyzeLaunchRQ.java b/src/main/java/com/epam/ta/reportportal/model/launch/AnalyzeLaunchRQ.java
new file mode 100644
index 0000000000..849110b763
--- /dev/null
+++ b/src/main/java/com/epam/ta/reportportal/model/launch/AnalyzeLaunchRQ.java
@@ -0,0 +1,86 @@
+/*
+ * 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.ta.reportportal.model.launch;
+
+import com.epam.ta.reportportal.ws.annotations.In;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import io.swagger.annotations.ApiModelProperty;
+import java.util.List;
+import javax.validation.constraints.NotNull;
+
+/**
+ * @author <a href="mailto:pavel_bortnik@epam.com">Pavel Bortnik</a>
+ */
+@JsonInclude(JsonInclude.Include.NON_NULL)
+public class AnalyzeLaunchRQ {
+
+	@NotNull
+	@JsonProperty(value = "launchId", required = true)
+	@ApiModelProperty
+	private Long launchId;
+
+	@NotNull
+	@JsonProperty(value = "analyzerMode", required = true)
+	@In(allowedValues = { "all", "launch_name", "current_launch", "previous_launch", "current_and_the_same_name" })
+	@ApiModelProperty(allowableValues = "ALL, LAUNCH_NAME, CURRENT_LAUNCH, PREVIOUS_LAUNCH, CURRENT_AND_THE_SAME_NAME")
+	private String analyzerHistoryMode;
+
+	@NotNull
+	@JsonProperty(value = "analyzerTypeName", required = true)
+	@In(allowedValues = { "autoAnalyzer", "patternAnalyzer" })
+	@ApiModelProperty(allowableValues = "autoAnalyzer, patternAnalyzer")
+	private String analyzerTypeName;
+
+	@NotNull
+	@JsonProperty(value = "analyzeItemsMode", required = true)
+	@In(allowedValues = { "to_investigate", "auto_analyzed", "manually_analyzed" })
+	@ApiModelProperty(allowableValues = "TO_INVESTIGATE, AUTO_ANALYZED, MANUALLY_ANALYZED")
+	private List<String> analyzeItemsModes;
+
+	public Long getLaunchId() {
+		return launchId;
+	}
+
+	public void setLaunchId(Long launchId) {
+		this.launchId = launchId;
+	}
+
+	public String getAnalyzerHistoryMode() {
+		return analyzerHistoryMode;
+	}
+
+	public String getAnalyzerTypeName() {
+		return analyzerTypeName;
+	}
+
+	public void setAnalyzerTypeName(String analyzerTypeName) {
+		this.analyzerTypeName = analyzerTypeName;
+	}
+
+	public void setAnalyzerHistoryMode(String analyzerHistoryMode) {
+		this.analyzerHistoryMode = analyzerHistoryMode;
+	}
+
+	public List<String> getAnalyzeItemsModes() {
+		return analyzeItemsModes;
+	}
+
+	public void setAnalyzeItemsModes(List<String> analyzeItemsModes) {
+		this.analyzeItemsModes = analyzeItemsModes;
+	}
+}
diff --git a/src/main/java/com/epam/ta/reportportal/model/launch/FinishLaunchRS.java b/src/main/java/com/epam/ta/reportportal/model/launch/FinishLaunchRS.java
new file mode 100644
index 0000000000..2125956a9a
--- /dev/null
+++ b/src/main/java/com/epam/ta/reportportal/model/launch/FinishLaunchRS.java
@@ -0,0 +1,69 @@
+/*
+ * 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.ta.reportportal.model.launch;
+
+import com.epam.ta.reportportal.ws.model.EntryCreatedAsyncRS;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * Response model of launch start resource
+ *
+ * @author Andrei Varabyeu
+ */
+@JsonInclude(JsonInclude.Include.NON_NULL)
+public class FinishLaunchRS extends EntryCreatedAsyncRS {
+
+	@JsonProperty("number")
+	private Long number;
+
+	@JsonProperty("link")
+	private String link;
+
+	public FinishLaunchRS() {
+	}
+
+	public FinishLaunchRS(String id, Long number, String link) {
+		super(id);
+		this.number = number;
+		this.link = link;
+	}
+
+	public Long getNumber() {
+		return number;
+	}
+
+	public void setNumber(Long number) {
+		this.number = number;
+	}
+
+	public String getLink() {
+		return link;
+	}
+
+	public void setLink(String link) {
+		this.link = link;
+	}
+
+	@Override
+	public String toString() {
+		final StringBuilder sb = new StringBuilder("FinishLaunchRS{");
+		sb.append("number=").append(number);
+		sb.append(", link='").append(link).append('\'');
+		sb.append('}');
+		return sb.toString();
+	}
+}
diff --git a/src/main/java/com/epam/ta/reportportal/model/launch/LaunchImportRQ.java b/src/main/java/com/epam/ta/reportportal/model/launch/LaunchImportRQ.java
new file mode 100644
index 0000000000..e4ad825353
--- /dev/null
+++ b/src/main/java/com/epam/ta/reportportal/model/launch/LaunchImportRQ.java
@@ -0,0 +1,61 @@
+/*
+ * Copyright 2023 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.ta.reportportal.model.launch;
+
+import static com.epam.ta.reportportal.ws.model.ValidationConstraints.MAX_NAME_LENGTH;
+import static com.epam.ta.reportportal.ws.model.ValidationConstraints.MAX_PARAMETERS_LENGTH;
+import static com.epam.ta.reportportal.ws.model.ValidationConstraints.MIN_LAUNCH_NAME_LENGTH;
+
+import com.epam.ta.reportportal.ws.model.attribute.ItemAttributesRQ;
+import com.epam.ta.reportportal.ws.model.launch.Mode;
+import com.fasterxml.jackson.annotation.JsonAlias;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import io.swagger.annotations.ApiModelProperty;
+import java.util.Date;
+import java.util.Set;
+import javax.validation.Valid;
+import javax.validation.constraints.Size;
+import lombok.Data;
+
+/**
+ * @author <a href="mailto:pavel_bortnik@epam.com">Pavel Bortnik</a>
+ */
+@Data
+public class LaunchImportRQ {
+
+  @JsonProperty(value = "name")
+  @ApiModelProperty
+  @Size(min = MIN_LAUNCH_NAME_LENGTH, max = MAX_NAME_LENGTH)
+  protected String name;
+
+  @JsonProperty(value = "description")
+  private String description;
+
+  @Size(max = MAX_PARAMETERS_LENGTH)
+  @Valid
+  @JsonProperty("attributes")
+  @JsonAlias({ "attributes", "tags" })
+  private Set<ItemAttributesRQ> attributes;
+
+  @JsonProperty
+  @JsonAlias({ "startTime", "start_time" })
+  @ApiModelProperty
+  private Date startTime;
+
+  @JsonProperty("mode")
+  private Mode mode;
+}
diff --git a/src/main/java/com/epam/ta/reportportal/model/launch/MergeLaunchesRQ.java b/src/main/java/com/epam/ta/reportportal/model/launch/MergeLaunchesRQ.java
new file mode 100644
index 0000000000..ed4f061701
--- /dev/null
+++ b/src/main/java/com/epam/ta/reportportal/model/launch/MergeLaunchesRQ.java
@@ -0,0 +1,208 @@
+/*
+ * 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.ta.reportportal.model.launch;
+
+import static com.epam.ta.reportportal.ws.model.ValidationConstraints.MAX_PARAMETERS_LENGTH;
+
+import com.epam.ta.reportportal.ws.annotations.NotBlankWithSize;
+import com.epam.ta.reportportal.ws.model.ValidationConstraints;
+import com.epam.ta.reportportal.ws.model.attribute.ItemAttributeResource;
+import com.epam.ta.reportportal.ws.model.launch.Mode;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonInclude.Include;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import io.swagger.annotations.ApiModelProperty;
+import java.util.Date;
+import java.util.Set;
+import javax.validation.Valid;
+import javax.validation.constraints.NotEmpty;
+import javax.validation.constraints.NotNull;
+import javax.validation.constraints.Size;
+
+@JsonInclude(Include.NON_NULL)
+public class MergeLaunchesRQ {
+
+	@NotBlankWithSize(min = ValidationConstraints.MIN_LAUNCH_NAME_LENGTH, max = ValidationConstraints.MAX_NAME_LENGTH)
+	@JsonProperty(value = "name", required = true)
+	@ApiModelProperty(required = true)
+	private String name;
+
+	@JsonProperty(value = "description")
+	private String description;
+
+	@Size(max = MAX_PARAMETERS_LENGTH)
+	@Valid
+	@JsonProperty("attributes")
+	private Set<ItemAttributeResource> attributes;
+
+	@JsonProperty(value = "startTime")
+	@ApiModelProperty
+	private Date startTime;
+
+	@JsonProperty("mode")
+	private com.epam.ta.reportportal.ws.model.launch.Mode mode;
+
+	@NotEmpty
+	@JsonProperty(value = "launches", required = true)
+	@ApiModelProperty(required = true)
+	private Set<Long> launches;
+
+	@JsonProperty(value = "endTime")
+	@ApiModelProperty
+	private Date endTime;
+
+	@NotNull
+	@JsonProperty("mergeType")
+	@ApiModelProperty(allowableValues = "BASIC, DEEP")
+	private String mergeStrategyType;
+
+	@JsonProperty(value = "extendSuitesDescription", required = true)
+	private boolean extendSuitesDescription;
+
+	public String getName() {
+		return name;
+	}
+
+	public void setName(@NotNull String name) {
+		this.name = name;
+	}
+
+	public String getDescription() {
+		return description;
+	}
+
+	public void setDescription(String description) {
+		this.description = description;
+	}
+
+	public Set<ItemAttributeResource> getAttributes() {
+		return attributes;
+	}
+
+	public void setAttributes(Set<ItemAttributeResource> attributes) {
+		this.attributes = attributes;
+	}
+
+	public Date getStartTime() {
+		return startTime;
+	}
+
+	public void setStartTime(Date startTime) {
+		this.startTime = startTime;
+	}
+
+	public com.epam.ta.reportportal.ws.model.launch.Mode getMode() {
+		return mode;
+	}
+
+	public void setMode(Mode mode) {
+		this.mode = mode;
+	}
+
+	@NotNull
+	public Set<Long> getLaunches() {
+		return launches;
+	}
+
+	public void setLaunches(@NotNull Set<Long> launches) {
+		this.launches = launches;
+	}
+
+	public Date getEndTime() {
+		return endTime;
+	}
+
+	public void setEndTime(Date endTime) {
+		this.endTime = endTime;
+	}
+
+	@NotNull
+	public String getMergeStrategyType() {
+		return mergeStrategyType;
+	}
+
+	public void setMergeStrategyType(@NotNull String mergeStrategyType) {
+		this.mergeStrategyType = mergeStrategyType;
+	}
+
+	public boolean isExtendSuitesDescription() {
+		return extendSuitesDescription;
+	}
+
+	public void setExtendSuitesDescription(boolean extendSuitesDescription) {
+		this.extendSuitesDescription = extendSuitesDescription;
+	}
+
+	@Override
+	public boolean equals(Object o) {
+		if (this == o) {
+			return true;
+		}
+		if (o == null || getClass() != o.getClass()) {
+			return false;
+		}
+
+		MergeLaunchesRQ that = (MergeLaunchesRQ) o;
+
+		if (extendSuitesDescription != that.extendSuitesDescription) {
+			return false;
+		}
+		if (!name.equals(that.name)) {
+			return false;
+		}
+		if (description != null ? !description.equals(that.description) : that.description != null) {
+			return false;
+		}
+		if (attributes != null ? !attributes.equals(that.attributes) : that.attributes != null) {
+			return false;
+		}
+		if (startTime != null ? !startTime.equals(that.startTime) : that.startTime != null) {
+			return false;
+		}
+		if (mode != that.mode) {
+			return false;
+		}
+		if (!launches.equals(that.launches)) {
+			return false;
+		}
+		if (endTime != null ? !endTime.equals(that.endTime) : that.endTime != null) {
+			return false;
+		}
+		return mergeStrategyType.equals(that.mergeStrategyType);
+	}
+
+	@Override
+	public int hashCode() {
+		int result = name.hashCode();
+		result = 31 * result + (description != null ? description.hashCode() : 0);
+		result = 31 * result + (attributes != null ? attributes.hashCode() : 0);
+		result = 31 * result + (startTime != null ? startTime.hashCode() : 0);
+		result = 31 * result + (mode != null ? mode.hashCode() : 0);
+		result = 31 * result + launches.hashCode();
+		result = 31 * result + (endTime != null ? endTime.hashCode() : 0);
+		result = 31 * result + mergeStrategyType.hashCode();
+		result = 31 * result + (extendSuitesDescription ? 1 : 0);
+		return result;
+	}
+
+	@Override
+	public String toString() {
+		return "MergeLaunchesRQ{" + "name='" + name + '\'' + ", description='" + description + '\'' + ", attributes=" + attributes
+				+ ", startTime=" + startTime + ", mode=" + mode + ", launches=" + launches + ", endTime=" + endTime
+				+ ", mergeStrategyType='" + mergeStrategyType + '\'' + ", extendSuitesDescription=" + extendSuitesDescription + '}';
+	}
+}
\ No newline at end of file
diff --git a/src/main/java/com/epam/ta/reportportal/model/launch/UpdateLaunchRQ.java b/src/main/java/com/epam/ta/reportportal/model/launch/UpdateLaunchRQ.java
new file mode 100644
index 0000000000..e8c6b34646
--- /dev/null
+++ b/src/main/java/com/epam/ta/reportportal/model/launch/UpdateLaunchRQ.java
@@ -0,0 +1,82 @@
+/*
+ * 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.ta.reportportal.model.launch;
+
+import static com.epam.ta.reportportal.ws.model.ValidationConstraints.MAX_PARAMETERS_LENGTH;
+
+import com.epam.ta.reportportal.ws.model.attribute.ItemAttributeResource;
+import com.epam.ta.reportportal.ws.model.launch.Mode;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonInclude.Include;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import io.swagger.annotations.ApiModelProperty;
+import java.util.Set;
+import javax.validation.Valid;
+import javax.validation.constraints.Size;
+
+/**
+ * Domain object for updating launch object.
+ *
+ * @author Aliaksei_Makayed
+ */
+@JsonInclude(Include.NON_NULL)
+public class UpdateLaunchRQ {
+
+	@JsonProperty("mode")
+	@ApiModelProperty(allowableValues = "DEFAULT, DEBUG")
+	private com.epam.ta.reportportal.ws.model.launch.Mode mode;
+
+	@JsonProperty("description")
+	private String description;
+
+	@Size(max = MAX_PARAMETERS_LENGTH)
+	@Valid
+	@JsonProperty("attributes")
+	private Set<ItemAttributeResource> attributes;
+
+	public String getDescription() {
+		return description;
+	}
+
+	public void setDescription(String description) {
+		this.description = description;
+	}
+
+	public Set<ItemAttributeResource> getAttributes() {
+		return attributes;
+	}
+
+	public void setAttributes(Set<ItemAttributeResource> attributes) {
+		this.attributes = attributes;
+	}
+
+	public com.epam.ta.reportportal.ws.model.launch.Mode getMode() {
+		return mode;
+	}
+
+	public void setMode(Mode mode) {
+		this.mode = mode;
+	}
+
+	@Override
+	public String toString() {
+		final StringBuilder sb = new StringBuilder("UpdateLaunchRQ{");
+		sb.append("mode=").append(mode);
+		sb.append('}');
+		return sb.toString();
+	}
+}
\ No newline at end of file
diff --git a/src/main/java/com/epam/ta/reportportal/model/launch/cluster/CreateClustersRQ.java b/src/main/java/com/epam/ta/reportportal/model/launch/cluster/CreateClustersRQ.java
new file mode 100644
index 0000000000..3e9a5db893
--- /dev/null
+++ b/src/main/java/com/epam/ta/reportportal/model/launch/cluster/CreateClustersRQ.java
@@ -0,0 +1,54 @@
+/*
+ * Copyright 2021 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.ta.reportportal.model.launch.cluster;
+
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import javax.validation.constraints.NotNull;
+
+/**
+ * @author <a href="mailto:ivan_budayeu@epam.com">Ivan Budayeu</a>
+ */
+@JsonInclude(JsonInclude.Include.NON_NULL)
+public class CreateClustersRQ {
+
+	@NotNull
+	@JsonProperty(value = "launchId", required = true)
+	private Long launchId;
+
+	@JsonProperty(value = "removeNumbers")
+	private boolean removeNumbers;
+
+	public CreateClustersRQ() {
+	}
+
+	public Long getLaunchId() {
+		return launchId;
+	}
+
+	public void setLaunchId(Long launchId) {
+		this.launchId = launchId;
+	}
+
+	public boolean isRemoveNumbers() {
+		return removeNumbers;
+	}
+
+	public void setRemoveNumbers(boolean removeNumbers) {
+		this.removeNumbers = removeNumbers;
+	}
+}
diff --git a/src/main/java/com/epam/ta/reportportal/model/log/GetLogsUnderRq.java b/src/main/java/com/epam/ta/reportportal/model/log/GetLogsUnderRq.java
new file mode 100644
index 0000000000..bb849d5f5e
--- /dev/null
+++ b/src/main/java/com/epam/ta/reportportal/model/log/GetLogsUnderRq.java
@@ -0,0 +1,37 @@
+package com.epam.ta.reportportal.model.log;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import io.swagger.annotations.ApiModelProperty;
+import java.util.List;
+import javax.validation.constraints.NotNull;
+
+public class GetLogsUnderRq {
+
+	@NotNull
+	@JsonProperty(value = "itemIds")
+	private List<Long> itemIds;
+
+	@NotNull
+	@JsonProperty(value = "logLevel")
+	@ApiModelProperty(allowableValues = "error, warn, info, debug, trace, fatal, unknown")
+	private String logLevel;
+
+	public GetLogsUnderRq() {
+	}
+
+	public List<Long> getItemIds() {
+		return itemIds;
+	}
+
+	public void setItemIds(List<Long> itemIds) {
+		this.itemIds = itemIds;
+	}
+
+	public String getLogLevel() {
+		return logLevel;
+	}
+
+	public void setLogLevel(String logLevel) {
+		this.logLevel = logLevel;
+	}
+}
diff --git a/src/main/java/com/epam/ta/reportportal/model/log/LogResource.java b/src/main/java/com/epam/ta/reportportal/model/log/LogResource.java
new file mode 100644
index 0000000000..9284cc95e6
--- /dev/null
+++ b/src/main/java/com/epam/ta/reportportal/model/log/LogResource.java
@@ -0,0 +1,215 @@
+/*
+ * 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.ta.reportportal.model.log;
+
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonInclude.Include;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import io.swagger.annotations.ApiModelProperty;
+import java.util.Date;
+import javax.validation.constraints.NotNull;
+
+/**
+ * JSON Representation of Report Portal's Log domain object
+ *
+ * @author Andrei Varabyeu
+ */
+@JsonInclude(Include.NON_NULL)
+public class LogResource {
+
+	@JsonInclude(Include.NON_NULL)
+	public static class BinaryContent {
+
+		@NotNull
+		@JsonProperty(value = "id", required = true)
+		private String binaryDataId;
+
+		@JsonProperty(value = "thumbnailId", required = true)
+		private String thumbnailId;
+
+		@JsonProperty(value = "contentType", required = true)
+		private String contentType;
+
+		/**
+		 * @return the binaryDataId
+		 */
+		public String getBinaryDataId() {
+			return binaryDataId;
+		}
+
+		/**
+		 * @param binaryDataId the binaryDataId to set
+		 */
+		public void setBinaryDataId(String binaryDataId) {
+			this.binaryDataId = binaryDataId;
+		}
+
+		/**
+		 * @return the thumbnailId
+		 */
+		public String getThumbnailId() {
+			return thumbnailId;
+		}
+
+		/**
+		 * @param thumbnailId the thumbnailId to set
+		 */
+		public void setThumbnailId(String thumbnailId) {
+			this.thumbnailId = thumbnailId;
+		}
+
+		/**
+		 * @return the contentType
+		 */
+		public String getContentType() {
+			return contentType;
+		}
+
+		/**
+		 * @param contentType the contentType to set
+		 */
+		public void setContentType(String contentType) {
+			this.contentType = contentType;
+		}
+
+		@Override
+		public String toString() {
+			final StringBuilder sb = new StringBuilder("BinaryContent{");
+			sb.append("binaryDataId='").append(binaryDataId).append('\'');
+			sb.append(", thumbnailId='").append(thumbnailId).append('\'');
+			sb.append(", contentType='").append(contentType).append('\'');
+			sb.append('}');
+			return sb.toString();
+		}
+	}
+
+	@JsonProperty(value = "id", required = true)
+	private Long id;
+
+	@JsonProperty(value = "uuid", required = true)
+	private String uuid;
+
+	@JsonProperty(value = "time")
+	private Date logTime;
+
+	@JsonProperty(value = "message")
+	private String message;
+
+	@JsonProperty(value = "binaryContent")
+	private BinaryContent binaryContent;
+
+	@JsonProperty(value = "thumbnail")
+	private String thumbnail;
+
+	@JsonProperty(value = "level")
+	@ApiModelProperty(allowableValues = "error, warn, info, debug, trace, fatal, unknown")
+	private String level;
+
+	@JsonProperty(value = "itemId")
+	private Long itemId;
+
+	@JsonProperty(value = "launchId")
+	private Long launchId;
+
+	public Long getId() {
+		return id;
+	}
+
+	public void setId(Long id) {
+		this.id = id;
+	}
+
+	public Date getLogTime() {
+		return logTime;
+	}
+
+	public String getUuid() {
+		return uuid;
+	}
+
+	public Long getLaunchId() {
+		return launchId;
+	}
+
+	public void setLaunchId(Long launchId) {
+		this.launchId = launchId;
+	}
+
+	public void setUuid(String uuid) {
+		this.uuid = uuid;
+	}
+
+	public void setLogTime(Date logTime) {
+		this.logTime = logTime;
+	}
+
+	public String getMessage() {
+		return message;
+	}
+
+	public void setMessage(String message) {
+		this.message = message;
+	}
+
+	public String getLevel() {
+		return level;
+	}
+
+	public void setLevel(String level) {
+		this.level = level;
+	}
+
+	public Long getItemId() {
+		return itemId;
+	}
+
+	public void setItemId(Long itemId) {
+		this.itemId = itemId;
+	}
+
+	public String getThumbnail() {
+		return thumbnail;
+	}
+
+	public void setThumbnail(String thumbnail) {
+		this.thumbnail = thumbnail;
+	}
+
+	public void setBinaryContent(BinaryContent binaryContent) {
+		this.binaryContent = binaryContent;
+	}
+
+	public BinaryContent getBinaryContent() {
+		return binaryContent;
+	}
+
+	@Override
+	public String toString() {
+		final StringBuilder sb = new StringBuilder("LogResource{");
+		sb.append("id=").append(id);
+		sb.append(", uuid='").append(uuid).append('\'');
+		sb.append(", logTime=").append(logTime);
+		sb.append(", message='").append(message).append('\'');
+		sb.append(", binaryContent=").append(binaryContent);
+		sb.append(", thumbnail='").append(thumbnail).append('\'');
+		sb.append(", level='").append(level).append('\'');
+		sb.append(", itemId=").append(itemId);
+		sb.append(", launchId=").append(launchId);
+		sb.append('}');
+		return sb.toString();
+	}
+}
diff --git a/src/main/java/com/epam/ta/reportportal/model/log/SearchLogRq.java b/src/main/java/com/epam/ta/reportportal/model/log/SearchLogRq.java
new file mode 100644
index 0000000000..afadfd7a45
--- /dev/null
+++ b/src/main/java/com/epam/ta/reportportal/model/log/SearchLogRq.java
@@ -0,0 +1,63 @@
+/*
+ * 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.ta.reportportal.model.log;
+
+import com.epam.ta.reportportal.ws.annotations.In;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import io.swagger.annotations.ApiModelProperty;
+import javax.validation.constraints.NotNull;
+
+/**
+ * @author <a href="mailto:ihar_kahadouski@epam.com">Ihar Kahadouski</a>
+ */
+@JsonInclude(JsonInclude.Include.NON_NULL)
+public class SearchLogRq {
+
+	@NotNull
+	@JsonProperty(value = "searchMode", required = true)
+	@In(allowedValues = { "launchName", "currentLaunch", "filer" })
+	@ApiModelProperty(allowableValues = "currentLaunch, launchName, filter")
+	private String searchMode;
+
+	private Long filterId;
+
+	public String getSearchMode() {
+		return searchMode;
+	}
+
+	public void setSearchMode(String searchMode) {
+		this.searchMode = searchMode;
+	}
+
+	public Long getFilterId() {
+		return filterId;
+	}
+
+	public void setFilterId(Long filterId) {
+		this.filterId = filterId;
+	}
+
+	@Override
+	public String toString() {
+		final StringBuilder sb = new StringBuilder("SearchLogRq{");
+		sb.append("searchMode='").append(searchMode).append('\'');
+		sb.append(", filterId=").append(filterId);
+		sb.append('}');
+		return sb.toString();
+	}
+}
diff --git a/src/main/java/com/epam/ta/reportportal/model/log/SearchLogRs.java b/src/main/java/com/epam/ta/reportportal/model/log/SearchLogRs.java
new file mode 100644
index 0000000000..2ea2c7c92f
--- /dev/null
+++ b/src/main/java/com/epam/ta/reportportal/model/log/SearchLogRs.java
@@ -0,0 +1,188 @@
+/*
+ * 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.ta.reportportal.model.log;
+
+import com.epam.ta.reportportal.ws.model.issue.Issue;
+import com.epam.ta.reportportal.ws.model.item.PathNameResource;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import java.util.List;
+import java.util.Set;
+
+/**
+ * @author <a href="mailto:ihar_kahadouski@epam.com">Ihar Kahadouski</a>
+ */
+@JsonInclude(JsonInclude.Include.NON_NULL)
+public class SearchLogRs {
+
+	@JsonProperty(value = "launchId")
+	private Long launchId;
+
+	@JsonProperty(value = "itemId")
+	private Long itemId;
+
+	@JsonProperty(value = "itemName")
+	private String itemName;
+
+	@JsonProperty(value = "path")
+	private String path;
+
+	@JsonProperty(value = "pathNames")
+	private PathNameResource pathNames;
+
+	@JsonProperty(value = "duration")
+	private double duration;
+
+	@JsonProperty(value = "status")
+	private String status;
+
+	@JsonProperty(value = "issue")
+	private Issue issue;
+
+	@JsonProperty(value = "patternTemplates")
+	private Set<String> patternTemplates;
+
+	@JsonProperty(value = "logs")
+	private List<LogEntry> logs;
+
+	public static class LogEntry {
+		private String message;
+		private String level;
+
+		public String getMessage() {
+			return message;
+		}
+
+		public void setMessage(String message) {
+			this.message = message;
+		}
+
+		public String getLevel() {
+			return level;
+		}
+
+		public void setLevel(String level) {
+			this.level = level;
+		}
+
+		@Override
+		public String toString() {
+			final StringBuilder sb = new StringBuilder("LogEntry{");
+			sb.append("message='").append(message).append('\'');
+			sb.append(", level='").append(level).append('\'');
+			sb.append('}');
+			return sb.toString();
+		}
+	}
+
+	public Long getLaunchId() {
+		return launchId;
+	}
+
+	public void setLaunchId(Long launchId) {
+		this.launchId = launchId;
+	}
+
+	public PathNameResource getPathNames() {
+		return pathNames;
+	}
+
+	public void setPathNames(PathNameResource pathNames) {
+		this.pathNames = pathNames;
+	}
+
+	public Set<String> getPatternTemplates() {
+		return patternTemplates;
+	}
+
+	public void setPatternTemplates(Set<String> patternTemplates) {
+		this.patternTemplates = patternTemplates;
+	}
+
+	public String getPath() {
+		return path;
+	}
+
+	public void setPath(String path) {
+		this.path = path;
+	}
+
+	public Long getItemId() {
+		return itemId;
+	}
+
+	public void setItemId(Long itemId) {
+		this.itemId = itemId;
+	}
+
+	public String getItemName() {
+		return itemName;
+	}
+
+	public void setItemName(String itemName) {
+		this.itemName = itemName;
+	}
+
+	public double getDuration() {
+		return duration;
+	}
+
+	public void setDuration(double duration) {
+		this.duration = duration;
+	}
+
+	public String getStatus() {
+		return status;
+	}
+
+	public void setStatus(String status) {
+		this.status = status;
+	}
+
+	public Issue getIssue() {
+		return issue;
+	}
+
+	public void setIssue(Issue issue) {
+		this.issue = issue;
+	}
+
+	public List<LogEntry> getLogs() {
+		return logs;
+	}
+
+	public void setLogs(List<LogEntry> logs) {
+		this.logs = logs;
+	}
+
+	@Override
+	public String toString() {
+		final StringBuilder sb = new StringBuilder("SearchLogRs{");
+		sb.append(", launchId=").append(launchId);
+		sb.append(", itemId=").append(itemId);
+		sb.append(", itemName='").append(itemName).append('\'');
+		sb.append(", path='").append(path).append('\'');
+		sb.append(", pathNames=").append(pathNames);
+		sb.append(", duration=").append(duration);
+		sb.append(", status='").append(status).append('\'');
+		sb.append(", issue=").append(issue);
+		sb.append(", patternTemplates=").append(patternTemplates);
+		sb.append(", logs=").append(logs);
+		sb.append('}');
+		return sb.toString();
+	}
+}
diff --git a/src/main/java/com/epam/ta/reportportal/model/notification/EmailNotificationRQ.java b/src/main/java/com/epam/ta/reportportal/model/notification/EmailNotificationRQ.java
new file mode 100644
index 0000000000..3c7944ff84
--- /dev/null
+++ b/src/main/java/com/epam/ta/reportportal/model/notification/EmailNotificationRQ.java
@@ -0,0 +1,72 @@
+/*
+ * Copyright 2023 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.ta.reportportal.model.notification;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import java.util.Map;
+import javax.validation.constraints.NotNull;
+
+/**
+ * @author Andrei Piankouski
+ */
+public class EmailNotificationRQ {
+
+  @NotNull
+  @JsonProperty(value = "recipient")
+  private String recipient;
+
+  @NotNull
+  @JsonProperty(value = "template")
+  private String template;
+
+  @JsonProperty(value = "params")
+  private Map<String, Object> params;
+
+
+  public String getRecipient() {
+    return recipient;
+  }
+
+  public void setRecipient(String recipient) {
+    this.recipient = recipient;
+  }
+
+  public String getTemplate() {
+    return template;
+  }
+
+  public void setTemplate(String template) {
+    this.template = template;
+  }
+
+  public Map<String, Object> getParams() {
+    return params;
+  }
+
+  public void setParams(Map<String, Object> params) {
+    this.params = params;
+  }
+
+  @Override
+  public String toString() {
+    return "EmailNotificationRQ{" +
+        "recipient='" + recipient + '\'' +
+        ", template='" + template + '\'' +
+        ", params=" + params +
+        '}';
+  }
+}
diff --git a/src/main/java/com/epam/ta/reportportal/model/preference/PreferenceResource.java b/src/main/java/com/epam/ta/reportportal/model/preference/PreferenceResource.java
new file mode 100644
index 0000000000..c180882046
--- /dev/null
+++ b/src/main/java/com/epam/ta/reportportal/model/preference/PreferenceResource.java
@@ -0,0 +1,70 @@
+/*
+ * 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.ta.reportportal.model.preference;
+
+import com.epam.ta.reportportal.model.filter.UserFilterResource;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+import java.util.List;
+
+/**
+ * JSON representation of report portal domain object
+ *
+ * @author Dzmitry_Kavalets
+ */
+@JsonInclude(JsonInclude.Include.NON_NULL)
+public class PreferenceResource {
+
+	@JsonProperty(value = "userId")
+	private Long userId;
+
+	@JsonProperty(value = "projectId", required = true)
+	private Long projectId;
+
+	@JsonProperty(value = "filters")
+	private List<UserFilterResource> filters;
+
+	public Long getUserId() {
+		return userId;
+	}
+
+	public void setUserId(Long userId) {
+		this.userId = userId;
+	}
+
+	public Long getProjectId() {
+		return projectId;
+	}
+
+	public void setProjectId(Long projectId) {
+		this.projectId = projectId;
+	}
+
+	public List<UserFilterResource> getFilters() {
+		return filters;
+	}
+
+	public void setFilters(List<UserFilterResource> filters) {
+		this.filters = filters;
+	}
+
+	@Override
+	public String toString() {
+		return "PreferenceResource{" + "userId=" + userId + ", projectId=" + projectId + ", filters=" + filters + '}';
+	}
+}
diff --git a/src/main/java/com/epam/ta/reportportal/model/project/AssignUsersRQ.java b/src/main/java/com/epam/ta/reportportal/model/project/AssignUsersRQ.java
new file mode 100644
index 0000000000..7bcad4688e
--- /dev/null
+++ b/src/main/java/com/epam/ta/reportportal/model/project/AssignUsersRQ.java
@@ -0,0 +1,52 @@
+/*
+ * 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.ta.reportportal.model.project;
+
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonInclude.Include;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import java.util.Map;
+import javax.validation.constraints.NotNull;
+
+/**
+ * Assign users from project request model
+ * 
+ * @author Andrei_Ramanchuk
+ */
+@JsonInclude(Include.NON_NULL)
+public class AssignUsersRQ {
+
+	@NotNull
+	@JsonProperty(value = "userNames", required = true)
+	private Map<String, String> userNames;
+
+	public void setUserNames(Map<String, String> value) {
+		this.userNames = value;
+	}
+
+	public Map<String, String> getUserNames() {
+		return userNames;
+	}
+
+	@Override
+	public String toString() {
+		final StringBuilder sb = new StringBuilder("AssignUsersRQ{");
+		sb.append("userNames=").append(userNames.keySet());
+		sb.append('}');
+		return sb.toString();
+	}
+}
\ No newline at end of file
diff --git a/src/main/java/com/epam/ta/reportportal/model/project/CreateProjectRQ.java b/src/main/java/com/epam/ta/reportportal/model/project/CreateProjectRQ.java
new file mode 100644
index 0000000000..43c511c17a
--- /dev/null
+++ b/src/main/java/com/epam/ta/reportportal/model/project/CreateProjectRQ.java
@@ -0,0 +1,77 @@
+/*
+ * 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.ta.reportportal.model.project;
+
+import static com.epam.ta.reportportal.ws.model.ValidationConstraints.PROJECT_NAME_REGEXP;
+
+import com.epam.ta.reportportal.ws.annotations.In;
+import com.epam.ta.reportportal.ws.model.ValidationConstraints;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonInclude.Include;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import io.swagger.annotations.ApiModelProperty;
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.Pattern;
+import javax.validation.constraints.Size;
+
+/**
+ * Create project request initial model
+ *
+ * @author Hanna_Sukhadolava
+ * @author Andrei_Ramanchuk
+ */
+@JsonInclude(Include.NON_NULL)
+public class CreateProjectRQ {
+
+	@NotBlank
+	@Pattern(regexp = PROJECT_NAME_REGEXP)
+	@Size(min = ValidationConstraints.MIN_NAME_LENGTH, max = ValidationConstraints.MAX_NAME_LENGTH)
+	@JsonProperty(value = "projectName", required = true)
+	@ApiModelProperty(required = true)
+	private String projectName;
+
+	@NotBlank
+	@JsonProperty(value = "entryType", required = true)
+	@In(allowedValues = "internal")
+	@ApiModelProperty(required = true, allowableValues = "INTERNAL")
+	private String entryType;
+
+	public String getProjectName() {
+		return projectName;
+	}
+
+	public void setProjectName(String projectName) {
+		this.projectName = projectName;
+	}
+
+	public String getEntryType() {
+		return entryType;
+	}
+
+	public void setEntryType(String value) {
+		this.entryType = value;
+	}
+
+	@Override
+	public String toString() {
+		final StringBuilder sb = new StringBuilder("CreateProjectRQ{");
+		sb.append("projectName='").append(projectName).append('\'');
+		sb.append(", entryType='").append(entryType).append('\'');
+		sb.append('}');
+		return sb.toString();
+	}
+}
diff --git a/src/main/java/com/epam/ta/reportportal/model/project/DeleteProjectRQ.java b/src/main/java/com/epam/ta/reportportal/model/project/DeleteProjectRQ.java
new file mode 100644
index 0000000000..cb7777b33a
--- /dev/null
+++ b/src/main/java/com/epam/ta/reportportal/model/project/DeleteProjectRQ.java
@@ -0,0 +1,73 @@
+/*
+ * 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.ta.reportportal.model.project;
+
+import static com.epam.ta.reportportal.ws.model.ValidationConstraints.PROJECT_NAME_REGEXP;
+
+import com.epam.ta.reportportal.ws.model.ValidationConstraints;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import io.swagger.annotations.ApiModelProperty;
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.Pattern;
+import javax.validation.constraints.Size;
+
+/**
+ * @author <a href="mailto:ivan_budayeu@epam.com">Ivan Budayeu</a>
+ */
+@JsonInclude(JsonInclude.Include.NON_NULL)
+public class DeleteProjectRQ {
+
+	@NotBlank
+	@JsonProperty(value = "projectName", required = true)
+	@Pattern(regexp = PROJECT_NAME_REGEXP)
+	@Size(min = ValidationConstraints.MIN_NAME_LENGTH, max = ValidationConstraints.MAX_NAME_LENGTH)
+	@ApiModelProperty(required = true)
+	private String projectName;
+
+	public String getProjectName() {
+		return projectName;
+	}
+
+	public void setProjectName(String projectName) {
+		this.projectName = projectName;
+	}
+
+	@Override
+	public boolean equals(Object o) {
+		if (this == o) {
+			return true;
+		}
+		if (o == null || getClass() != o.getClass()) {
+			return false;
+		}
+
+		DeleteProjectRQ that = (DeleteProjectRQ) o;
+
+		return projectName.equals(that.projectName);
+	}
+
+	@Override
+	public int hashCode() {
+		return projectName.hashCode();
+	}
+
+	@Override
+	public String toString() {
+		return "DeleteProjectRQ{" + "projectName='" + projectName + '\'' + '}';
+	}
+}
diff --git a/src/main/java/com/epam/ta/reportportal/model/project/LaunchesPerUser.java b/src/main/java/com/epam/ta/reportportal/model/project/LaunchesPerUser.java
new file mode 100644
index 0000000000..429cab8efb
--- /dev/null
+++ b/src/main/java/com/epam/ta/reportportal/model/project/LaunchesPerUser.java
@@ -0,0 +1,61 @@
+/*
+ * 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.ta.reportportal.model.project;
+
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * Basic representation of launches information per user for specified project<br>
+ * Current view is:<br>
+ * String:user_id : {String:fullname, Integer:launchesCount}<br>
+ *
+ * @author Andrei_Ramanchuk
+ */
+@JsonInclude(JsonInclude.Include.NON_NULL)
+public class LaunchesPerUser {
+
+	@JsonProperty(value = "fullName")
+	private String fullUsername;
+
+	@JsonProperty(value = "count")
+	private Integer launchCount;
+
+	public LaunchesPerUser() {
+	}
+
+	public LaunchesPerUser(String fullname, Integer count) {
+		this.fullUsername = fullname;
+		this.launchCount = count;
+	}
+
+	public void setFullUsername(String value) {
+		this.fullUsername = value;
+	}
+
+	public String getFullUsername() {
+		return fullUsername;
+	}
+
+	public void setLaunchCount(Integer value) {
+		this.launchCount = value;
+	}
+
+	public Integer getLaunchCount() {
+		return launchCount;
+	}
+}
\ No newline at end of file
diff --git a/src/main/java/com/epam/ta/reportportal/model/project/ProjectConfiguration.java b/src/main/java/com/epam/ta/reportportal/model/project/ProjectConfiguration.java
new file mode 100644
index 0000000000..12c848c569
--- /dev/null
+++ b/src/main/java/com/epam/ta/reportportal/model/project/ProjectConfiguration.java
@@ -0,0 +1,79 @@
+/*
+ * 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.ta.reportportal.model.project;
+
+import com.epam.ta.reportportal.model.project.config.IssueSubTypeResource;
+import com.epam.ta.reportportal.model.project.config.pattern.PatternTemplateResource;
+import com.epam.ta.reportportal.model.project.email.ProjectNotificationConfigDTO;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonInclude.Include;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * Project configuration model
+ *
+ * @author <a href="mailto:pavel_bortnik@epam.com">Pavel Bortnik</a>
+ */
+@JsonInclude(Include.NON_NULL)
+public class ProjectConfiguration {
+
+  @JsonProperty(value = "attributes", required = true)
+  private Map<String, String> projectAttributes;
+
+  @JsonProperty(value = "subTypes")
+  private Map<String, List<IssueSubTypeResource>> subTypes;
+
+  @JsonProperty(value = "notificationsConfiguration")
+  private ProjectNotificationConfigDTO projectConfig;
+
+  @JsonProperty(value = "patterns")
+  private List<PatternTemplateResource> patterns;
+
+  public Map<String, String> getProjectAttributes() {
+    return projectAttributes;
+  }
+
+  public void setProjectAttributes(Map<String, String> projectAttributes) {
+    this.projectAttributes = projectAttributes;
+  }
+
+  public Map<String, List<IssueSubTypeResource>> getSubTypes() {
+    return subTypes;
+  }
+
+  public void setSubTypes(Map<String, List<IssueSubTypeResource>> subTypes) {
+    this.subTypes = subTypes;
+  }
+
+  public ProjectNotificationConfigDTO getProjectConfig() {
+    return projectConfig;
+  }
+
+  public void setProjectConfig(ProjectNotificationConfigDTO projectConfig) {
+    this.projectConfig = projectConfig;
+  }
+
+  public List<PatternTemplateResource> getPatterns() {
+    return patterns;
+  }
+
+  public void setPatterns(List<PatternTemplateResource> patterns) {
+    this.patterns = patterns;
+  }
+}
diff --git a/src/main/java/com/epam/ta/reportportal/model/project/ProjectInfoResource.java b/src/main/java/com/epam/ta/reportportal/model/project/ProjectInfoResource.java
new file mode 100644
index 0000000000..1e6e3c3a84
--- /dev/null
+++ b/src/main/java/com/epam/ta/reportportal/model/project/ProjectInfoResource.java
@@ -0,0 +1,171 @@
+/*
+ * 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.ta.reportportal.model.project;
+
+import com.epam.ta.reportportal.model.ModelViews;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonView;
+import java.util.Date;
+import java.util.List;
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+
+/**
+ * Project info resource representation for responses<br>
+ * {@link ModelViews.DefaultView} used as
+ * default fields output<br>
+ * {@link ModelViews.FullProjectInfoView} used
+ * as extended fields output<br>
+ *
+ * @author Dzmitry_Kavalets
+ * @author Andrei_Ramanchuk
+ */
+public class ProjectInfoResource {
+
+  @NotNull
+  @JsonProperty(value = "id")
+  private Long projectId;
+
+  @NotBlank
+  @JsonProperty(value = "projectName")
+  private String projectName;
+
+  @NotNull
+  @JsonProperty(value = "usersQuantity")
+  private Integer usersQuantity;
+
+  @NotNull
+  @JsonProperty(value = "launchesQuantity")
+  private Integer launchesQuantity;
+
+  @JsonProperty(value = "launchesPerUser")
+  @JsonView(ModelViews.FullProjectInfoView.class)
+  private List<LaunchesPerUser> launchesPerUser;
+
+  @JsonProperty(value = "uniqueTickets")
+  @JsonView(ModelViews.FullProjectInfoView.class)
+  private Integer uniqueTickets;
+
+  @JsonProperty(value = "launchesPerWeek")
+  @JsonView(ModelViews.FullProjectInfoView.class)
+  private String launchesPerWeek;
+
+  @NotNull
+  @JsonProperty(value = "lastRun")
+  private Date lastRun;
+
+  @NotNull
+  @JsonProperty(value = "creationDate")
+  private Date creationDate;
+
+  @JsonProperty(value = "entryType")
+  private String entryType;
+
+  @JsonProperty(value = "organization")
+  private String organization;
+
+  public ProjectInfoResource() {
+  }
+
+  public Long getProjectId() {
+    return projectId;
+  }
+
+  public void setProjectId(Long projectId) {
+    this.projectId = projectId;
+  }
+
+  public String getProjectName() {
+    return projectName;
+  }
+
+  public void setProjectName(String projectName) {
+    this.projectName = projectName;
+  }
+
+  public Integer getUsersQuantity() {
+    return usersQuantity;
+  }
+
+  public void setUsersQuantity(Integer usersQuantity) {
+    this.usersQuantity = usersQuantity;
+  }
+
+  public Integer getLaunchesQuantity() {
+    return launchesQuantity;
+  }
+
+  public void setLaunchesQuantity(Integer launchesQuantity) {
+    this.launchesQuantity = launchesQuantity;
+  }
+
+  public void setLaunchesPerUser(List<LaunchesPerUser> value) {
+    this.launchesPerUser = value;
+  }
+
+  public List<LaunchesPerUser> getLaunchesPerUser() {
+    return launchesPerUser;
+  }
+
+  public void setUniqueTickets(Integer value) {
+    this.uniqueTickets = value;
+  }
+
+  public Integer getUniqueTickets() {
+    return uniqueTickets;
+  }
+
+  public void setLaunchesPerWeek(String value) {
+    this.launchesPerWeek = value;
+  }
+
+  public String getLaunchesPerWeek() {
+    return launchesPerWeek;
+  }
+
+  public Date getLastRun() {
+    return lastRun;
+  }
+
+  public void setLastRun(Date lastRun) {
+    this.lastRun = lastRun;
+  }
+
+  public Date getCreationDate() {
+    return creationDate;
+  }
+
+  public void setCreationDate(Date creationDate) {
+    this.creationDate = creationDate;
+  }
+
+  public String getEntryType() {
+    return entryType;
+  }
+
+  public void setEntryType(String entryType) {
+    this.entryType = entryType;
+  }
+
+  public String getOrganization() {
+    return organization;
+  }
+
+  public void setOrganization(String organization) {
+    this.organization = organization;
+  }
+}
diff --git a/src/main/java/com/epam/ta/reportportal/model/project/ProjectResource.java b/src/main/java/com/epam/ta/reportportal/model/project/ProjectResource.java
new file mode 100644
index 0000000000..0702c6a410
--- /dev/null
+++ b/src/main/java/com/epam/ta/reportportal/model/project/ProjectResource.java
@@ -0,0 +1,165 @@
+/*
+ * 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.ta.reportportal.model.project;
+
+import com.epam.ta.reportportal.model.integration.IntegrationResource;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import java.util.Date;
+import java.util.List;
+import javax.validation.constraints.NotNull;
+
+/**
+ * Project resource representation for responses
+ *
+ * @author Pavel Bortnik
+ */
+public class ProjectResource {
+
+  @NotNull
+  @JsonProperty(value = "projectId", required = true)
+  private Long projectId;
+
+  @NotNull
+  @JsonProperty(value = "projectName", required = true)
+  private String projectName;
+
+  @JsonProperty(value = "entryType", required = true)
+  private String entryType;
+
+  @NotNull
+  @JsonProperty(value = "configuration", required = true)
+  private ProjectConfiguration configuration;
+
+  @JsonProperty(value = "users")
+  private List<ProjectUser> users;
+
+  @JsonProperty(value = "integrations")
+  private List<IntegrationResource> integrations;
+
+  @JsonProperty(value = "organization")
+  private String organization;
+
+  @JsonProperty(value = "allocatedStorage")
+  private Long allocatedStorage;
+
+  @NotNull
+  @JsonProperty(value = "creationDate")
+  private Date creationDate;
+
+  public Date getCreationDate() {
+    return creationDate;
+  }
+
+  public void setCreationDate(Date creationDate) {
+    this.creationDate = creationDate;
+  }
+
+  public Long getProjectId() {
+    return projectId;
+  }
+
+  public void setProjectId(Long projectId) {
+    this.projectId = projectId;
+  }
+
+  public String getProjectName() {
+    return projectName;
+  }
+
+  public void setProjectName(String projectName) {
+    this.projectName = projectName;
+  }
+
+  public String getEntryType() {
+    return entryType;
+  }
+
+  public void setEntryType(String entryType) {
+    this.entryType = entryType;
+  }
+
+  public void setConfiguration(
+      ProjectConfiguration configuration) {
+    this.configuration = configuration;
+  }
+
+  public ProjectConfiguration getConfiguration() {
+    return configuration;
+  }
+
+  public List<IntegrationResource> getIntegrations() {
+    return integrations;
+  }
+
+  public void setIntegrations(List<IntegrationResource> integrations) {
+    this.integrations = integrations;
+  }
+
+  public List<ProjectUser> getUsers() {
+    return users;
+  }
+
+  public void setUsers(List<ProjectUser> users) {
+    this.users = users;
+  }
+
+  public String getOrganization() {
+    return organization;
+  }
+
+  public void setOrganization(String organization) {
+    this.organization = organization;
+  }
+
+  public Long getAllocatedStorage() {
+    return allocatedStorage;
+  }
+
+  public void setAllocatedStorage(Long allocatedStorage) {
+    this.allocatedStorage = allocatedStorage;
+  }
+
+  public static class ProjectUser {
+
+    @JsonProperty(value = "login")
+    private String login;
+
+    @JsonProperty(value = "projectRole")
+    private String projectRole;
+
+    public String getLogin() {
+      return login;
+    }
+
+    public void setLogin(String login) {
+      this.login = login;
+    }
+
+    public void setProjectRole(String value) {
+      this.projectRole = value;
+    }
+
+    public String getProjectRole() {
+      return projectRole;
+    }
+
+    @Override
+    public String toString() {
+      return "ProjectUser{" + "projectRole='" + projectRole + '\'' + '}';
+    }
+  }
+}
diff --git a/src/main/java/com/epam/ta/reportportal/model/project/UnassignUsersRQ.java b/src/main/java/com/epam/ta/reportportal/model/project/UnassignUsersRQ.java
new file mode 100644
index 0000000000..8a64532c67
--- /dev/null
+++ b/src/main/java/com/epam/ta/reportportal/model/project/UnassignUsersRQ.java
@@ -0,0 +1,54 @@
+/*
+ * 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.ta.reportportal.model.project;
+
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonInclude.Include;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import io.swagger.annotations.ApiModelProperty;
+import java.util.List;
+import javax.validation.constraints.NotEmpty;
+
+/**
+ * Un-assign users request template
+ *
+ * @author Andrei_Ramanchuk
+ */
+@JsonInclude(Include.NON_NULL)
+public class UnassignUsersRQ {
+
+	@NotEmpty
+	@JsonProperty(value = "userNames", required = true)
+	@ApiModelProperty(required = true)
+	private List<String> usernames;
+
+	public void setUsernames(List<String> value) {
+		this.usernames = value;
+	}
+
+	public List<String> getUsernames() {
+		return usernames;
+	}
+
+	@Override
+	public String toString() {
+		final StringBuilder sb = new StringBuilder("UnassignUsersRQ{");
+		sb.append("usernames=").append(usernames);
+		sb.append('}');
+		return sb.toString();
+	}
+}
\ No newline at end of file
diff --git a/src/main/java/com/epam/ta/reportportal/model/project/UniqueErrorConfig.java b/src/main/java/com/epam/ta/reportportal/model/project/UniqueErrorConfig.java
new file mode 100644
index 0000000000..4398381a1e
--- /dev/null
+++ b/src/main/java/com/epam/ta/reportportal/model/project/UniqueErrorConfig.java
@@ -0,0 +1,36 @@
+package com.epam.ta.reportportal.model.project;
+
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * @author <a href="mailto:ivan_budayeu@epam.com">Ivan Budayeu</a>
+ */
+@JsonInclude(JsonInclude.Include.NON_NULL)
+public class UniqueErrorConfig {
+
+	@JsonProperty(value = "isAutoAnalyzerEnabled")
+	private boolean enabled;
+
+	@JsonProperty(value = "isAutoAnalyzerEnabled")
+	private boolean removeNumbers;
+
+	public UniqueErrorConfig() {
+	}
+
+	public boolean isEnabled() {
+		return enabled;
+	}
+
+	public void setEnabled(boolean enabled) {
+		this.enabled = enabled;
+	}
+
+	public boolean isRemoveNumbers() {
+		return removeNumbers;
+	}
+
+	public void setRemoveNumbers(boolean removeNumbers) {
+		this.removeNumbers = removeNumbers;
+	}
+}
diff --git a/src/main/java/com/epam/ta/reportportal/model/project/UpdateProjectRQ.java b/src/main/java/com/epam/ta/reportportal/model/project/UpdateProjectRQ.java
new file mode 100644
index 0000000000..2bc9dc8974
--- /dev/null
+++ b/src/main/java/com/epam/ta/reportportal/model/project/UpdateProjectRQ.java
@@ -0,0 +1,71 @@
+/*
+ * 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.ta.reportportal.model.project;
+
+import com.epam.ta.reportportal.model.project.config.ProjectConfigurationUpdate;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonInclude.Include;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import java.util.Map;
+import javax.validation.Valid;
+
+/**
+ * Update project request model
+ *
+ * @author Andrei_Ramanchuk
+ */
+@JsonInclude(Include.NON_NULL)
+public class UpdateProjectRQ {
+
+  @JsonProperty(value = "users")
+  private Map<String, String> userRoles;
+
+  @Valid
+  @JsonProperty(value = "configuration")
+  private ProjectConfigurationUpdate configuration;
+
+  /**
+   * @return the userRoles
+   */
+  public Map<String, String> getUserRoles() {
+    return userRoles;
+  }
+
+  /**
+   * @param userRoles the userRoles to set
+   */
+  public void setUserRoles(Map<String, String> userRoles) {
+    this.userRoles = userRoles;
+  }
+
+  public ProjectConfigurationUpdate getConfiguration() {
+    return configuration;
+  }
+
+  public void setConfiguration(ProjectConfigurationUpdate configuration) {
+    this.configuration = configuration;
+  }
+
+  @Override
+  public String toString() {
+    final StringBuilder sb = new StringBuilder("UpdateProjectRQ{");
+    sb.append(", userRoles=").append(userRoles);
+    sb.append(", configuration=").append(configuration);
+    sb.append('}');
+    return sb.toString();
+  }
+}
\ No newline at end of file
diff --git a/src/main/java/com/epam/ta/reportportal/model/project/config/CreateIssueSubTypeRQ.java b/src/main/java/com/epam/ta/reportportal/model/project/config/CreateIssueSubTypeRQ.java
new file mode 100644
index 0000000000..07dea81248
--- /dev/null
+++ b/src/main/java/com/epam/ta/reportportal/model/project/config/CreateIssueSubTypeRQ.java
@@ -0,0 +1,92 @@
+/*
+ * 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.ta.reportportal.model.project.config;
+
+import static com.epam.ta.reportportal.ws.model.ValidationConstraints.HEX_COLOR_REGEXP;
+
+import com.epam.ta.reportportal.ws.model.ValidationConstraints;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonInclude.Include;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import io.swagger.annotations.ApiModelProperty;
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.Pattern;
+import javax.validation.constraints.Size;
+
+/**
+ * Request model for new issue sub type for specified project.<br>
+ *
+ * @author Andrei_Ramanchuk
+ */
+@JsonInclude(Include.NON_NULL)
+public class CreateIssueSubTypeRQ {
+
+	@NotBlank
+	@JsonProperty(value = "typeRef", required = true)
+	@ApiModelProperty(required = true)
+	private String typeRef;
+
+	@NotBlank
+	@Size(min = ValidationConstraints.MIN_SUBTYPE_LONG_NAME, max = ValidationConstraints.MAX_SUBTYPE_LONG_NAME)
+	@JsonProperty(value = "longName", required = true)
+	@ApiModelProperty(required = true)
+	private String longName;
+
+	@NotBlank
+	@Size(min = ValidationConstraints.MIN_SUBTYPE_SHORT_NAME, max = ValidationConstraints.MAX_SUBTYPE_SHORT_NAME)
+	@JsonProperty(value = "shortName", required = true)
+	@ApiModelProperty(required = true)
+	private String shortName;
+
+	@NotBlank
+	@Pattern(regexp = HEX_COLOR_REGEXP)
+	@JsonProperty(value = "color", required = true)
+	@ApiModelProperty(required = true)
+	private String color;
+
+	public void setTypeRef(String typeRef) {
+		this.typeRef = typeRef;
+	}
+
+	public String getTypeRef() {
+		return typeRef;
+	}
+
+	public void setLongName(String longName) {
+		this.longName = longName;
+	}
+
+	public String getLongName() {
+		return longName;
+	}
+
+	public void setShortName(String shortName) {
+		this.shortName = shortName;
+	}
+
+	public String getShortName() {
+		return shortName;
+	}
+
+	public void setColor(String color) {
+		this.color = color;
+	}
+
+	public String getColor() {
+		return color;
+	}
+}
diff --git a/src/main/java/com/epam/ta/reportportal/model/project/config/IssueSubTypeCreatedRS.java b/src/main/java/com/epam/ta/reportportal/model/project/config/IssueSubTypeCreatedRS.java
new file mode 100644
index 0000000000..933c293b03
--- /dev/null
+++ b/src/main/java/com/epam/ta/reportportal/model/project/config/IssueSubTypeCreatedRS.java
@@ -0,0 +1,47 @@
+/*
+ * 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.ta.reportportal.model.project.config;
+
+import com.epam.ta.reportportal.model.EntryCreatedRS;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * @author <a href="mailto:ivan_budayeu@epam.com">Ivan Budayeu</a>
+ */
+@JsonInclude(JsonInclude.Include.NON_NULL)
+public class IssueSubTypeCreatedRS extends EntryCreatedRS {
+
+  @JsonProperty(value = "locator")
+  private String locator;
+
+  public IssueSubTypeCreatedRS() {
+  }
+
+  public IssueSubTypeCreatedRS(Long id, String locator) {
+    super(id);
+    this.locator = locator;
+  }
+
+  public String getLocator() {
+    return locator;
+  }
+
+  public void setLocator(String locator) {
+    this.locator = locator;
+  }
+}
diff --git a/src/main/java/com/epam/ta/reportportal/model/project/config/IssueSubTypeResource.java b/src/main/java/com/epam/ta/reportportal/model/project/config/IssueSubTypeResource.java
new file mode 100644
index 0000000000..b407b33506
--- /dev/null
+++ b/src/main/java/com/epam/ta/reportportal/model/project/config/IssueSubTypeResource.java
@@ -0,0 +1,109 @@
+/*
+ * 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.ta.reportportal.model.project.config;
+
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * Issue sub-type resource representation
+ * 
+ * @author Andrei_Ramanchuk
+ * 
+ */
+@JsonInclude(JsonInclude.Include.NON_NULL)
+public class IssueSubTypeResource {
+
+	@JsonProperty(value = "id")
+	private Long id;
+
+	@JsonProperty(value = "locator")
+	private String locator;
+
+	@JsonProperty(value = "typeRef")
+	private String typeRef;
+
+	@JsonProperty(value = "longName")
+	private String longName;
+
+	@JsonProperty(value = "shortName")
+	private String shortName;
+
+	@JsonProperty(value = "color")
+	private String color;
+
+	public IssueSubTypeResource() {
+
+	}
+
+	public IssueSubTypeResource(Long id, String locator, String typeRef, String longName, String shortName, String color) {
+		this.id = id;
+		this.locator = locator;
+		this.typeRef = typeRef;
+		this.longName = longName;
+		this.shortName = shortName;
+		this.color = color;
+	}
+
+	public Long getId() {
+		return id;
+	}
+
+	public void setId(Long id) {
+		this.id = id;
+	}
+
+	public String getLocator() {
+		return locator;
+	}
+
+	public void setLocator(String locator) {
+		this.locator = locator;
+	}
+
+	public String getTypeRef() {
+		return typeRef;
+	}
+
+	public void setTypeRef(String typeRef) {
+		this.typeRef = typeRef;
+	}
+
+	public String getLongName() {
+		return longName;
+	}
+
+	public void setLongName(String longName) {
+		this.longName = longName;
+	}
+
+	public String getShortName() {
+		return shortName;
+	}
+
+	public void setShortName(String shortName) {
+		this.shortName = shortName;
+	}
+
+	public String getColor() {
+		return color;
+	}
+
+	public void setColor(String color) {
+		this.color = color;
+	}
+}
diff --git a/src/main/java/com/epam/ta/reportportal/model/project/config/ProjectConfigurationUpdate.java b/src/main/java/com/epam/ta/reportportal/model/project/config/ProjectConfigurationUpdate.java
new file mode 100644
index 0000000000..db0b625e42
--- /dev/null
+++ b/src/main/java/com/epam/ta/reportportal/model/project/config/ProjectConfigurationUpdate.java
@@ -0,0 +1,47 @@
+/*
+ * 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.ta.reportportal.model.project.config;
+
+import com.epam.ta.reportportal.ws.annotations.NotNullMapValue;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonInclude.Include;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import java.util.Map;
+import javax.validation.constraints.NotNull;
+
+/**
+ * Project configuration model
+ *
+ * @author <a href="mailto:ivan_budayeu@epam.com">Ivan Budayeu</a>
+ */
+@JsonInclude(Include.NON_NULL)
+public class ProjectConfigurationUpdate {
+
+	@NotNull
+	@NotNullMapValue
+	@JsonProperty(value = "attributes", required = true)
+	private Map<String, String> projectAttributes;
+
+	public Map<String, String> getProjectAttributes() {
+		return projectAttributes;
+	}
+
+	public void setProjectAttributes(Map<String, String> projectAttributes) {
+		this.projectAttributes = projectAttributes;
+	}
+
+}
diff --git a/src/main/java/com/epam/ta/reportportal/model/project/config/ProjectSettingsResource.java b/src/main/java/com/epam/ta/reportportal/model/project/config/ProjectSettingsResource.java
new file mode 100644
index 0000000000..25af8cc81b
--- /dev/null
+++ b/src/main/java/com/epam/ta/reportportal/model/project/config/ProjectSettingsResource.java
@@ -0,0 +1,53 @@
+/*
+ * 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.ta.reportportal.model.project.config;
+
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * Project settings resource output
+ *
+ * @author Andrei_Ramanchuk
+ */
+@JsonInclude(JsonInclude.Include.NON_NULL)
+public class ProjectSettingsResource {
+
+  @JsonProperty(value = "project", required = true)
+  private Long projectId;
+
+  @JsonProperty(value = "subTypes", required = true)
+  private Map<String, List<IssueSubTypeResource>> subTypes;
+
+  public Long getProjectId() {
+    return projectId;
+  }
+
+  public void setProjectId(Long projectId) {
+    this.projectId = projectId;
+  }
+
+  public void setSubTypes(Map<String, List<IssueSubTypeResource>> types) {
+    this.subTypes = types;
+  }
+
+  public Map<String, List<IssueSubTypeResource>> getSubTypes() {
+    return subTypes;
+  }
+}
diff --git a/src/main/java/com/epam/ta/reportportal/model/project/config/UpdateIssueSubTypeRQ.java b/src/main/java/com/epam/ta/reportportal/model/project/config/UpdateIssueSubTypeRQ.java
new file mode 100644
index 0000000000..53ffd5ff15
--- /dev/null
+++ b/src/main/java/com/epam/ta/reportportal/model/project/config/UpdateIssueSubTypeRQ.java
@@ -0,0 +1,67 @@
+/*
+ * 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.
+ */
+/*
+ * This file is part of Report Portal.
+ *
+ * Report Portal is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Report Portal is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Report Portal.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epam.ta.reportportal.model.project.config;
+
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonInclude.Include;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import io.swagger.annotations.ApiModelProperty;
+import java.util.List;
+import javax.validation.Valid;
+import javax.validation.constraints.NotEmpty;
+
+/**
+ * Request model for existing issue sub type update for specified project.<br>
+ *
+ * @author Andrei_Ramanchuk
+ */
+@JsonInclude(Include.NON_NULL)
+public class UpdateIssueSubTypeRQ {
+
+  @Valid
+  @NotEmpty
+  @JsonProperty(value = "ids", required = true)
+  @ApiModelProperty(required = true)
+  private List<UpdateOneIssueSubTypeRQ> ids;
+
+  public UpdateIssueSubTypeRQ() {
+  }
+
+  public void setIds(List<UpdateOneIssueSubTypeRQ> values) {
+    this.ids = values;
+  }
+
+  public List<UpdateOneIssueSubTypeRQ> getIds() {
+    return ids;
+  }
+}
diff --git a/src/main/java/com/epam/ta/reportportal/model/project/config/UpdateOneIssueSubTypeRQ.java b/src/main/java/com/epam/ta/reportportal/model/project/config/UpdateOneIssueSubTypeRQ.java
new file mode 100644
index 0000000000..20c5ed3e03
--- /dev/null
+++ b/src/main/java/com/epam/ta/reportportal/model/project/config/UpdateOneIssueSubTypeRQ.java
@@ -0,0 +1,105 @@
+/*
+ * 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.ta.reportportal.model.project.config;
+
+import static com.epam.ta.reportportal.ws.model.ValidationConstraints.HEX_COLOR_REGEXP;
+
+import com.epam.ta.reportportal.ws.model.ValidationConstraints;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonInclude.Include;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import io.swagger.annotations.ApiModelProperty;
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.Pattern;
+import javax.validation.constraints.Size;
+
+/**
+ * One settings sub-type update request representation
+ *
+ * @author Andrei_Ramanchuk
+ */
+@JsonInclude(Include.NON_NULL)
+public class UpdateOneIssueSubTypeRQ {
+
+	@NotBlank
+	@JsonProperty(value = "locator", required = true)
+	@ApiModelProperty(required = true)
+	private String locator;
+
+	@NotBlank
+	@JsonProperty(value = "typeRef", required = true)
+	@ApiModelProperty(required = true)
+	private String typeRef;
+
+	@NotBlank
+	@JsonProperty(value = "longName")
+	@Size(min = ValidationConstraints.MIN_SUBTYPE_LONG_NAME, max = ValidationConstraints.MAX_SUBTYPE_LONG_NAME)
+	private String longName;
+
+	@NotBlank
+	@JsonProperty(value = "shortName")
+	@Size(min = ValidationConstraints.MIN_SUBTYPE_SHORT_NAME, max = ValidationConstraints.MAX_SUBTYPE_SHORT_NAME)
+	private String shortName;
+
+	@NotBlank
+	@Pattern(regexp = HEX_COLOR_REGEXP)
+	@JsonProperty(value = "color")
+	@Size(min = ValidationConstraints.MIN_SUBTYPE_LONG_NAME, max = ValidationConstraints.MAX_SUBTYPE_LONG_NAME)
+	private String color;
+
+	public UpdateOneIssueSubTypeRQ() {
+	}
+
+	public String getLocator() {
+		return locator;
+	}
+
+	public void setLocator(String locator) {
+		this.locator = locator;
+	}
+
+	public void setTypeRef(String typeRef) {
+		this.typeRef = typeRef;
+	}
+
+	public String getTypeRef() {
+		return typeRef;
+	}
+
+	public void setLongName(String longName) {
+		this.longName = longName;
+	}
+
+	public String getLongName() {
+		return longName;
+	}
+
+	public void setShortName(String shortName) {
+		this.shortName = shortName;
+	}
+
+	public String getShortName() {
+		return shortName;
+	}
+
+	public void setColor(String color) {
+		this.color = color;
+	}
+
+	public String getColor() {
+		return color;
+	}
+}
\ No newline at end of file
diff --git a/src/main/java/com/epam/ta/reportportal/model/project/config/pattern/CreatePatternTemplateRQ.java b/src/main/java/com/epam/ta/reportportal/model/project/config/pattern/CreatePatternTemplateRQ.java
new file mode 100644
index 0000000000..8f2a4e2baf
--- /dev/null
+++ b/src/main/java/com/epam/ta/reportportal/model/project/config/pattern/CreatePatternTemplateRQ.java
@@ -0,0 +1,90 @@
+/*
+ * 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.ta.reportportal.model.project.config.pattern;
+
+import static com.epam.ta.reportportal.ws.model.ValidationConstraints.MAX_ANALYSIS_PATTERN_NAME_LENGTH;
+import static com.epam.ta.reportportal.ws.model.ValidationConstraints.MIN_ANALYSIS_PATTERN_NAME_LENGTH;
+
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+import javax.validation.constraints.Size;
+
+/**
+ * @author <a href="mailto:ivan_budayeu@epam.com">Ivan Budayeu</a>
+ */
+@JsonInclude(JsonInclude.Include.NON_NULL)
+public class CreatePatternTemplateRQ {
+
+	@NotBlank
+	@Size(min = MIN_ANALYSIS_PATTERN_NAME_LENGTH, max = MAX_ANALYSIS_PATTERN_NAME_LENGTH)
+	@JsonProperty(value = "name")
+	private String name;
+
+	@NotBlank
+	@JsonProperty(value = "value")
+	private String value;
+
+	@NotBlank
+	@JsonProperty(value = "type")
+	private String type;
+
+	@NotNull
+	@JsonProperty(value = "enabled")
+	private Boolean enabled;
+
+	public CreatePatternTemplateRQ() {
+	}
+
+	public String getName() {
+		return name;
+	}
+
+	public void setName(String name) {
+		this.name = name;
+	}
+
+	public String getValue() {
+		return value;
+	}
+
+	public void setValue(String value) {
+		this.value = value;
+	}
+
+	public String getType() {
+		return type;
+	}
+
+	public void setType(String type) {
+		this.type = type;
+	}
+
+	public Boolean getEnabled() {
+		return enabled;
+	}
+
+	public void setEnabled(Boolean enabled) {
+		this.enabled = enabled;
+	}
+
+	@Override
+	public String toString() {
+		return "UpdatePatternTemplateRQ{" + "name='" + name + '\'' + ", value='" + value + '\'' + ", type='" + type + '\'' + ", enabled=" + enabled + '}';
+	}
+}
diff --git a/src/main/java/com/epam/ta/reportportal/model/project/config/pattern/PatternTemplateResource.java b/src/main/java/com/epam/ta/reportportal/model/project/config/pattern/PatternTemplateResource.java
new file mode 100644
index 0000000000..7f06ea87c3
--- /dev/null
+++ b/src/main/java/com/epam/ta/reportportal/model/project/config/pattern/PatternTemplateResource.java
@@ -0,0 +1,91 @@
+/*
+ * 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.ta.reportportal.model.project.config.pattern;
+
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * @author <a href="mailto:ivan_budayeu@epam.com">Ivan Budayeu</a>
+ */
+@JsonInclude(JsonInclude.Include.NON_NULL)
+public class PatternTemplateResource {
+
+	@JsonProperty(value = "id")
+	private Long id;
+
+	@JsonProperty(value = "name")
+	private String name;
+
+	@JsonProperty(value = "value")
+	private String value;
+
+	@JsonProperty(value = "type")
+	private String type;
+
+	@JsonProperty(value = "enabled")
+	private Boolean enabled;
+
+	public PatternTemplateResource() {
+	}
+
+	public Long getId() {
+		return id;
+	}
+
+	public void setId(Long id) {
+		this.id = id;
+	}
+
+	public String getName() {
+		return name;
+	}
+
+	public void setName(String name) {
+		this.name = name;
+	}
+
+	public String getValue() {
+		return value;
+	}
+
+	public void setValue(String value) {
+		this.value = value;
+	}
+
+	public String getType() {
+		return type;
+	}
+
+	public void setType(String type) {
+		this.type = type;
+	}
+
+	public Boolean getEnabled() {
+		return enabled;
+	}
+
+	public void setEnabled(Boolean enabled) {
+		this.enabled = enabled;
+	}
+
+	@Override
+	public String toString() {
+		return "UpdatePatternTemplateRQ{" + "name='" + name + '\'' + ", value='" + value + '\'' + ", type='" + type + '\'' + ", enabled="
+				+ enabled + '}';
+	}
+}
diff --git a/src/main/java/com/epam/ta/reportportal/model/project/config/pattern/UpdatePatternTemplateRQ.java b/src/main/java/com/epam/ta/reportportal/model/project/config/pattern/UpdatePatternTemplateRQ.java
new file mode 100644
index 0000000000..c5305fad78
--- /dev/null
+++ b/src/main/java/com/epam/ta/reportportal/model/project/config/pattern/UpdatePatternTemplateRQ.java
@@ -0,0 +1,66 @@
+/*
+ * 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.ta.reportportal.model.project.config.pattern;
+
+import static com.epam.ta.reportportal.ws.model.ValidationConstraints.MAX_ANALYSIS_PATTERN_NAME_LENGTH;
+import static com.epam.ta.reportportal.ws.model.ValidationConstraints.MIN_ANALYSIS_PATTERN_NAME_LENGTH;
+
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+import javax.validation.constraints.Size;
+
+/**
+ * @author <a href="mailto:ivan_budayeu@epam.com">Ivan Budayeu</a>
+ */
+@JsonInclude(JsonInclude.Include.NON_NULL)
+public class UpdatePatternTemplateRQ {
+
+	@NotBlank
+	@Size(min = MIN_ANALYSIS_PATTERN_NAME_LENGTH, max = MAX_ANALYSIS_PATTERN_NAME_LENGTH)
+	@JsonProperty(value = "name")
+	private String name;
+
+	@NotNull
+	@JsonProperty(value = "enabled")
+	private Boolean enabled;
+
+	public UpdatePatternTemplateRQ() {
+	}
+
+	public String getName() {
+		return name;
+	}
+
+	public void setName(String name) {
+		this.name = name;
+	}
+
+	public Boolean getEnabled() {
+		return enabled;
+	}
+
+	public void setEnabled(Boolean enabled) {
+		this.enabled = enabled;
+	}
+
+	@Override
+	public String toString() {
+		return "UpdatePatternTemplateRQ{" + "name='" + name + '\'' + ", enabled=" + enabled + '}';
+	}
+}
diff --git a/src/main/java/com/epam/ta/reportportal/model/project/email/ProjectNotificationConfigDTO.java b/src/main/java/com/epam/ta/reportportal/model/project/email/ProjectNotificationConfigDTO.java
new file mode 100644
index 0000000000..c7dec9d606
--- /dev/null
+++ b/src/main/java/com/epam/ta/reportportal/model/project/email/ProjectNotificationConfigDTO.java
@@ -0,0 +1,74 @@
+/*
+ * 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.ta.reportportal.model.project.email;
+
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonInclude.Include;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import java.io.Serializable;
+import java.util.List;
+import javax.validation.Valid;
+
+/**
+ * Project notifications configuration object
+ *
+ * @author Andrei_Ramanchuk
+ */
+@JsonInclude(Include.NON_NULL)
+public class ProjectNotificationConfigDTO implements Serializable {
+  /**
+   * Generated SVUID
+   */
+  private static final long serialVersionUID = -961365872944240700L;
+
+  @JsonProperty(value = "enabled")
+  private boolean enabled;
+
+  @Valid
+  @JsonProperty(value = "cases")
+  private List<SenderCaseDTO> senderCases;
+
+  public ProjectNotificationConfigDTO() {
+  }
+
+  public ProjectNotificationConfigDTO(boolean enabled, List<SenderCaseDTO> senderCases) {
+    this.enabled = enabled;
+    this.senderCases = senderCases;
+  }
+
+  public boolean isEnabled() {
+    return enabled;
+  }
+
+  public void setEnabled(boolean enabled) {
+    this.enabled = enabled;
+  }
+
+  public List<SenderCaseDTO> getSenderCases() {
+    return senderCases;
+  }
+
+  public void setSenderCases(List<SenderCaseDTO> senderCases) {
+    this.senderCases = senderCases;
+  }
+
+  @Override
+  public String toString() {
+    return "ProjectNotificationConfigDTO{" + "enabled=" + enabled + ", senderCases=" + senderCases
+        + '}';
+  }
+}
\ No newline at end of file
diff --git a/src/main/java/com/epam/ta/reportportal/model/project/email/SenderCaseDTO.java b/src/main/java/com/epam/ta/reportportal/model/project/email/SenderCaseDTO.java
new file mode 100644
index 0000000000..fcd8572337
--- /dev/null
+++ b/src/main/java/com/epam/ta/reportportal/model/project/email/SenderCaseDTO.java
@@ -0,0 +1,185 @@
+/*
+ * 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.ta.reportportal.model.project.email;
+
+import com.epam.ta.reportportal.ws.annotations.In;
+import com.epam.ta.reportportal.ws.annotations.NotBlankStringCollection;
+import com.epam.ta.reportportal.ws.model.attribute.ItemAttributeResource;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonInclude.Include;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import io.swagger.annotations.ApiModelProperty;
+import java.io.Serializable;
+import java.util.List;
+import java.util.Objects;
+import java.util.Set;
+import javax.validation.Valid;
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotEmpty;
+
+/**
+ * Cases object for notifications sending declarations
+ *
+ * @author Andrei_Ramanchuk
+ */
+@JsonInclude(Include.NON_NULL)
+public class SenderCaseDTO implements Serializable {
+	/**
+	 * Generated SVUID
+	 */
+	private static final long serialVersionUID = -3546546654348861010L;
+
+	@JsonProperty("id")
+	private Long id;
+
+	@NotEmpty
+	@JsonProperty("ruleName")
+	private String ruleName;
+
+	@NotEmpty
+	@NotBlankStringCollection
+	@JsonProperty(value = "recipients")
+	private List<String> recipients;
+
+	@NotBlank
+	@JsonProperty(value = "sendCase")
+	@In(allowedValues = { "always", "failed", "toInvestigate", "more10", "more20", "more50" })
+	@ApiModelProperty(allowableValues = "ALWAYS, FAILED, MORE_10, MORE_20, MORE_50")
+	private String sendCase;
+
+	@NotBlankStringCollection
+	@JsonProperty(value = "launchNames")
+	private List<String> launchNames;
+
+	@Valid
+	@JsonProperty(value = "attributes")
+	private Set<ItemAttributeResource> attributes;
+
+	@JsonProperty(value = "enabled")
+	private boolean enabled;
+
+	@NotBlank
+	@JsonProperty(value = "attributesOperator")
+	@In(allowedValues = { "and", "or" })
+	@ApiModelProperty(allowableValues = "AND, OR")
+	private String attributesOperator;
+
+	public SenderCaseDTO() {
+	}
+
+	public SenderCaseDTO(Long id, String ruleName, List<String> recs, String sendMode,
+			List<String> laNames, Set<ItemAttributeResource> attributes, boolean enabled) {
+		this.id = id;
+		this.ruleName = ruleName;
+		this.recipients = recs;
+		this.sendCase = sendMode;
+		this.launchNames = laNames;
+		this.attributes = attributes;
+		this.enabled = enabled;
+	}
+
+	/* Getters and setters block */
+	public Long getId() {
+		return id;
+	}
+
+	public void setId(Long id) {
+		this.id = id;
+	}
+
+	public String getRuleName() {
+		return ruleName;
+	}
+
+	public void setRuleName(String ruleName) {
+		this.ruleName = ruleName;
+	}
+
+	public void setRecipients(List<String> recipients) {
+		this.recipients = recipients;
+	}
+
+	public List<String> getRecipients() {
+		return recipients;
+	}
+
+	public void setSendCase(String value) {
+		this.sendCase = value;
+	}
+
+	public String getSendCase() {
+		return sendCase;
+	}
+
+	public void setLaunchNames(List<String> value) {
+		this.launchNames = value;
+	}
+
+	public List<String> getLaunchNames() {
+		return launchNames;
+	}
+
+	public Set<ItemAttributeResource> getAttributes() {
+		return attributes;
+	}
+
+	public void setAttributes(Set<ItemAttributeResource> attributes) {
+		this.attributes = attributes;
+	}
+
+	public boolean isEnabled() {
+		return enabled;
+	}
+
+	public void setEnabled(boolean enabled) {
+		this.enabled = enabled;
+	}
+
+	public String getAttributesOperator() {
+		return attributesOperator;
+	}
+
+	public void setAttributesOperator(String attributesOperator) {
+		this.attributesOperator = attributesOperator;
+	}
+
+	/* Auto generated methods */
+	@Override
+	public String toString() {
+		return "SenderCaseDTO{" + "recipients=" + recipients + ", sendCase='" + sendCase + '\'' +
+				", launchNames=" + launchNames + ", attributes=" + attributes + ", enabled=" + enabled + ", attributesOperator=" + attributesOperator + '}';
+	}
+
+	@Override
+	public boolean equals(Object o) {
+		if (this == o) {
+			return true;
+		}
+		if (o == null || getClass() != o.getClass()) {
+			return false;
+		}
+		SenderCaseDTO that = (SenderCaseDTO) o;
+		return Objects.equals(recipients, that.recipients) && Objects.equals(sendCase, that.sendCase)
+				&& Objects.equals(launchNames, that.launchNames) && Objects.equals(attributes, that.attributes)
+				&& Objects.equals(enabled, that.enabled) && Objects.equals(attributesOperator, that.attributesOperator);
+	}
+
+	@Override
+	public int hashCode() {
+		return Objects.hash(recipients, sendCase, launchNames, attributes, enabled, attributesOperator);
+	}
+}
diff --git a/src/main/java/com/epam/ta/reportportal/model/role/SaveRoleRQ.java b/src/main/java/com/epam/ta/reportportal/model/role/SaveRoleRQ.java
new file mode 100644
index 0000000000..6d8b297771
--- /dev/null
+++ b/src/main/java/com/epam/ta/reportportal/model/role/SaveRoleRQ.java
@@ -0,0 +1,65 @@
+/*
+ * 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.ta.reportportal.model.role;
+
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonInclude.Include;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import javax.validation.constraints.NotNull;
+
+/**
+ * 
+ * @author Siarhei_Kharlanau
+ * 
+ */
+@JsonInclude(Include.NON_NULL)
+public class SaveRoleRQ {
+
+	@NotNull
+	@JsonProperty(value = "roleName", required = true)
+	private String roleName;
+
+	@NotNull
+	@JsonProperty(value = "permissions", required = true)
+	private String permissions;
+
+	public String getRoleName() {
+		return roleName;
+	}
+
+	public void setRoleName(String roleName) {
+		this.roleName = roleName;
+	}
+
+	public String getPermissions() {
+		return permissions;
+	}
+
+	public void setPermissions(String permissions) {
+		this.permissions = permissions;
+	}
+
+	@Override
+	public String toString() {
+		final StringBuilder sb = new StringBuilder("SaveRoleRQ{");
+		sb.append("roleName='").append(roleName).append('\'');
+		sb.append(", permissions='").append(permissions).append('\'');
+		sb.append('}');
+		return sb.toString();
+	}
+
+}
\ No newline at end of file
diff --git a/src/main/java/com/epam/ta/reportportal/model/settings/AnalyticsResource.java b/src/main/java/com/epam/ta/reportportal/model/settings/AnalyticsResource.java
new file mode 100644
index 0000000000..27877551b2
--- /dev/null
+++ b/src/main/java/com/epam/ta/reportportal/model/settings/AnalyticsResource.java
@@ -0,0 +1,63 @@
+/*
+ * 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.ta.reportportal.model.settings;
+
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonInclude.Include;
+import java.io.Serializable;
+import javax.validation.constraints.NotBlank;
+
+@JsonInclude(Include.NON_NULL)
+public class AnalyticsResource implements Serializable {
+
+	private Boolean enabled;
+
+	@NotBlank
+	private String type;
+
+	public AnalyticsResource() {
+	}
+
+	public AnalyticsResource(Boolean enabled) {
+		this.enabled = enabled;
+	}
+
+	public Boolean getEnabled() {
+		return enabled;
+	}
+
+	public void setEnabled(Boolean enabled) {
+		this.enabled = enabled;
+	}
+
+	public String getType() {
+		return type;
+	}
+
+	public void setType(String type) {
+		this.type = type;
+	}
+
+	@Override
+	public String toString() {
+		final StringBuilder sb = new StringBuilder("AnalyticsResource{");
+		sb.append(", enabled=").append(enabled);
+		sb.append(", type='").append(type).append('\'');
+		sb.append('}');
+		return sb.toString();
+	}
+}
diff --git a/src/main/java/com/epam/ta/reportportal/model/settings/ServerEmailResource.java b/src/main/java/com/epam/ta/reportportal/model/settings/ServerEmailResource.java
new file mode 100644
index 0000000000..d3a557dce5
--- /dev/null
+++ b/src/main/java/com/epam/ta/reportportal/model/settings/ServerEmailResource.java
@@ -0,0 +1,170 @@
+/*
+ * 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.ta.reportportal.model.settings;
+
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonInclude.Include;
+import java.io.Serializable;
+import javax.validation.constraints.NotBlank;
+
+/**
+ * Configurable email setting for project object
+ *
+ * @author Andrei_Ramanchuk
+ */
+@JsonInclude(Include.NON_NULL)
+public class ServerEmailResource implements Serializable {
+
+	/**
+	 * Generated sUID
+	 */
+	private static final long serialVersionUID = 2573744596368345366L;
+
+	private boolean enabled = true;
+
+	@NotBlank
+	private String host;
+
+	private Integer port;
+
+	private String protocol;
+
+	private Boolean authEnabled;
+
+	private Boolean starTlsEnabled;
+
+	private Boolean sslEnabled;
+
+	private String username;
+
+	private String password;
+
+	private String from;
+
+	public ServerEmailResource() {
+	}
+
+	public ServerEmailResource(Boolean enabled, String host, Integer port, String protocol, Boolean authEnabled, Boolean starTlsEnabled,
+			Boolean sslEnabled, String username, String password, String from) {
+		this.enabled = enabled;
+		this.host = host;
+		this.port = port;
+		this.protocol = protocol;
+		this.authEnabled = authEnabled;
+		this.starTlsEnabled = starTlsEnabled;
+		this.sslEnabled = sslEnabled;
+		this.username = username;
+		this.password = password;
+		this.from = from;
+	}
+
+	public boolean isEnabled() {
+		return enabled;
+	}
+
+	public void setEnabled(boolean enabled) {
+		this.enabled = enabled;
+	}
+
+	public String getHost() {
+		return host;
+	}
+
+	public void setHost(String host) {
+		this.host = host;
+	}
+
+	public Integer getPort() {
+		return port;
+	}
+
+	public void setPort(Integer port) {
+		this.port = port;
+	}
+
+	public String getProtocol() {
+		return protocol;
+	}
+
+	public void setProtocol(String protocol) {
+		this.protocol = protocol;
+	}
+
+	public Boolean getAuthEnabled() {
+		return authEnabled;
+	}
+
+	public void setAuthEnabled(Boolean authEnabled) {
+		this.authEnabled = authEnabled;
+	}
+
+	public Boolean getStarTlsEnabled() {
+		return starTlsEnabled;
+	}
+
+	public void setStarTlsEnabled(Boolean starTlsEnabled) {
+		this.starTlsEnabled = starTlsEnabled;
+	}
+
+	public Boolean getSslEnabled() {
+		return sslEnabled;
+	}
+
+	public void setSslEnabled(Boolean sslEnabled) {
+		this.sslEnabled = sslEnabled;
+	}
+
+	public String getUsername() {
+		return username;
+	}
+
+	public void setUsername(String username) {
+		this.username = username;
+	}
+
+	public String getPassword() {
+		return password;
+	}
+
+	public void setPassword(String password) {
+		this.password = password;
+	}
+
+	public String getFrom() {
+		return from;
+	}
+
+	public void setFrom(String from) {
+		this.from = from;
+	}
+
+	@Override
+	public String toString() {
+		final StringBuilder sb = new StringBuilder("ServerEmailResource{");
+		sb.append("host='").append(host).append('\'');
+		sb.append(", port=").append(port);
+		sb.append(", protocol='").append(protocol).append('\'');
+		sb.append(", authEnabled=").append(authEnabled);
+		sb.append(", starTlsEnabled=").append(starTlsEnabled);
+		sb.append(", sslEnabled=").append(sslEnabled);
+		sb.append(", username='").append(username).append('\'');
+		sb.append(", password='").append(password).append('\'');
+		sb.append(", from='").append(from).append('\'');
+		sb.append('}');
+		return sb.toString();
+	}
+}
diff --git a/src/main/java/com/epam/ta/reportportal/model/settings/ServerSettingsResource.java b/src/main/java/com/epam/ta/reportportal/model/settings/ServerSettingsResource.java
new file mode 100644
index 0000000000..51c24a23ec
--- /dev/null
+++ b/src/main/java/com/epam/ta/reportportal/model/settings/ServerSettingsResource.java
@@ -0,0 +1,82 @@
+/*
+ * 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.ta.reportportal.model.settings;
+
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonInclude.Include;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import java.util.Map;
+
+/**
+ * Global server settings response of stored properties
+ *
+ * @author Andrei_Ramanchuk
+ */
+@JsonInclude(Include.NON_NULL)
+public class ServerSettingsResource {
+
+  private String profile;
+
+  private boolean active;
+
+  @JsonProperty(value = "serverEmailConfig")
+  private ServerEmailResource serverEmailResource;
+
+  //	private Map<String, OAuthDetailsResource> oauthConfigs;
+
+  private Map<String, AnalyticsResource> analyticsResource;
+
+  public void setProfile(String id) {
+    this.profile = id;
+  }
+
+  public String getProfile() {
+    return profile;
+  }
+
+  public void setActive(boolean is) {
+    this.active = is;
+  }
+
+  public boolean getActive() {
+    return active;
+  }
+
+  public void setServerEmailResource(ServerEmailResource config) {
+    this.serverEmailResource = config;
+  }
+
+  public ServerEmailResource getServerEmailResource() {
+    return serverEmailResource;
+  }
+
+  //	public Map<String, OAuthDetailsResource> getOauthConfigs() {
+  //		return oauthConfigs;
+  //	}
+
+  //	public void setOauthConfigs(Map<String, OAuthDetailsResource> oauthConfigs) {
+  //		this.oauthConfigs = oauthConfigs;
+  //	}
+
+  public Map<String, AnalyticsResource> getAnalyticsResource() {
+    return analyticsResource;
+  }
+
+  public void setAnalyticsResource(Map<String, AnalyticsResource> analyticsResource) {
+    this.analyticsResource = analyticsResource;
+  }
+}
diff --git a/src/main/java/com/epam/ta/reportportal/model/user/ChangePasswordRQ.java b/src/main/java/com/epam/ta/reportportal/model/user/ChangePasswordRQ.java
new file mode 100644
index 0000000000..fe1e0f7c51
--- /dev/null
+++ b/src/main/java/com/epam/ta/reportportal/model/user/ChangePasswordRQ.java
@@ -0,0 +1,88 @@
+/*
+ * 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.ta.reportportal.model.user;
+
+import com.epam.ta.reportportal.ws.model.ValidationConstraints;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.Size;
+
+/**
+ * @author Dzmitry_Kavalets
+ */
+
+@JsonInclude(JsonInclude.Include.NON_NULL)
+public class ChangePasswordRQ {
+
+	@NotBlank
+	@Size(min = ValidationConstraints.MIN_PASSWORD_LENGTH, max = ValidationConstraints.MAX_PASSWORD_LENGTH)
+	private String newPassword;
+
+	@NotBlank
+	@Size(min = ValidationConstraints.MIN_PASSWORD_LENGTH, max = ValidationConstraints.MAX_PASSWORD_LENGTH)
+	private String oldPassword;
+
+	public String getNewPassword() {
+		return newPassword;
+	}
+
+	public void setNewPassword(String newPassword) {
+		this.newPassword = newPassword;
+	}
+
+	public String getOldPassword() {
+		return oldPassword;
+	}
+
+	public void setOldPassword(String oldPassword) {
+		this.oldPassword = oldPassword;
+	}
+
+	@Override
+	public boolean equals(Object o) {
+		if (this == o) {
+			return true;
+		}
+		if (o == null || getClass() != o.getClass()) {
+			return false;
+		}
+
+		ChangePasswordRQ that = (ChangePasswordRQ) o;
+
+		if (newPassword != null ? !newPassword.equals(that.newPassword) : that.newPassword != null) {
+			return false;
+		}
+		return !(oldPassword != null ? !oldPassword.equals(that.oldPassword) : that.oldPassword != null);
+
+	}
+
+	@Override
+	public int hashCode() {
+		int result = newPassword != null ? newPassword.hashCode() : 0;
+		result = 31 * result + (oldPassword != null ? oldPassword.hashCode() : 0);
+		return result;
+	}
+
+	@Override
+	public String toString() {
+		final StringBuilder sb = new StringBuilder("ChangePasswordRQ{");
+		sb.append("newPassword='").append(newPassword).append('\''); //NOSONAR
+		sb.append(", oldPassword='").append(oldPassword).append('\''); //NOSONAR
+		sb.append('}');
+		return sb.toString();
+	}
+}
\ No newline at end of file
diff --git a/src/main/java/com/epam/ta/reportportal/model/user/CreateUserBidRS.java b/src/main/java/com/epam/ta/reportportal/model/user/CreateUserBidRS.java
new file mode 100644
index 0000000000..2a979cccae
--- /dev/null
+++ b/src/main/java/com/epam/ta/reportportal/model/user/CreateUserBidRS.java
@@ -0,0 +1,58 @@
+/*
+ * 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.ta.reportportal.model.user;
+
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonInclude.Include;
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+@JsonInclude(Include.NON_NULL)
+public class CreateUserBidRS {
+
+	@JsonProperty(value = "message")
+	private String message;
+
+	@JsonProperty(value = "bid")
+	private String bid;
+
+	@JsonProperty(value = "backLink")
+	private String backLink;
+
+	public void setMessage(String value) {
+		this.message = value;
+	}
+
+	public String getMessage() {
+		return message;
+	}
+
+	public void setBid(String uuid) {
+		this.bid = uuid;
+	}
+
+	public String getBid() {
+		return bid;
+	}
+
+	public void setBackLink(String link) {
+		this.backLink = link;
+	}
+
+	public String getBackLink() {
+		return backLink;
+	}
+}
\ No newline at end of file
diff --git a/src/main/java/com/epam/ta/reportportal/model/user/CreateUserRQ.java b/src/main/java/com/epam/ta/reportportal/model/user/CreateUserRQ.java
new file mode 100644
index 0000000000..4865906963
--- /dev/null
+++ b/src/main/java/com/epam/ta/reportportal/model/user/CreateUserRQ.java
@@ -0,0 +1,83 @@
+/*
+ * 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.ta.reportportal.model.user;
+
+import com.epam.ta.reportportal.ws.annotations.In;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonInclude.Include;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import io.swagger.annotations.ApiModelProperty;
+import javax.validation.constraints.NotBlank;
+
+/**
+ * Request model for user creation (confirmation will be send on email)
+ *
+ * @author Andrei_Ramanchuk
+ */
+@JsonInclude(Include.NON_NULL)
+public class CreateUserRQ {
+
+	@NotBlank
+	@JsonProperty(value = "email", required = true)
+	@ApiModelProperty(required = true)
+	private String email;
+
+	@NotBlank
+	@JsonProperty(value = "role", required = true)
+	@In(allowedValues = { "operator", "customer", "member", "project_manager" })
+	@ApiModelProperty(required = true)
+	private String role;
+
+	@NotBlank
+	@JsonProperty(value = "defaultProject", required = true)
+	@ApiModelProperty(required = true)
+	private String defaultProject;
+
+	public String getEmail() {
+		return email;
+	}
+
+	public void setEmail(String email) {
+		this.email = email;
+	}
+
+	public String getRole() {
+		return role;
+	}
+
+	public void setRole(String role) {
+		this.role = role;
+	}
+
+	public String getDefaultProject() {
+		return defaultProject;
+	}
+
+	public void setDefaultProject(String value) {
+		this.defaultProject = value;
+	}
+
+	@Override
+	public String toString() {
+		final StringBuilder sb = new StringBuilder("CreateUserRQ{");
+		sb.append("email='").append(email).append('\'');
+		sb.append(", role='").append(role).append('\'');
+		sb.append(", defaultProject='").append(defaultProject).append('\'');
+		sb.append('}');
+		return sb.toString();
+	}
+}
\ No newline at end of file
diff --git a/src/main/java/com/epam/ta/reportportal/model/user/CreateUserRQConfirm.java b/src/main/java/com/epam/ta/reportportal/model/user/CreateUserRQConfirm.java
new file mode 100644
index 0000000000..a664b0f0c6
--- /dev/null
+++ b/src/main/java/com/epam/ta/reportportal/model/user/CreateUserRQConfirm.java
@@ -0,0 +1,103 @@
+/*
+ * 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.ta.reportportal.model.user;
+
+import com.epam.ta.reportportal.ws.model.ValidationConstraints;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonInclude.Include;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import io.swagger.annotations.ApiModelProperty;
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.Pattern;
+import javax.validation.constraints.Size;
+
+/**
+ * Confirmation resource of user creation with user-data
+ *
+ * @author Andrei_Ramanchuk
+ */
+@JsonInclude(Include.NON_NULL)
+public class CreateUserRQConfirm {
+
+	@NotBlank
+	@Pattern(regexp = "[a-zA-Z0-9-_.]+")
+	@Size(min = ValidationConstraints.MIN_LOGIN_LENGTH, max = ValidationConstraints.MAX_LOGIN_LENGTH)
+	@JsonProperty(value = "login", required = true)
+	@ApiModelProperty(required = true)
+	private String login;
+
+	@NotBlank
+	@Size(min = ValidationConstraints.MIN_PASSWORD_LENGTH, max = ValidationConstraints.MAX_PASSWORD_LENGTH)
+	@JsonProperty(value = "password", required = true)
+	@ApiModelProperty(required = true)
+	private String password;
+
+	@NotBlank
+	@Pattern(regexp = "[\\pL0-9-_ \\.]+")
+	@Size(min = ValidationConstraints.MIN_USER_NAME_LENGTH, max = ValidationConstraints.MAX_USER_NAME_LENGTH)
+	@JsonProperty(value = "fullName", required = true)
+	@ApiModelProperty(required = true)
+	private String fullName;
+
+	@NotBlank
+	@JsonProperty(value = "email", required = true)
+	@ApiModelProperty(required = true)
+	private String email;
+
+	public void setLogin(String value) {
+		this.login = value;
+	}
+
+	public String getLogin() {
+		return login;
+	}
+
+	public void setPassword(String value) {
+		this.password = value;
+	}
+
+	public String getPassword() {
+		return password;
+	}
+
+	public void setFullName(String value) {
+		this.fullName = value;
+	}
+
+	public String getFullName() {
+		return fullName;
+	}
+
+	public String getEmail() {
+		return email;
+	}
+
+	public void setEmail(String email) {
+		this.email = email;
+	}
+
+	@Override
+	public String toString() {
+		final StringBuilder sb = new StringBuilder("CreateUserRQConfirm{");
+		sb.append("login='").append(login).append('\'');
+		sb.append(", password='").append(password).append('\'');
+		sb.append(", fullName='").append(fullName).append('\'');
+		sb.append(", email='").append(email).append('\'');
+		sb.append('}');
+		return sb.toString();
+	}
+}
\ No newline at end of file
diff --git a/src/main/java/com/epam/ta/reportportal/model/user/CreateUserRQFull.java b/src/main/java/com/epam/ta/reportportal/model/user/CreateUserRQFull.java
new file mode 100644
index 0000000000..36f30d779c
--- /dev/null
+++ b/src/main/java/com/epam/ta/reportportal/model/user/CreateUserRQFull.java
@@ -0,0 +1,141 @@
+/*
+ * 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.ta.reportportal.model.user;
+
+import com.epam.ta.reportportal.ws.annotations.In;
+import com.epam.ta.reportportal.ws.model.ValidationConstraints;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonInclude.Include;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import io.swagger.annotations.ApiModelProperty;
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+import javax.validation.constraints.Pattern;
+import javax.validation.constraints.Size;
+
+/**
+ * Create User request for admin user creation functionality
+ *
+ * @author Andrei_Ramanchuk
+ */
+@JsonInclude(Include.NON_NULL)
+public class CreateUserRQFull {
+
+	@NotBlank
+	@Pattern(regexp = "[a-zA-Z0-9-_.]+")
+	@Size(min = ValidationConstraints.MIN_LOGIN_LENGTH, max = ValidationConstraints.MAX_LOGIN_LENGTH)
+	@JsonProperty(value = "login", required = true)
+	@ApiModelProperty(required = true)
+	private String login;
+
+	@NotBlank
+	@Size(min = ValidationConstraints.MIN_PASSWORD_LENGTH, max = ValidationConstraints.MAX_PASSWORD_LENGTH)
+	@JsonProperty(value = "password", required = true)
+	@ApiModelProperty(required = true)
+	private String password;
+
+	@NotBlank
+	@Pattern(regexp = "[\\pL0-9-_ \\.]+")
+	@Size(min = ValidationConstraints.MIN_USER_NAME_LENGTH, max = ValidationConstraints.MAX_USER_NAME_LENGTH)
+	@JsonProperty(value = "fullName", required = true)
+	@ApiModelProperty(required = true)
+	private String fullName;
+
+	@NotBlank
+	@JsonProperty(value = "email", required = true)
+	@ApiModelProperty(required = true)
+	private String email;
+
+	@NotNull
+	@JsonProperty(value = "accountRole", required = true)
+	@In(allowedValues = { "user", "administrator" })
+	@ApiModelProperty(required = true, allowableValues = "USER, ADMINISTRATOR")
+	private String accountRole;
+
+	@NotNull
+	@JsonProperty(value = "projectRole", required = true)
+	@In(allowedValues = { "operator", "customer", "member", "project_manager" })
+	@ApiModelProperty(required = true, allowableValues = "CUSTOMER, MEMBER, LEAD, PROJECT_MANAGER")
+	private String projectRole;
+
+	@NotBlank
+	@JsonProperty(value = "defaultProject", required = true)
+	@ApiModelProperty(required = true)
+	private String defaultProject;
+
+	public void setLogin(String value) {
+		this.login = value;
+	}
+
+	public String getLogin() {
+		return login;
+	}
+
+	public void setPassword(String value) {
+		this.password = value;
+	}
+
+	public String getPassword() {
+		return password;
+	}
+
+	public void setFullName(String value) {
+		this.fullName = value;
+	}
+
+	public String getFullName() {
+		return fullName;
+	}
+
+	public String getEmail() {
+		return email;
+	}
+
+	public void setEmail(String email) {
+		this.email = email;
+	}
+
+	public String getAccountRole() {
+		return accountRole;
+	}
+
+	public void setAccountRole(String role) {
+		this.accountRole = role;
+	}
+
+	public String getProjectRole() {
+		return projectRole;
+	}
+
+	public void setProjectRole(String role) {
+		this.projectRole = role;
+	}
+
+	public String getDefaultProject() {
+		return defaultProject;
+	}
+
+	public void setDefaultProject(String value) {
+		this.defaultProject = value;
+	}
+
+	@Override
+	public String toString() {
+		return "CreateUserRQFull [login=" + login + ", password=" + password + ", fullName=" + fullName + ", email=" + email
+				+ ", projectRole=" + projectRole + ", defaultProject=" + defaultProject + "]";
+	}
+}
\ No newline at end of file
diff --git a/src/main/java/com/epam/ta/reportportal/model/user/CreateUserRS.java b/src/main/java/com/epam/ta/reportportal/model/user/CreateUserRS.java
new file mode 100644
index 0000000000..84f6a58c17
--- /dev/null
+++ b/src/main/java/com/epam/ta/reportportal/model/user/CreateUserRS.java
@@ -0,0 +1,60 @@
+/*
+ * 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.ta.reportportal.model.user;
+
+import com.epam.ta.reportportal.model.WarningAwareRS;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonInclude.Include;
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * @author Aliaksandr_Kazantsau
+ */
+@JsonInclude(Include.NON_NULL)
+public class CreateUserRS extends WarningAwareRS {
+
+  @JsonProperty("id")
+  private Long id;
+
+  @JsonProperty("login")
+  private String login;
+
+  public Long getId() {
+    return id;
+  }
+
+  public void setId(Long id) {
+    this.id = id;
+  }
+
+  public String getLogin() {
+    return login;
+  }
+
+  public void setLogin(String login) {
+    this.login = login;
+  }
+
+  @Override
+  public String toString() {
+    final StringBuilder sb = new StringBuilder("CreateUserRS{");
+    sb.append("id=").append(id);
+    sb.append(", login='").append(login).append('\'');
+    sb.append('}');
+    return sb.toString();
+  }
+}
\ No newline at end of file
diff --git a/src/main/java/com/epam/ta/reportportal/model/user/EditUserRQ.java b/src/main/java/com/epam/ta/reportportal/model/user/EditUserRQ.java
new file mode 100644
index 0000000000..c77de134c8
--- /dev/null
+++ b/src/main/java/com/epam/ta/reportportal/model/user/EditUserRQ.java
@@ -0,0 +1,84 @@
+/*
+ * 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.ta.reportportal.model.user;
+
+import com.epam.ta.reportportal.ws.annotations.In;
+import com.epam.ta.reportportal.ws.annotations.NotBlankString;
+import com.epam.ta.reportportal.ws.model.ValidationConstraints;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonInclude.Include;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import javax.validation.constraints.Pattern;
+import javax.validation.constraints.Size;
+
+/**
+ * Edit User request model
+ *
+ * @author Aliaksandr_Kazantsau
+ * @author Andrei_Ramanchuk
+ */
+@JsonInclude(Include.NON_NULL)
+public class EditUserRQ {
+
+	@NotBlankString
+	@JsonProperty(value = "email")
+	private String email;
+
+	@In(allowedValues = { "user", "administrator" })
+	@JsonProperty(value = "role")
+	private String role;
+
+	@NotBlankString
+	@Size(min = ValidationConstraints.MIN_USER_NAME_LENGTH, max = ValidationConstraints.MAX_USER_NAME_LENGTH)
+	@Pattern(regexp = "(\\s*[\\pL0-9-_\\.]+\\s*)+")
+	@JsonProperty(value = "fullName")
+	private String fullName;
+
+	public String getEmail() {
+		return email;
+	}
+
+	public void setEmail(String email) {
+		this.email = email;
+	}
+
+	public String getRole() {
+		return role;
+	}
+
+	public void setRole(String role) {
+		this.role = role;
+	}
+
+	public void setFullName(String value) {
+		this.fullName = value;
+	}
+
+	public String getFullName() {
+		return fullName;
+	}
+
+	@Override
+	public String toString() {
+		final StringBuilder sb = new StringBuilder("EditUserRQ{");
+		sb.append("email='").append(email).append('\'');
+		sb.append(", role='").append(role).append('\'');
+		sb.append(", fullName='").append(fullName).append('\'');
+		sb.append('}');
+		return sb.toString();
+	}
+}
\ No newline at end of file
diff --git a/src/main/java/com/epam/ta/reportportal/model/user/ResetPasswordRQ.java b/src/main/java/com/epam/ta/reportportal/model/user/ResetPasswordRQ.java
new file mode 100644
index 0000000000..4e5addde48
--- /dev/null
+++ b/src/main/java/com/epam/ta/reportportal/model/user/ResetPasswordRQ.java
@@ -0,0 +1,92 @@
+/*
+ * 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.ta.reportportal.model.user;
+
+import com.epam.ta.reportportal.ws.model.ValidationConstraints;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import io.swagger.annotations.ApiModelProperty;
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.Size;
+
+/**
+ * @author Dzmitry_Kavalets
+ */
+@JsonInclude(JsonInclude.Include.NON_NULL)
+public class ResetPasswordRQ {
+
+	@NotBlank
+	@Size(min = ValidationConstraints.MIN_PASSWORD_LENGTH, max = ValidationConstraints.MAX_PASSWORD_LENGTH)
+	@JsonProperty(value = "password")
+	@ApiModelProperty(required = true)
+	private String password;
+
+	@NotBlank
+	@JsonProperty(value = "uuid")
+	@ApiModelProperty(required = true)
+	private String uuid;
+
+	public String getPassword() {
+		return password;
+	}
+
+	public void setPassword(String password) {
+		this.password = password;
+	}
+
+	public String getUuid() {
+		return uuid;
+	}
+
+	public void setUuid(String uuid) {
+		this.uuid = uuid;
+	}
+
+	@Override
+	public boolean equals(Object o) {
+		if (this == o) {
+			return true;
+		}
+		if (o == null || getClass() != o.getClass()) {
+			return false;
+		}
+
+		ResetPasswordRQ that = (ResetPasswordRQ) o;
+
+		if (password != null ? !password.equals(that.password) : that.password != null) {
+			return false;
+		}
+		return !(uuid != null ? !uuid.equals(that.uuid) : that.uuid != null);
+
+	}
+
+	@Override
+	public int hashCode() {
+		int result = password != null ? password.hashCode() : 0;
+		result = 31 * result + (uuid != null ? uuid.hashCode() : 0);
+		return result;
+	}
+
+	@Override
+	public String toString() {
+		final StringBuilder sb = new StringBuilder("RestorePasswordRQ{");
+		sb.append("password='").append(password).append('\''); //NOSONAR
+		sb.append(", uuid='").append(uuid).append('\'');
+		sb.append('}');
+		return sb.toString();
+	}
+}
\ No newline at end of file
diff --git a/src/main/java/com/epam/ta/reportportal/model/user/RestorePasswordRQ.java b/src/main/java/com/epam/ta/reportportal/model/user/RestorePasswordRQ.java
new file mode 100644
index 0000000000..8707e8756a
--- /dev/null
+++ b/src/main/java/com/epam/ta/reportportal/model/user/RestorePasswordRQ.java
@@ -0,0 +1,70 @@
+/*
+ * 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.ta.reportportal.model.user;
+
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import io.swagger.annotations.ApiModelProperty;
+import javax.validation.constraints.NotBlank;
+
+/**
+ * @author Dzmitry_Kavalets
+ */
+@JsonInclude(JsonInclude.Include.NON_NULL)
+public class RestorePasswordRQ {
+
+	@NotBlank
+	@JsonProperty(value = "email")
+	@ApiModelProperty(required = true)
+	private String email;
+
+	public String getEmail() {
+		return email;
+	}
+
+	public void setEmail(String email) {
+		this.email = email;
+	}
+
+	@Override
+	public boolean equals(Object o) {
+		if (this == o) {
+			return true;
+		}
+		if (o == null || getClass() != o.getClass()) {
+			return false;
+		}
+
+		RestorePasswordRQ that = (RestorePasswordRQ) o;
+
+		return !(email != null ? !email.equals(that.email) : that.email != null);
+
+	}
+
+	@Override
+	public int hashCode() {
+		return email != null ? email.hashCode() : 0;
+	}
+
+	@Override
+	public String toString() {
+		final StringBuilder sb = new StringBuilder("ResetPasswordRQ{");
+		sb.append("email='").append(email).append('\'');
+		sb.append('}');
+		return sb.toString();
+	}
+}
\ No newline at end of file
diff --git a/src/main/java/com/epam/ta/reportportal/model/user/SearchUserResource.java b/src/main/java/com/epam/ta/reportportal/model/user/SearchUserResource.java
new file mode 100644
index 0000000000..214e8c4f1a
--- /dev/null
+++ b/src/main/java/com/epam/ta/reportportal/model/user/SearchUserResource.java
@@ -0,0 +1,56 @@
+package com.epam.ta.reportportal.model.user;
+
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonInclude.Include;
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+@JsonInclude(Include.NON_NULL)
+public class SearchUserResource {
+
+	@JsonProperty(value = "id", required = true)
+	private Long id;
+
+	@JsonProperty(value = "login", required = true)
+	private String login;
+
+	@JsonProperty(value = "email", required = true)
+	private String email;
+
+	@JsonProperty(value = "fullName")
+	private String fullName;
+
+	public SearchUserResource() {
+	}
+
+	public Long getId() {
+		return id;
+	}
+
+	public void setId(Long id) {
+		this.id = id;
+	}
+
+	public String getLogin() {
+		return login;
+	}
+
+	public void setLogin(String login) {
+		this.login = login;
+	}
+
+	public String getEmail() {
+		return email;
+	}
+
+	public void setEmail(String email) {
+		this.email = email;
+	}
+
+	public String getFullName() {
+		return fullName;
+	}
+
+	public void setFullName(String fullName) {
+		this.fullName = fullName;
+	}
+}
diff --git a/src/main/java/com/epam/ta/reportportal/model/user/UserBidRS.java b/src/main/java/com/epam/ta/reportportal/model/user/UserBidRS.java
new file mode 100644
index 0000000000..a8df530164
--- /dev/null
+++ b/src/main/java/com/epam/ta/reportportal/model/user/UserBidRS.java
@@ -0,0 +1,63 @@
+/*
+ * 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.ta.reportportal.model.user;
+
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonInclude.Include;
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * User creation bid response
+ *
+ * @author Andrei_Ramanchuk
+ */
+@JsonInclude(Include.NON_NULL)
+public class UserBidRS {
+
+	@JsonProperty("uuid")
+	private String uuid;
+
+	@JsonProperty("isActive")
+	private boolean isActive;
+
+	@JsonProperty("email")
+	private String email;
+
+	public String getUuid() {
+		return uuid;
+	}
+
+	public void setUuid(String uuid) {
+		this.uuid = uuid;
+	}
+
+	public void setIsActive(boolean value) {
+		this.isActive = value;
+	}
+
+	public boolean getIsActive() {
+		return isActive;
+	}
+
+	public void setEmail(String value) {
+		this.email = value;
+	}
+
+	public String getEmail() {
+		return email;
+	}
+}
\ No newline at end of file
diff --git a/src/main/java/com/epam/ta/reportportal/model/user/UserResource.java b/src/main/java/com/epam/ta/reportportal/model/user/UserResource.java
new file mode 100644
index 0000000000..6867eaf2bb
--- /dev/null
+++ b/src/main/java/com/epam/ta/reportportal/model/user/UserResource.java
@@ -0,0 +1,181 @@
+/*
+ * 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.ta.reportportal.model.user;
+
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonInclude.Include;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import java.util.Map;
+import javax.validation.constraints.NotNull;
+
+/**
+ * User resource representation for responses
+ *
+ * @author Andrei_Ramanchuk
+ */
+@JsonInclude(Include.NON_NULL)
+public class UserResource {
+
+	@NotNull
+	@JsonProperty(value = "id", required = true)
+	private Long id;
+
+	@NotNull
+	@JsonProperty(value = "userId", required = true)
+	private String userId;
+
+	@JsonProperty(value = "email", required = true)
+	private String email;
+
+	@JsonProperty(value = "photoId")
+	private String photoId;
+
+	@JsonProperty(value = "fullName")
+	private String fullName;
+
+	@JsonProperty(value = "accountType")
+	private String accountType;
+
+	@JsonProperty(value = "userRole")
+	private String userRole;
+
+	@JsonProperty(value = "photoLoaded")
+	private boolean isLoaded;
+
+	@JsonProperty(value = "metadata")
+	private Object metadata;
+
+	@JsonProperty(value = "assignedProjects")
+	private Map<String, AssignedProject> assignedProjects;
+
+	public Long getId() {
+		return id;
+	}
+
+	public void setId(Long id) {
+		this.id = id;
+	}
+
+	public void setUserId(String value) {
+		this.userId = value;
+	}
+
+	public String getUserId() {
+		return userId;
+	}
+
+	public void setEmail(String value) {
+		this.email = value;
+	}
+
+	public String getEmail() {
+		return email;
+	}
+
+	public void setPhotoId(String value) {
+		this.photoId = value;
+	}
+
+	public String getPhotoId() {
+		return photoId;
+	}
+
+	public void setFullName(String value) {
+		this.fullName = value;
+	}
+
+	public String getFullName() {
+		return fullName;
+	}
+
+	public void setAccountType(String value) {
+		this.accountType = value;
+	}
+
+	public String getAccountType() {
+		return accountType;
+	}
+
+	public String getUserRole() {
+		return userRole;
+	}
+
+	public void setUserRole(String value) {
+		this.userRole = value;
+	}
+
+	public Object getMetadata() {
+		return metadata;
+	}
+
+	public void setMetadata(Object metadata) {
+		this.metadata = metadata;
+	}
+
+	public void setIsLoaded(boolean value) {
+		this.isLoaded = value;
+	}
+
+	public boolean getIsLoaded() {
+		return isLoaded;
+	}
+
+	public Map<String, AssignedProject> getAssignedProjects() {
+		return assignedProjects;
+	}
+
+	public void setAssignedProjects(Map<String, AssignedProject> assignedProjects) {
+		this.assignedProjects = assignedProjects;
+	}
+
+	public static class AssignedProject {
+
+		private String projectRole;
+		private String entryType;
+
+		public String getEntryType() {
+			return entryType;
+		}
+
+		public void setEntryType(String entryType) {
+			this.entryType = entryType;
+		}
+
+		public void setProjectRole(String projectRole) {
+			this.projectRole = projectRole;
+		}
+
+		public String getProjectRole() {
+			return projectRole;
+		}
+
+		@Override
+		public String toString() {
+			final StringBuilder sb = new StringBuilder("AssignedProject{");
+			sb.append("projectRole='").append(projectRole).append('\'');
+			sb.append('}');
+			return sb.toString();
+		}
+	}
+
+	@Override
+	public String toString() {
+		return "UserResource{" + "id=" + id + ", userId='" + userId + '\'' + ", email='" + email + '\'' + ", photoId='" + photoId + '\''
+				+ ", fullName='" + fullName + '\'' + ", accountType='" + accountType + '\'' + ", userRole='" + userRole + '\''
+				+ ", isLoaded=" + isLoaded + ", metadata=" + metadata + ", assignedProjects=" + assignedProjects + '}';
+	}
+}
diff --git a/src/main/java/com/epam/ta/reportportal/model/validation/NotBlankWithSizeValidator.java b/src/main/java/com/epam/ta/reportportal/model/validation/NotBlankWithSizeValidator.java
new file mode 100644
index 0000000000..3a86215e7d
--- /dev/null
+++ b/src/main/java/com/epam/ta/reportportal/model/validation/NotBlankWithSizeValidator.java
@@ -0,0 +1,71 @@
+/*
+ * 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.ta.reportportal.model.validation;
+
+import com.epam.ta.reportportal.ws.annotations.NotBlankWithSize;
+import javax.validation.ConstraintValidator;
+import javax.validation.ConstraintValidatorContext;
+import org.apache.commons.lang3.StringUtils;
+
+/**
+ * @author <a href="mailto:tatyana_gladysheva@epam.com">Tatyana Gladysheva</a>
+ */
+public class NotBlankWithSizeValidator implements ConstraintValidator<NotBlankWithSize, String> {
+
+	private static final String NOT_NULL_PROPERTY = "{NotNull}";
+	private static final String NOT_BLANK_PROPERTY = "{NotBlank}";
+	private static final String SIZE_PROPERTY = "{Size}";
+	private static final String SPACE = " ";
+
+	private int min;
+	private int max;
+
+	@Override
+	public void initialize(NotBlankWithSize notBlankWithSizeAnnotation) {
+		this.min = notBlankWithSizeAnnotation.min();
+		this.max = notBlankWithSizeAnnotation.max();
+	}
+
+	@Override
+	public boolean isValid(String value, ConstraintValidatorContext context) {
+		boolean result;
+		if (value == null) {
+			result = false;
+
+			setValidationMessage(NOT_NULL_PROPERTY, context);
+
+		} else if (StringUtils.isBlank(value)) {
+			result = false;
+
+			String message = NOT_BLANK_PROPERTY + SPACE + SIZE_PROPERTY;
+			setValidationMessage(message, context);
+
+		} else if (value.length() < min || value.length() > max) {
+			result = false;
+
+			setValidationMessage(SIZE_PROPERTY, context);
+
+		} else {
+			result = true;
+		} return result;
+	}
+
+	private void setValidationMessage(String message, ConstraintValidatorContext context) {
+		context.disableDefaultConstraintViolation();
+		context.buildConstraintViolationWithTemplate(message).addConstraintViolation();
+	}
+}
diff --git a/src/main/java/com/epam/ta/reportportal/model/widget/ChartObject.java b/src/main/java/com/epam/ta/reportportal/model/widget/ChartObject.java
new file mode 100644
index 0000000000..1fbf6eec31
--- /dev/null
+++ b/src/main/java/com/epam/ta/reportportal/model/widget/ChartObject.java
@@ -0,0 +1,102 @@
+/*
+ * 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.ta.reportportal.model.widget;
+
+import java.util.Map;
+
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonInclude.Include;
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * Basic representation for chart object with info for UI
+ * 
+ * @author Andrei_Ramanchuk
+ */
+@JsonInclude(Include.NON_NULL)
+public class ChartObject {
+
+	@JsonProperty(value = "values")
+	private Map<String, String> values;
+
+	@JsonProperty(value = "name")
+	private String name;
+
+	@JsonProperty(value = "startTime")
+	private String startTime;
+
+	@JsonProperty(value = "number")
+	private String number;
+
+	@JsonProperty(value = "id")
+	private String id;
+
+	public ChartObject() {
+	}
+
+	public void setId(String id) {
+		this.id = id;
+	}
+
+	public String getId() {
+		return id;
+	}
+
+	public void setValues(Map<String, String> values) {
+		this.values = values;
+	}
+
+	public Map<String, String> getValues() {
+		return values;
+	}
+
+	public void setName(String value) {
+		this.name = value;
+	}
+
+	public String getName() {
+		return name;
+	}
+
+	public void setStartTime(String value) {
+		this.startTime = value;
+	}
+
+	public String getStartTime() {
+		return startTime;
+	}
+
+	public void setNumber(String value) {
+		this.number = value;
+	}
+
+	public String getNumber() {
+		return number;
+	}
+
+	@Override
+	public String toString() {
+		final StringBuilder sb = new StringBuilder("ChartObject{");
+		sb.append("values='").append(values).append('\'');
+		sb.append(", name='").append(name).append('\'');
+		sb.append(", startTime='").append(startTime).append('\'');
+		sb.append(", number='").append(number).append('\'');
+		sb.append(", id='").append(id).append('\'');
+		sb.append('}');
+		return sb.toString();
+	}
+}
\ No newline at end of file
diff --git a/src/main/java/com/epam/ta/reportportal/model/widget/ContentParameters.java b/src/main/java/com/epam/ta/reportportal/model/widget/ContentParameters.java
new file mode 100644
index 0000000000..bf96f411db
--- /dev/null
+++ b/src/main/java/com/epam/ta/reportportal/model/widget/ContentParameters.java
@@ -0,0 +1,74 @@
+/*
+ * 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.ta.reportportal.model.widget;
+
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonInclude.Include;
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+import javax.validation.constraints.Max;
+import javax.validation.constraints.Min;
+import javax.validation.constraints.NotNull;
+import java.util.List;
+import java.util.Map;
+
+import static com.epam.ta.reportportal.ws.model.ValidationConstraints.MAX_WIDGET_LIMIT;
+import static com.epam.ta.reportportal.ws.model.ValidationConstraints.MIN_WIDGET_LIMIT;
+
+/**
+ * Part of widget domain object. Describe chart parameters
+ *
+ * @author Aliaksei_Makayed
+ */
+@JsonInclude(Include.NON_NULL)
+public class ContentParameters {
+
+	// fields for main data(for example: graphs at the chart)
+	@JsonProperty(value = "contentFields", required = true)
+	private List<String> contentFields;
+
+	@NotNull
+	@JsonProperty(value = "itemsCount", required = true)
+	private int itemsCount;
+
+	@JsonProperty(value = "widgetOptions")
+	private Map<String, Object> widgetOptions;
+
+	public List<String> getContentFields() {
+		return contentFields;
+	}
+
+	public void setContentFields(List<String> contentFields) {
+		this.contentFields = contentFields;
+	}
+
+	public int getItemsCount() {
+		return itemsCount;
+	}
+
+	public void setItemsCount(int itemsCount) {
+		this.itemsCount = itemsCount;
+	}
+
+	public Map<String, Object> getWidgetOptions() {
+		return widgetOptions;
+	}
+
+	public void setWidgetOptions(Map<String, Object> widgetOptions) {
+		this.widgetOptions = widgetOptions;
+	}
+}
\ No newline at end of file
diff --git a/src/main/java/com/epam/ta/reportportal/model/widget/MaterializedWidgetType.java b/src/main/java/com/epam/ta/reportportal/model/widget/MaterializedWidgetType.java
new file mode 100644
index 0000000000..2003fba463
--- /dev/null
+++ b/src/main/java/com/epam/ta/reportportal/model/widget/MaterializedWidgetType.java
@@ -0,0 +1,24 @@
+package com.epam.ta.reportportal.model.widget;
+
+import javax.annotation.Nullable;
+import java.util.Arrays;
+import java.util.Optional;
+
+/**
+ * @author <a href="mailto:pavel_bortnik@epam.com">Pavel Bortnik</a>
+ */
+public enum MaterializedWidgetType {
+
+	COMPONENT_HEALTH_CHECK_TABLE("componentHealthCheckTable"),
+	CUMULATIVE_TREND_CHART("cumulative");
+
+	private final String type;
+
+	MaterializedWidgetType(String type) {
+		this.type = type;
+	}
+
+	public String getType() {
+		return this.type;
+	}
+}
diff --git a/src/main/java/com/epam/ta/reportportal/model/widget/SortEntry.java b/src/main/java/com/epam/ta/reportportal/model/widget/SortEntry.java
new file mode 100644
index 0000000000..9ddc1a0f98
--- /dev/null
+++ b/src/main/java/com/epam/ta/reportportal/model/widget/SortEntry.java
@@ -0,0 +1,36 @@
+package com.epam.ta.reportportal.model.widget;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+import java.io.Serializable;
+
+/**
+ * @author <a href="mailto:ivan_budayeu@epam.com">Ivan Budayeu</a>
+ */
+public class SortEntry implements Serializable {
+
+	@JsonProperty(value = "asc")
+	private boolean asc;
+
+	@JsonProperty(value = "sortingColumn")
+	private String sortingColumn;
+
+	public SortEntry() {
+	}
+
+	public boolean isAsc() {
+		return asc;
+	}
+
+	public void setAsc(boolean asc) {
+		this.asc = asc;
+	}
+
+	public String getSortingColumn() {
+		return sortingColumn;
+	}
+
+	public void setSortingColumn(String sortingColumn) {
+		this.sortingColumn = sortingColumn;
+	}
+}
diff --git a/src/main/java/com/epam/ta/reportportal/model/widget/WidgetPreviewRQ.java b/src/main/java/com/epam/ta/reportportal/model/widget/WidgetPreviewRQ.java
new file mode 100644
index 0000000000..fb350436bb
--- /dev/null
+++ b/src/main/java/com/epam/ta/reportportal/model/widget/WidgetPreviewRQ.java
@@ -0,0 +1,111 @@
+/*
+ * 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.ta.reportportal.model.widget;
+
+import com.epam.ta.reportportal.ws.annotations.In;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonInclude.Include;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import io.swagger.annotations.ApiModelProperty;
+import java.util.List;
+import javax.validation.Valid;
+import javax.validation.constraints.NotNull;
+
+/**
+ * Model object for getting widget preview content
+ *
+ * @author Pavel Bortnik
+ */
+
+@JsonInclude(Include.NON_NULL)
+public class WidgetPreviewRQ {
+
+  @NotNull
+  @JsonProperty(value = "widgetType", required = true)
+  @In(allowedValues = { "oldLineChart", "investigatedTrend", "launchStatistics", "statisticTrend",
+      "casesTrend", "notPassed", "overallStatistics", "uniqueBugTable", "bugTrend",
+      "activityStream", "launchesComparisonChart", "launchesDurationChart", "launchesTable",
+      "topTestCases", "flakyTestCases", "passingRateSummary", "passingRatePerLaunch",
+      "productStatus", "mostTimeConsuming", "cumulative" })
+  @ApiModelProperty(required = true, allowableValues =
+      "oldLineChart, investigatedTrend, launchStatistics, statisticTrend,"
+          + " casesTrend, notPassed, overallStatistics, uniqueBugTable, bugTrend, activityStream, launchesComparisonChart,"
+          + " launchesDurationChart, launchesTable, topTestCases, flakyTestCases, passingRateSummary, passingRatePerLaunch,"
+          + " productStatus, mostTimeConsuming, cumulative")
+  private String widgetType;
+
+  @Valid
+  @JsonProperty(value = "contentParameters")
+  private ContentParameters contentParameters;
+
+  @JsonProperty(value = "filterIds")
+  private List<Long> filterIds;
+
+  @NotNull
+  public String getWidgetType() {
+    return widgetType;
+  }
+
+  public void setWidgetType(@NotNull String widgetType) {
+    this.widgetType = widgetType;
+  }
+
+  public ContentParameters getContentParameters() {
+    return contentParameters;
+  }
+
+  public void setContentParameters(ContentParameters contentParameters) {
+    this.contentParameters = contentParameters;
+  }
+
+  public List<Long> getFilterIds() {
+    return filterIds;
+  }
+
+  public void setFilterIds(List<Long> filterIds) {
+    this.filterIds = filterIds;
+  }
+
+  @Override
+  public boolean equals(Object o) {
+    if (this == o) {
+      return true;
+    }
+    if (o == null || getClass() != o.getClass()) {
+      return false;
+    }
+
+    WidgetPreviewRQ that = (WidgetPreviewRQ) o;
+
+    if (!widgetType.equals(that.widgetType)) {
+      return false;
+    }
+    if (contentParameters != null ? !contentParameters.equals(that.contentParameters) :
+        that.contentParameters != null) {
+      return false;
+    }
+    return filterIds != null ? filterIds.equals(that.filterIds) : that.filterIds == null;
+  }
+
+  @Override
+  public int hashCode() {
+    int result = widgetType.hashCode();
+    result = 31 * result + (contentParameters != null ? contentParameters.hashCode() : 0);
+    result = 31 * result + (filterIds != null ? filterIds.hashCode() : 0);
+    return result;
+  }
+}
diff --git a/src/main/java/com/epam/ta/reportportal/model/widget/WidgetRQ.java b/src/main/java/com/epam/ta/reportportal/model/widget/WidgetRQ.java
new file mode 100644
index 0000000000..fe4aeda894
--- /dev/null
+++ b/src/main/java/com/epam/ta/reportportal/model/widget/WidgetRQ.java
@@ -0,0 +1,106 @@
+/*
+ * 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.ta.reportportal.model.widget;
+
+import com.epam.ta.reportportal.model.BaseEntityRQ;
+import com.epam.ta.reportportal.core.events.annotations.WidgetLimitRange;
+import com.epam.ta.reportportal.ws.annotations.In;
+import com.epam.ta.reportportal.ws.annotations.NotBlankWithSize;
+import com.epam.ta.reportportal.ws.model.ValidationConstraints;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonInclude.Include;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import io.swagger.annotations.ApiModelProperty;
+import java.util.List;
+import javax.validation.Valid;
+import javax.validation.constraints.NotNull;
+
+/**
+ * Domain model object for creating and updating widget
+ *
+ * @author Aliaksei_Makayed
+ */
+
+@WidgetLimitRange
+@JsonInclude(Include.NON_NULL)
+public class WidgetRQ extends BaseEntityRQ {
+
+  @NotBlankWithSize(min = ValidationConstraints.MIN_NAME_LENGTH, max = ValidationConstraints.MAX_WIDGET_NAME_LENGTH)
+  @JsonProperty(value = "name", required = true)
+  private String name;
+
+  @NotNull
+  @JsonProperty(value = "widgetType", required = true)
+  @In(allowedValues = { "oldLineChart", "investigatedTrend", "launchStatistics", "statisticTrend",
+      "casesTrend", "notPassed", "overallStatistics", "uniqueBugTable", "bugTrend",
+      "activityStream", "launchesComparisonChart", "launchesDurationChart", "launchesTable",
+      "topTestCases", "flakyTestCases", "passingRateSummary", "passingRatePerLaunch",
+      "productStatus", "mostTimeConsuming", "cumulative", "topPatternTemplates",
+      "componentHealthCheck", "componentHealthCheckTable" })
+  @ApiModelProperty(required = true, allowableValues =
+      "oldLineChart, investigatedTrend, launchStatistics, statisticTrend,"
+          + " casesTrend, notPassed, overallStatistics, uniqueBugTable, bugTrend, activityStream, launchesComparisonChart,"
+          + " launchesDurationChart, launchesTable, topTestCases, flakyTestCases, passingRateSummary, passingRatePerLaunch,"
+          + " productStatus, mostTimeConsuming, cumulative, topPatternTemplates, componentHealthCheck, componentHealthCheckTable")
+  private String widgetType;
+
+  @Valid
+  @JsonProperty(value = "contentParameters")
+  private ContentParameters contentParameters;
+
+  @JsonProperty(value = "filterIds")
+  private List<Long> filterIds;
+
+  public String getName() {
+    return name;
+  }
+
+  public void setName(String name) {
+    this.name = name;
+  }
+
+  @NotNull
+  public String getWidgetType() {
+    return widgetType;
+  }
+
+  public void setWidgetType(@NotNull String widgetType) {
+    this.widgetType = widgetType;
+  }
+
+  public ContentParameters getContentParameters() {
+    return contentParameters;
+  }
+
+  public void setContentParameters(ContentParameters contentParameters) {
+    this.contentParameters = contentParameters;
+  }
+
+  public List<Long> getFilterIds() {
+    return filterIds;
+  }
+
+  public void setFilterIds(List<Long> filterIds) {
+    this.filterIds = filterIds;
+  }
+
+  @Override
+  public String toString() {
+    return "WidgetRQ{" + "name='" + name + '\'' + ", widgetType='" + widgetType + '\''
+        + ", contentParameters=" + contentParameters + ", filterIds=" + filterIds + '}';
+  }
+}
\ No newline at end of file
diff --git a/src/main/java/com/epam/ta/reportportal/model/widget/WidgetResource.java b/src/main/java/com/epam/ta/reportportal/model/widget/WidgetResource.java
new file mode 100644
index 0000000000..11d6f9fb0a
--- /dev/null
+++ b/src/main/java/com/epam/ta/reportportal/model/widget/WidgetResource.java
@@ -0,0 +1,120 @@
+/*
+ * 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.ta.reportportal.model.widget;
+
+import com.epam.ta.reportportal.model.filter.UserFilterResource;
+import com.epam.ta.reportportal.ws.model.OwnedResource;
+import com.epam.ta.reportportal.ws.model.ValidationConstraints;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import io.swagger.annotations.ApiModelProperty;
+import java.util.List;
+import java.util.Map;
+import javax.validation.Valid;
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+import javax.validation.constraints.Size;
+
+/**
+ * @author Dzmitry_Kavalets
+ */
+public class WidgetResource extends OwnedResource {
+
+  @NotNull
+  @JsonProperty(value = "id", required = true)
+  private Long widgetId;
+
+  @NotBlank
+  @Size(min = ValidationConstraints.MIN_NAME_LENGTH, max = ValidationConstraints.MAX_WIDGET_NAME_LENGTH)
+  @JsonProperty(value = "name", required = true)
+  private String name;
+
+  @NotNull
+  @JsonProperty(value = "widgetType", required = true)
+  @ApiModelProperty(required = true, allowableValues =
+      "oldLineChart, investigatedTrend, launchStatistics, statisticTrend,"
+          + " casesTrend, notPassed, overallStatistics, uniqueBugTable, bugTrend, activityStream, launchesComparisonChart,"
+          + " launchesDurationChart, launchesTable, topTestCases, flakyTestCases, passingRateSummary, passingRatePerLaunch,"
+          + " productStatus, mostTimeConsuming, cumulative")
+  private String widgetType;
+
+  @NotNull
+  @Valid
+  @JsonProperty(value = "contentParameters", required = true)
+  private ContentParameters contentParameters;
+
+  @JsonProperty(value = "appliedFilters")
+  private List<UserFilterResource> appliedFilters;
+
+  @JsonProperty(value = "content")
+  private Map<String, ?> content;
+
+  public Long getWidgetId() {
+    return widgetId;
+  }
+
+  public void setWidgetId(Long widgetId) {
+    this.widgetId = widgetId;
+  }
+
+  public String getName() {
+    return name;
+  }
+
+  public void setName(String name) {
+    this.name = name;
+  }
+
+  public List<UserFilterResource> getAppliedFilters() {
+    return appliedFilters;
+  }
+
+  public void setAppliedFilters(List<UserFilterResource> appliedFilters) {
+    this.appliedFilters = appliedFilters;
+  }
+
+  @NotNull
+  public String getWidgetType() {
+    return widgetType;
+  }
+
+  public void setWidgetType(@NotNull String widgetType) {
+    this.widgetType = widgetType;
+  }
+
+  public ContentParameters getContentParameters() {
+    return contentParameters;
+  }
+
+  public void setContentParameters(ContentParameters contentParameters) {
+    this.contentParameters = contentParameters;
+  }
+
+  public Map<String, ?> getContent() {
+    return content;
+  }
+
+  public void setContent(Map<String, ?> content) {
+    this.content = content;
+  }
+
+  @Override
+  public String toString() {
+    return "WidgetResource{" + "widgetId=" + widgetId + ", name='" + name + '\'' + ", widgetType='"
+        + widgetType + '\'' + ", contentParameters=" + contentParameters + ", appliedFilters="
+        + appliedFilters + ", content=" + content + '}';
+  }
+}
\ No newline at end of file
diff --git a/src/main/java/com/epam/ta/reportportal/util/email/EmailService.java b/src/main/java/com/epam/ta/reportportal/util/email/EmailService.java
index 60736fe8bd..57368d34b9 100644
--- a/src/main/java/com/epam/ta/reportportal/util/email/EmailService.java
+++ b/src/main/java/com/epam/ta/reportportal/util/email/EmailService.java
@@ -37,9 +37,9 @@
 import com.epam.ta.reportportal.entity.project.Project;
 import com.epam.ta.reportportal.entity.project.ProjectIssueType;
 import com.epam.ta.reportportal.entity.statistics.Statistics;
+import com.epam.ta.reportportal.model.user.CreateUserRQFull;
 import com.epam.ta.reportportal.util.UserUtils;
 import com.epam.ta.reportportal.util.email.constant.IssueRegexConstant;
-import com.epam.ta.reportportal.ws.model.user.CreateUserRQFull;
 import com.google.common.annotations.VisibleForTesting;
 import java.io.UnsupportedEncodingException;
 import java.util.Collections;
@@ -75,7 +75,8 @@ public class EmailService extends JavaMailSenderImpl {
   private static final String FINISH_LAUNCH_EMAIL_SUBJECT =
       " ReportPortal Notification: [%s] launch '%s' #%s finished";
   private static final String URL_FORMAT = "%s/launches/all";
-  private static final String COMPOSITE_ATTRIBUTE_FILTER_FORMAT = "%s?launchesParams=filter.has.compositeAttribute=%s";
+  private static final String COMPOSITE_ATTRIBUTE_FILTER_FORMAT =
+      "%s?launchesParams=filter.has.compositeAttribute=%s";
   private static final String TEMPLATE_IMAGES_PREFIX = "templates/email/images/";
   private TemplateEngine templateEngine;
   /* Default value for FROM project notifications field */
@@ -125,7 +126,8 @@ public void sendLaunchFinishNotification(final String[] recipients, final String
       final Project project, final Launch launch) {
     String subject =
         format(FINISH_LAUNCH_EMAIL_SUBJECT, project.getName().toUpperCase(), launch.getName(),
-            launch.getNumber());
+            launch.getNumber()
+        );
     MimeMessagePreparator preparator = mimeMessage -> {
       MimeMessageHelper message = new MimeMessageHelper(mimeMessage, true, "utf-8");
       message.setSubject(subject);
@@ -152,25 +154,21 @@ String mergeFinishLaunchText(String url, Launch launch, Set<ProjectIssueType> pr
 
     /* Tags with links */
     if (!CollectionUtils.isEmpty(launch.getAttributes())) {
-      email.put("attributes",
-          launch.getAttributes()
-              .stream()
-              .filter(it -> !it.isSystem())
-              .collect(toMap(attribute -> ofNullable(attribute.getKey()).map(it -> it.concat(":"))
-                      .orElse("")
-                      .concat(attribute.getValue()),
-                  attribute -> buildAttributesLink(basicUrl, attribute)))
-      );
+      email.put("attributes", launch.getAttributes().stream().filter(it -> !it.isSystem()).collect(
+          toMap(attribute -> ofNullable(attribute.getKey()).map(it -> it.concat(":")).orElse("")
+                  .concat(attribute.getValue()),
+              attribute -> buildAttributesLink(basicUrl, attribute)
+          )));
     }
 
     /* Launch execution statistics */
 
-    Map<String, Integer> statistics = launch.getStatistics()
-        .stream()
-        .filter(s -> ofNullable(s.getStatisticsField()).isPresent() && StringUtils.isNotEmpty(
-            s.getStatisticsField().getName()))
-        .collect(Collectors.toMap(s -> s.getStatisticsField().getName(), Statistics::getCounter,
-            (prev, curr) -> prev));
+    Map<String, Integer> statistics = launch.getStatistics().stream().filter(
+        s -> ofNullable(s.getStatisticsField()).isPresent() && StringUtils.isNotEmpty(
+            s.getStatisticsField().getName())).collect(
+        Collectors.toMap(s -> s.getStatisticsField().getName(), Statistics::getCounter,
+            (prev, curr) -> prev
+        ));
 
     email.put("total", ofNullable(statistics.get(EXECUTIONS_TOTAL)).orElse(0));
     email.put("passed", ofNullable(statistics.get(EXECUTIONS_PASSED)).orElse(0));
@@ -180,26 +178,31 @@ String mergeFinishLaunchText(String url, Launch launch, Set<ProjectIssueType> pr
     /* Launch issue statistics global counters */
     email.put("productBugTotal", ofNullable(statistics.get(DEFECTS_PRODUCT_BUG_TOTAL)).orElse(0));
     email.put("automationBugTotal",
-        ofNullable(statistics.get(DEFECTS_AUTOMATION_BUG_TOTAL)).orElse(0));
+        ofNullable(statistics.get(DEFECTS_AUTOMATION_BUG_TOTAL)).orElse(0)
+    );
     email.put("systemIssueTotal", ofNullable(statistics.get(DEFECTS_SYSTEM_ISSUE_TOTAL)).orElse(0));
     email.put("noDefectTotal", ofNullable(statistics.get(DEFECTS_NO_DEFECT_TOTAL)).orElse(0));
     email.put("toInvestigateTotal",
-        ofNullable(statistics.get(DEFECTS_TO_INVESTIGATE_TOTAL)).orElse(0));
+        ofNullable(statistics.get(DEFECTS_TO_INVESTIGATE_TOTAL)).orElse(0)
+    );
 
-    Map<String, String> locatorsMapping = projectIssueTypes.stream()
-        .collect(
-            toMap(it -> it.getIssueType().getLocator(), it -> it.getIssueType().getLongName()));
+    Map<String, String> locatorsMapping = projectIssueTypes.stream().collect(
+        toMap(it -> it.getIssueType().getLocator(), it -> it.getIssueType().getLongName()));
 
     /* Launch issue statistics custom sub-types */
     fillEmail(email, "pbInfo", statistics, locatorsMapping,
-        IssueRegexConstant.PRODUCT_BUG_ISSUE_REGEX);
+        IssueRegexConstant.PRODUCT_BUG_ISSUE_REGEX
+    );
     fillEmail(email, "abInfo", statistics, locatorsMapping,
-        IssueRegexConstant.AUTOMATION_BUG_ISSUE_REGEX);
+        IssueRegexConstant.AUTOMATION_BUG_ISSUE_REGEX
+    );
     fillEmail(email, "siInfo", statistics, locatorsMapping, IssueRegexConstant.SYSTEM_ISSUE_REGEX);
     fillEmail(email, "ndInfo", statistics, locatorsMapping,
-        IssueRegexConstant.NO_DEFECT_ISSUE_REGEX);
+        IssueRegexConstant.NO_DEFECT_ISSUE_REGEX
+    );
     fillEmail(email, "tiInfo", statistics, locatorsMapping,
-        IssueRegexConstant.TO_INVESTIGATE_ISSUE_REGEX);
+        IssueRegexConstant.TO_INVESTIGATE_ISSUE_REGEX
+    );
 
     return templateEngine.merge("finish-launch-template.ftl", email);
   }
@@ -207,43 +210,33 @@ String mergeFinishLaunchText(String url, Launch launch, Set<ProjectIssueType> pr
   private String getUrl(String baseUrl) {
     return ofNullable(rpHost).map(rh -> {
       final UriComponents rpHostUri = UriComponentsBuilder.fromUriString(rh).build();
-      return UriComponentsBuilder.fromUriString(baseUrl)
-          .scheme(rpHostUri.getScheme())
-          .host(rpHostUri.getHost())
-          .port(rpHostUri.getPort())
-          .build()
-          .toUri()
-          .toASCIIString();
+      return UriComponentsBuilder.fromUriString(baseUrl).scheme(rpHostUri.getScheme())
+          .host(rpHostUri.getHost()).port(rpHostUri.getPort()).build().toUri().toASCIIString();
     }).orElse(baseUrl);
   }
 
   private String buildAttributesLink(String basicUrl, ItemAttribute attribute) {
     if (null != attribute.getKey()) {
-      return format(COMPOSITE_ATTRIBUTE_FILTER_FORMAT,
-          basicUrl,
-          urlPathSegmentEscaper().escape(attribute.getKey()) + ":" +
-          urlPathSegmentEscaper().escape(attribute.getValue())
+      return format(COMPOSITE_ATTRIBUTE_FILTER_FORMAT, basicUrl,
+          urlPathSegmentEscaper().escape(attribute.getKey()) + ":" + urlPathSegmentEscaper().escape(
+              attribute.getValue())
       );
     } else {
       return format(COMPOSITE_ATTRIBUTE_FILTER_FORMAT, basicUrl,
-          urlPathSegmentEscaper().escape(attribute.getValue()));
+          urlPathSegmentEscaper().escape(attribute.getValue())
+      );
     }
   }
 
   private void fillEmail(Map<String, Object> email, String statisticsName,
-      Map<String, Integer> statistics,
-      Map<String, String> locatorsMapping, String regex) {
-    Optional<Map<String, Integer>> pb = Optional.of(statistics.entrySet()
-        .stream()
-        .filter(entry -> {
-          Pattern pattern = Pattern.compile(regex);
-          return pattern.matcher(entry.getKey()).matches();
-        })
-        .collect(Collectors.toMap(
-            entry -> locatorsMapping.get(StringUtils.substringAfterLast(entry.getKey(), "$")),
-            entry -> ofNullable(entry.getValue()).orElse(0),
-            (prev, curr) -> prev
-        )));
+      Map<String, Integer> statistics, Map<String, String> locatorsMapping, String regex) {
+    Optional<Map<String, Integer>> pb = Optional.of(statistics.entrySet().stream().filter(entry -> {
+      Pattern pattern = Pattern.compile(regex);
+      return pattern.matcher(entry.getKey()).matches();
+    }).collect(Collectors.toMap(
+        entry -> locatorsMapping.get(StringUtils.substringAfterLast(entry.getKey(), "$")),
+        entry -> ofNullable(entry.getValue()).orElse(0), (prev, curr) -> prev
+    )));
 
     pb.ifPresent(stats -> email.put(statisticsName, stats));
   }
@@ -453,7 +446,10 @@ public void sendUserExpirationNotification(String recipient, Map<String, Object>
       message.setText(text, true);
 
       message.addInline("new-logo.png", emailTemplateResource("new-logo.png"));
-      message.addInline("delete-account-notification.png", emailTemplateResource("delete-account-notification.png"));
+      message.addInline(
+          "delete-account-notification.png",
+          emailTemplateResource("delete-account-notification.png")
+      );
       attachNewSocialImages(message);
     };
     this.send(preparator);
diff --git a/src/main/java/com/epam/ta/reportportal/ws/controller/ActivityController.java b/src/main/java/com/epam/ta/reportportal/ws/controller/ActivityController.java
index f35a45596f..20a093a88d 100644
--- a/src/main/java/com/epam/ta/reportportal/ws/controller/ActivityController.java
+++ b/src/main/java/com/epam/ta/reportportal/ws/controller/ActivityController.java
@@ -1,18 +1,18 @@
  /*
- * 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.
- */
+  * 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.ta.reportportal.ws.controller;
 
@@ -24,8 +24,8 @@
  import com.epam.ta.reportportal.commons.querygen.Filter;
  import com.epam.ta.reportportal.core.activity.ActivityHandler;
  import com.epam.ta.reportportal.entity.activity.Activity;
+ import com.epam.ta.reportportal.model.ActivityEventResource;
  import com.epam.ta.reportportal.util.ProjectExtractor;
- import com.epam.ta.reportportal.ws.model.ActivityEventResource;
  import com.epam.ta.reportportal.ws.model.ActivityResource;
  import com.epam.ta.reportportal.ws.resolver.FilterFor;
  import com.epam.ta.reportportal.ws.resolver.SortFor;
@@ -50,38 +50,33 @@
  @PreAuthorize(ASSIGNED_TO_PROJECT)
  public class ActivityController {
 
-	 private final ActivityHandler activityHandler;
+   private final ActivityHandler activityHandler;
 
-	 private final ProjectExtractor projectExtractor;
+   private final ProjectExtractor projectExtractor;
 
-	 @Autowired
-	 public ActivityController(ActivityHandler activityHandler, ProjectExtractor projectExtractor) {
-		 this.activityHandler = activityHandler;
-		 this.projectExtractor = projectExtractor;
-	 }
+   @Autowired
+   public ActivityController(ActivityHandler activityHandler, ProjectExtractor projectExtractor) {
+     this.activityHandler = activityHandler;
+     this.projectExtractor = projectExtractor;
+   }
 
-	 @RequestMapping(value = "/{activityId}", method = RequestMethod.GET)
-	 @ResponseStatus(OK)
-	 public ActivityResource getActivity(@PathVariable String projectName, @PathVariable Long activityId,
-			 @AuthenticationPrincipal ReportPortalUser user) {
-		 ReportPortalUser.ProjectDetails projectDetails = projectExtractor.extractProjectDetailsAdmin(
-				 user,
-				 EntityUtils.normalizeId(projectName)
-		 );
-		 return activityHandler.getActivity(projectDetails, activityId);
-	 }
+   @RequestMapping(value = "/{activityId}", method = RequestMethod.GET)
+   @ResponseStatus(OK)
+   public ActivityResource getActivity(@PathVariable String projectName,
+       @PathVariable Long activityId, @AuthenticationPrincipal ReportPortalUser user) {
+     ReportPortalUser.ProjectDetails projectDetails =
+         projectExtractor.extractProjectDetailsAdmin(user, EntityUtils.normalizeId(projectName));
+     return activityHandler.getActivity(projectDetails, activityId);
+   }
 
-	 @RequestMapping(value = "/item/{itemId}", method = RequestMethod.GET)
-	 @ResponseStatus(OK)
-	 @ApiOperation("Get activities for test item")
+   @RequestMapping(value = "/item/{itemId}", method = RequestMethod.GET)
+   @ResponseStatus(OK)
+   @ApiOperation("Get activities for test item")
    public Iterable<ActivityEventResource> getTestItemActivities(@PathVariable String projectName,
-       @PathVariable Long itemId,
-			 @FilterFor(Activity.class) Filter filter, @SortFor(Activity.class) Pageable pageable,
-			 @AuthenticationPrincipal ReportPortalUser user) {
-		 ReportPortalUser.ProjectDetails projectDetails = projectExtractor.extractProjectDetailsAdmin(
-				 user,
-				 EntityUtils.normalizeId(projectName)
-		 );
-		 return activityHandler.getItemActivities(projectDetails, itemId, filter, pageable);
-	 }
+       @PathVariable Long itemId, @FilterFor(Activity.class) Filter filter,
+       @SortFor(Activity.class) Pageable pageable, @AuthenticationPrincipal ReportPortalUser user) {
+     ReportPortalUser.ProjectDetails projectDetails =
+         projectExtractor.extractProjectDetailsAdmin(user, EntityUtils.normalizeId(projectName));
+     return activityHandler.getItemActivities(projectDetails, itemId, filter, pageable);
+   }
  }
\ No newline at end of file
diff --git a/src/main/java/com/epam/ta/reportportal/ws/controller/ActivityEventController.java b/src/main/java/com/epam/ta/reportportal/ws/controller/ActivityEventController.java
index bcfa33bdbc..79931aa40d 100644
--- a/src/main/java/com/epam/ta/reportportal/ws/controller/ActivityEventController.java
+++ b/src/main/java/com/epam/ta/reportportal/ws/controller/ActivityEventController.java
@@ -25,10 +25,10 @@
 import com.epam.ta.reportportal.core.filter.SearchCriteriaService;
 import com.epam.ta.reportportal.core.filter.predefined.PredefinedFilterType;
 import com.epam.ta.reportportal.entity.activity.Activity;
+import com.epam.ta.reportportal.model.ActivityEventResource;
+import com.epam.ta.reportportal.model.PagedResponse;
+import com.epam.ta.reportportal.model.SearchCriteriaRQ;
 import com.epam.ta.reportportal.util.ProjectExtractor;
-import com.epam.ta.reportportal.ws.model.ActivityEventResource;
-import com.epam.ta.reportportal.ws.model.PagedResponse;
-import com.epam.ta.reportportal.ws.model.SearchCriteriaRQ;
 import com.epam.ta.reportportal.ws.resolver.FilterCriteriaResolver;
 import io.swagger.annotations.ApiOperation;
 import java.util.List;
@@ -64,8 +64,7 @@ public class ActivityEventController {
   private final SearchCriteriaService searchCriteriaService;
 
   public ActivityEventController(ActivityEventHandler activityEventHandler,
-      ProjectExtractor projectExtractor,
-      SearchCriteriaService searchCriteriaService) {
+      ProjectExtractor projectExtractor, SearchCriteriaService searchCriteriaService) {
     this.activityEventHandler = activityEventHandler;
     this.projectExtractor = projectExtractor;
     this.searchCriteriaService = searchCriteriaService;
@@ -86,16 +85,15 @@ public ActivityEventController(ActivityEventHandler activityEventHandler,
   @PostMapping("/searches")
   @ApiOperation("Get activities by search criteria")
   public PagedResponse<ActivityEventResource> getActivities(
-      @RequestParam @Min(0) @Max(300) int limit,
-      @RequestParam @Min(0) int offset,
-      @RequestParam Direction order,
-      @RequestParam String sort,
+      @RequestParam @Min(0) @Max(300) int limit, @RequestParam @Min(0) int offset,
+      @RequestParam Direction order, @RequestParam String sort,
       @RequestBody SearchCriteriaRQ searchCriteria,
       @AuthenticationPrincipal ReportPortalUser user) {
 
-    Queryable filter = searchCriteriaService.createFilterBySearchCriteria(searchCriteria,
-        Activity.class,
-        PredefinedFilterType.ACTIVITIES);
+    Queryable filter =
+        searchCriteriaService.createFilterBySearchCriteria(searchCriteria, Activity.class,
+            PredefinedFilterType.ACTIVITIES
+        );
     Pageable pageable = PageRequest.of(offset / limit, limit, Sort.by(order, sort));
 
     return activityEventHandler.getActivityEventsHistory(filter, pageable);
@@ -105,9 +103,8 @@ public PagedResponse<ActivityEventResource> getActivities(
   @PreAuthorize(ADMIN_ONLY)
   @ApiOperation(value = "Load project activities subjectNames by filter", notes = "Only for current project")
   public List<String> getProjectSubjectName(@PathVariable String projectName,
-      @RequestParam(FilterCriteriaResolver.DEFAULT_FILTER_PREFIX + Condition.CNT
-          + "subjectName") String value,
-      @AuthenticationPrincipal ReportPortalUser user) {
+      @RequestParam(FilterCriteriaResolver.DEFAULT_FILTER_PREFIX + Condition.CNT + "subjectName")
+      String value, @AuthenticationPrincipal ReportPortalUser user) {
     return activityEventHandler.getSubjectNames(
         projectExtractor.extractProjectDetails(user, projectName), value);
   }
diff --git a/src/main/java/com/epam/ta/reportportal/ws/controller/DashboardController.java b/src/main/java/com/epam/ta/reportportal/ws/controller/DashboardController.java
index e1b8291bd6..3132b143ba 100644
--- a/src/main/java/com/epam/ta/reportportal/ws/controller/DashboardController.java
+++ b/src/main/java/com/epam/ta/reportportal/ws/controller/DashboardController.java
@@ -27,13 +27,13 @@
 import com.epam.ta.reportportal.core.dashboard.GetDashboardHandler;
 import com.epam.ta.reportportal.core.dashboard.UpdateDashboardHandler;
 import com.epam.ta.reportportal.entity.dashboard.Dashboard;
+import com.epam.ta.reportportal.model.EntryCreatedRS;
+import com.epam.ta.reportportal.model.dashboard.AddWidgetRq;
+import com.epam.ta.reportportal.model.dashboard.CreateDashboardRQ;
+import com.epam.ta.reportportal.model.dashboard.DashboardResource;
+import com.epam.ta.reportportal.model.dashboard.UpdateDashboardRQ;
 import com.epam.ta.reportportal.util.ProjectExtractor;
-import com.epam.ta.reportportal.ws.model.EntryCreatedRS;
 import com.epam.ta.reportportal.ws.model.OperationCompletionRS;
-import com.epam.ta.reportportal.ws.model.dashboard.AddWidgetRq;
-import com.epam.ta.reportportal.ws.model.dashboard.CreateDashboardRQ;
-import com.epam.ta.reportportal.ws.model.dashboard.DashboardResource;
-import com.epam.ta.reportportal.ws.model.dashboard.UpdateDashboardRQ;
 import com.epam.ta.reportportal.ws.resolver.FilterFor;
 import com.epam.ta.reportportal.ws.resolver.SortFor;
 import io.swagger.annotations.ApiOperation;
@@ -69,15 +69,14 @@ public class DashboardController {
 
   @Autowired
   public DashboardController(ProjectExtractor projectExtractor,
-      CreateDashboardHandler createDashboardHandler,
-      UpdateDashboardHandler updateDashboardHandler, GetDashboardHandler getDashboardHandler,
-			DeleteDashboardHandler deleteDashboardHandler) {
-		this.projectExtractor = projectExtractor;
-		this.createDashboardHandler = createDashboardHandler;
-		this.updateDashboardHandler = updateDashboardHandler;
-		this.getDashboardHandler = getDashboardHandler;
-		this.deleteDashboardHandler = deleteDashboardHandler;
-	}
+      CreateDashboardHandler createDashboardHandler, UpdateDashboardHandler updateDashboardHandler,
+      GetDashboardHandler getDashboardHandler, DeleteDashboardHandler deleteDashboardHandler) {
+    this.projectExtractor = projectExtractor;
+    this.createDashboardHandler = createDashboardHandler;
+    this.updateDashboardHandler = updateDashboardHandler;
+    this.getDashboardHandler = getDashboardHandler;
+    this.deleteDashboardHandler = deleteDashboardHandler;
+  }
 
   @Transactional
   @PostMapping
@@ -90,63 +89,67 @@ public EntryCreatedRS createDashboard(@PathVariable String projectName,
         projectExtractor.extractProjectDetails(user, projectName), createRQ, user);
   }
 
-	@Transactional(readOnly = true)
-	@GetMapping
-	@ResponseStatus(OK)
-	@ApiOperation("Get all permitted dashboard resources for specified project")
-	public Iterable<DashboardResource> getAllDashboards(@PathVariable String projectName, @SortFor(Dashboard.class) Pageable pageable,
-			@FilterFor(Dashboard.class) Filter filter, @AuthenticationPrincipal ReportPortalUser user) {
-		return getDashboardHandler.getDashboards(projectExtractor.extractProjectDetails(user, projectName), pageable, filter, user);
-	}
+  @Transactional(readOnly = true)
+  @GetMapping
+  @ResponseStatus(OK)
+  @ApiOperation("Get all permitted dashboard resources for specified project")
+  public Iterable<DashboardResource> getAllDashboards(@PathVariable String projectName,
+      @SortFor(Dashboard.class) Pageable pageable, @FilterFor(Dashboard.class) Filter filter,
+      @AuthenticationPrincipal ReportPortalUser user) {
+    return getDashboardHandler.getDashboards(
+        projectExtractor.extractProjectDetails(user, projectName), pageable, filter, user);
+  }
 
-	@Transactional
-	@PutMapping("/{dashboardId}/add")
-	@ResponseStatus(OK)
-	@ApiOperation("Add widget to specified dashboard")
-	public OperationCompletionRS addWidget(@PathVariable String projectName, @PathVariable Long dashboardId,
-			@RequestBody @Validated AddWidgetRq addWidgetRq, @AuthenticationPrincipal ReportPortalUser user) {
-		return updateDashboardHandler.addWidget(dashboardId, projectExtractor.extractProjectDetails(user, projectName), addWidgetRq, user);
-	}
+  @Transactional
+  @PutMapping("/{dashboardId}/add")
+  @ResponseStatus(OK)
+  @ApiOperation("Add widget to specified dashboard")
+  public OperationCompletionRS addWidget(@PathVariable String projectName,
+      @PathVariable Long dashboardId, @RequestBody @Validated AddWidgetRq addWidgetRq,
+      @AuthenticationPrincipal ReportPortalUser user) {
+    return updateDashboardHandler.addWidget(
+        dashboardId, projectExtractor.extractProjectDetails(user, projectName), addWidgetRq, user);
+  }
 
-	@Transactional
-	@DeleteMapping("/{dashboardId}/{widgetId}")
-	@ResponseStatus(OK)
-	@ApiOperation("Remove widget from specified dashboard")
-	public OperationCompletionRS removeWidget(@PathVariable String projectName, @PathVariable Long dashboardId, @PathVariable Long widgetId,
-			@AuthenticationPrincipal ReportPortalUser user) {
-		return updateDashboardHandler.removeWidget(widgetId, dashboardId, projectExtractor.extractProjectDetails(user, projectName), user);
-	}
+  @Transactional
+  @DeleteMapping("/{dashboardId}/{widgetId}")
+  @ResponseStatus(OK)
+  @ApiOperation("Remove widget from specified dashboard")
+  public OperationCompletionRS removeWidget(@PathVariable String projectName,
+      @PathVariable Long dashboardId, @PathVariable Long widgetId,
+      @AuthenticationPrincipal ReportPortalUser user) {
+    return updateDashboardHandler.removeWidget(
+        widgetId, dashboardId, projectExtractor.extractProjectDetails(user, projectName), user);
+  }
 
-	@Transactional
-	@PutMapping(value = "/{dashboardId}")
-	@ResponseStatus(OK)
-	@ApiOperation("Update specified dashboard for specified project")
-	public OperationCompletionRS updateDashboard(@PathVariable String projectName, @PathVariable Long dashboardId,
-			@RequestBody @Validated UpdateDashboardRQ updateRQ, @AuthenticationPrincipal ReportPortalUser user) {
-		return updateDashboardHandler.updateDashboard(
-				projectExtractor.extractProjectDetails(user, projectName),
-				updateRQ,
-				dashboardId,
-				user
-		);
-	}
+  @Transactional
+  @PutMapping(value = "/{dashboardId}")
+  @ResponseStatus(OK)
+  @ApiOperation("Update specified dashboard for specified project")
+  public OperationCompletionRS updateDashboard(@PathVariable String projectName,
+      @PathVariable Long dashboardId, @RequestBody @Validated UpdateDashboardRQ updateRQ,
+      @AuthenticationPrincipal ReportPortalUser user) {
+    return updateDashboardHandler.updateDashboard(
+        projectExtractor.extractProjectDetails(user, projectName), updateRQ, dashboardId, user);
+  }
 
-	@Transactional
-	@DeleteMapping(value = "/{dashboardId}")
-	@ResponseStatus(OK)
-	@ApiOperation("Delete specified dashboard by ID for specified project")
-	public OperationCompletionRS deleteDashboard(@PathVariable String projectName, @PathVariable Long dashboardId,
-			@AuthenticationPrincipal ReportPortalUser user) {
-		return deleteDashboardHandler.deleteDashboard(dashboardId, projectExtractor.extractProjectDetails(user, projectName), user);
-	}
+  @Transactional
+  @DeleteMapping(value = "/{dashboardId}")
+  @ResponseStatus(OK)
+  @ApiOperation("Delete specified dashboard by ID for specified project")
+  public OperationCompletionRS deleteDashboard(@PathVariable String projectName,
+      @PathVariable Long dashboardId, @AuthenticationPrincipal ReportPortalUser user) {
+    return deleteDashboardHandler.deleteDashboard(
+        dashboardId, projectExtractor.extractProjectDetails(user, projectName), user);
+  }
 
   @Transactional
   @GetMapping(value = "/{dashboardId}")
   @ResponseStatus(OK)
   @ApiOperation("Get specified dashboard by ID for specified project")
   public DashboardResource getDashboard(@PathVariable String projectName,
-      @PathVariable Long dashboardId,
-      @AuthenticationPrincipal ReportPortalUser user) {
-    return getDashboardHandler.getDashboard(dashboardId, projectExtractor.extractProjectDetails(user, projectName));
-	}
+      @PathVariable Long dashboardId, @AuthenticationPrincipal ReportPortalUser user) {
+    return getDashboardHandler.getDashboard(
+        dashboardId, projectExtractor.extractProjectDetails(user, projectName));
+  }
 }
diff --git a/src/main/java/com/epam/ta/reportportal/ws/controller/DeprecatedUserController.java b/src/main/java/com/epam/ta/reportportal/ws/controller/DeprecatedUserController.java
index 0c542985dd..e5de7fc2bf 100644
--- a/src/main/java/com/epam/ta/reportportal/ws/controller/DeprecatedUserController.java
+++ b/src/main/java/com/epam/ta/reportportal/ws/controller/DeprecatedUserController.java
@@ -16,25 +16,25 @@
 import com.epam.ta.reportportal.core.user.GetUserHandler;
 import com.epam.ta.reportportal.entity.user.User;
 import com.epam.ta.reportportal.entity.user.UserRole;
-import com.epam.ta.reportportal.ws.model.ApiKeyRQ;
-import com.epam.ta.reportportal.ws.model.ApiKeyRS;
-import com.epam.ta.reportportal.ws.model.ApiKeysRS;
-import com.epam.ta.reportportal.ws.model.DeleteBulkRQ;
-import com.epam.ta.reportportal.ws.model.DeleteBulkRS;
-import com.epam.ta.reportportal.ws.model.ModelViews;
+import com.epam.ta.reportportal.model.ApiKeyRQ;
+import com.epam.ta.reportportal.model.ApiKeyRS;
+import com.epam.ta.reportportal.model.ApiKeysRS;
+import com.epam.ta.reportportal.model.DeleteBulkRQ;
+import com.epam.ta.reportportal.model.DeleteBulkRS;
+import com.epam.ta.reportportal.model.ModelViews;
+import com.epam.ta.reportportal.model.YesNoRS;
+import com.epam.ta.reportportal.model.user.ChangePasswordRQ;
+import com.epam.ta.reportportal.model.user.CreateUserBidRS;
+import com.epam.ta.reportportal.model.user.CreateUserRQ;
+import com.epam.ta.reportportal.model.user.CreateUserRQConfirm;
+import com.epam.ta.reportportal.model.user.CreateUserRQFull;
+import com.epam.ta.reportportal.model.user.CreateUserRS;
+import com.epam.ta.reportportal.model.user.EditUserRQ;
+import com.epam.ta.reportportal.model.user.ResetPasswordRQ;
+import com.epam.ta.reportportal.model.user.RestorePasswordRQ;
+import com.epam.ta.reportportal.model.user.UserBidRS;
+import com.epam.ta.reportportal.model.user.UserResource;
 import com.epam.ta.reportportal.ws.model.OperationCompletionRS;
-import com.epam.ta.reportportal.ws.model.YesNoRS;
-import com.epam.ta.reportportal.ws.model.user.ChangePasswordRQ;
-import com.epam.ta.reportportal.ws.model.user.CreateUserBidRS;
-import com.epam.ta.reportportal.ws.model.user.CreateUserRQ;
-import com.epam.ta.reportportal.ws.model.user.CreateUserRQConfirm;
-import com.epam.ta.reportportal.ws.model.user.CreateUserRQFull;
-import com.epam.ta.reportportal.ws.model.user.CreateUserRS;
-import com.epam.ta.reportportal.ws.model.user.EditUserRQ;
-import com.epam.ta.reportportal.ws.model.user.ResetPasswordRQ;
-import com.epam.ta.reportportal.ws.model.user.RestorePasswordRQ;
-import com.epam.ta.reportportal.ws.model.user.UserBidRS;
-import com.epam.ta.reportportal.ws.model.user.UserResource;
 import com.epam.ta.reportportal.ws.resolver.ActiveRole;
 import com.epam.ta.reportportal.ws.resolver.FilterFor;
 import com.epam.ta.reportportal.ws.resolver.ResponseView;
diff --git a/src/main/java/com/epam/ta/reportportal/ws/controller/IntegrationController.java b/src/main/java/com/epam/ta/reportportal/ws/controller/IntegrationController.java
index 69bcb8ab3b..629c209862 100644
--- a/src/main/java/com/epam/ta/reportportal/ws/controller/IntegrationController.java
+++ b/src/main/java/com/epam/ta/reportportal/ws/controller/IntegrationController.java
@@ -27,11 +27,11 @@
 import com.epam.ta.reportportal.core.integration.DeleteIntegrationHandler;
 import com.epam.ta.reportportal.core.integration.ExecuteIntegrationHandler;
 import com.epam.ta.reportportal.core.integration.GetIntegrationHandler;
+import com.epam.ta.reportportal.model.EntryCreatedRS;
+import com.epam.ta.reportportal.model.integration.IntegrationRQ;
+import com.epam.ta.reportportal.model.integration.IntegrationResource;
 import com.epam.ta.reportportal.util.ProjectExtractor;
-import com.epam.ta.reportportal.ws.model.EntryCreatedRS;
 import com.epam.ta.reportportal.ws.model.OperationCompletionRS;
-import com.epam.ta.reportportal.ws.model.integration.IntegrationRQ;
-import com.epam.ta.reportportal.ws.model.integration.IntegrationResource;
 import io.swagger.annotations.ApiOperation;
 import java.util.List;
 import java.util.Map;
@@ -91,8 +91,7 @@ public List<IntegrationResource> getGlobalIntegrations(
   @ResponseStatus(HttpStatus.OK)
   @ApiOperation("Get available global integrations for plugin")
   public List<IntegrationResource> getGlobalIntegrations(
-      @AuthenticationPrincipal ReportPortalUser reportPortalUser,
-      @PathVariable String pluginName) {
+      @AuthenticationPrincipal ReportPortalUser reportPortalUser, @PathVariable String pluginName) {
     return getIntegrationHandler.getGlobalIntegrations(pluginName);
   }
 
@@ -112,8 +111,8 @@ public List<IntegrationResource> getProjectIntegrations(@PathVariable String pro
   @PreAuthorize(ASSIGNED_TO_PROJECT)
   @ApiOperation("Get available project integrations for plugin")
   public List<IntegrationResource> getProjectIntegrations(
-      @AuthenticationPrincipal ReportPortalUser reportPortalUser,
-      @PathVariable String projectName, @PathVariable String pluginName) {
+      @AuthenticationPrincipal ReportPortalUser reportPortalUser, @PathVariable String projectName,
+      @PathVariable String pluginName) {
     return getIntegrationHandler.getProjectIntegrations(pluginName, normalizeId(projectName));
   }
 
@@ -123,8 +122,7 @@ public List<IntegrationResource> getProjectIntegrations(
   @ApiOperation("Create global Report Portal integration instance")
   @PreAuthorize(ADMIN_ONLY)
   public EntryCreatedRS createGlobalIntegration(@RequestBody @Valid IntegrationRQ createRequest,
-      @PathVariable String pluginName,
-      @AuthenticationPrincipal ReportPortalUser user) {
+      @PathVariable String pluginName, @AuthenticationPrincipal ReportPortalUser user) {
     return createIntegrationHandler.createGlobalIntegration(createRequest, pluginName, user);
   }
 
@@ -134,10 +132,11 @@ public EntryCreatedRS createGlobalIntegration(@RequestBody @Valid IntegrationRQ
   @ApiOperation("Create project Report Portal integration instance")
   @PreAuthorize(PROJECT_MANAGER)
   public EntryCreatedRS createProjectIntegration(@RequestBody @Valid IntegrationRQ createRequest,
-      @PathVariable String pluginName,
-      @PathVariable String projectName, @AuthenticationPrincipal ReportPortalUser user) {
+      @PathVariable String pluginName, @PathVariable String projectName,
+      @AuthenticationPrincipal ReportPortalUser user) {
     return createIntegrationHandler.createProjectIntegration(normalizeId(projectName),
-        createRequest, pluginName, user);
+        createRequest, pluginName, user
+    );
 
   }
 
@@ -147,8 +146,7 @@ public EntryCreatedRS createProjectIntegration(@RequestBody @Valid IntegrationRQ
   @PreAuthorize(ASSIGNED_TO_PROJECT)
   @ApiOperation("Test connection to the integration through the project config")
   public boolean testIntegrationConnection(@PathVariable Long integrationId,
-      @PathVariable String projectName,
-      @AuthenticationPrincipal ReportPortalUser user) {
+      @PathVariable String projectName, @AuthenticationPrincipal ReportPortalUser user) {
     return getIntegrationHandler.testConnection(integrationId, normalizeId(projectName));
   }
 
@@ -178,8 +176,7 @@ public IntegrationResource getGlobalIntegration(@PathVariable Long integrationId
   @ApiOperation("Get integration instance")
   @PreAuthorize(ASSIGNED_TO_PROJECT)
   public IntegrationResource getProjectIntegration(@PathVariable String projectName,
-      @PathVariable Long integrationId,
-      @AuthenticationPrincipal ReportPortalUser user) {
+      @PathVariable Long integrationId, @AuthenticationPrincipal ReportPortalUser user) {
     return getIntegrationHandler.getProjectIntegrationById(integrationId, normalizeId(projectName));
   }
 
@@ -201,10 +198,11 @@ public OperationCompletionRS updateGlobalIntegration(@PathVariable Long integrat
   @ApiOperation("Update project integration instance")
   @PreAuthorize(PROJECT_MANAGER)
   public OperationCompletionRS updateProjectIntegration(@PathVariable Long integrationId,
-      @RequestBody @Valid IntegrationRQ updateRequest,
-      @PathVariable String projectName, @AuthenticationPrincipal ReportPortalUser user) {
+      @RequestBody @Valid IntegrationRQ updateRequest, @PathVariable String projectName,
+      @AuthenticationPrincipal ReportPortalUser user) {
     return createIntegrationHandler.updateProjectIntegration(integrationId,
-        normalizeId(projectName), updateRequest, user);
+        normalizeId(projectName), updateRequest, user
+    );
 
   }
 
@@ -234,10 +232,10 @@ public OperationCompletionRS deleteAllIntegrations(@PathVariable String type,
   @ApiOperation("Delete project integration instance")
   @PreAuthorize(PROJECT_MANAGER)
   public OperationCompletionRS deleteProjectIntegration(@PathVariable String projectName,
-      @PathVariable Long integrationId,
-      @AuthenticationPrincipal ReportPortalUser user) {
+      @PathVariable Long integrationId, @AuthenticationPrincipal ReportPortalUser user) {
     return deleteIntegrationHandler.deleteProjectIntegration(integrationId,
-        normalizeId(projectName), user);
+        normalizeId(projectName), user
+    );
   }
 
   @Transactional
@@ -246,26 +244,24 @@ public OperationCompletionRS deleteProjectIntegration(@PathVariable String proje
   @ApiOperation("Delete all integrations assigned to specified project")
   @PreAuthorize(PROJECT_MANAGER)
   public OperationCompletionRS deleteAllProjectIntegrations(@PathVariable String type,
-      @PathVariable String projectName,
-      @AuthenticationPrincipal ReportPortalUser user) {
+      @PathVariable String projectName, @AuthenticationPrincipal ReportPortalUser user) {
     return deleteIntegrationHandler.deleteProjectIntegrationsByType(type, normalizeId(projectName),
-        user);
+        user
+    );
   }
 
   @Transactional
   @PutMapping(value = "{projectName}/{integrationId}/{command}", consumes = {
-      APPLICATION_JSON_VALUE})
+      APPLICATION_JSON_VALUE })
   @ResponseStatus(HttpStatus.OK)
   @PreAuthorize(ASSIGNED_TO_PROJECT)
   @ApiOperation("Execute command to the integration instance")
   public Object executeIntegrationCommand(@PathVariable String projectName,
-      @PathVariable("integrationId") Long integrationId,
-      @PathVariable("command") String command, @RequestBody Map<String, Object> executionParams,
+      @PathVariable("integrationId") Long integrationId, @PathVariable("command") String command,
+      @RequestBody Map<String, Object> executionParams,
       @AuthenticationPrincipal ReportPortalUser user) {
     return executeIntegrationHandler.executeCommand(
-        projectExtractor.extractProjectDetails(user, projectName),
-        integrationId,
-        command,
+        projectExtractor.extractProjectDetails(user, projectName), integrationId, command,
         executionParams
     );
   }
diff --git a/src/main/java/com/epam/ta/reportportal/ws/controller/LaunchAsyncController.java b/src/main/java/com/epam/ta/reportportal/ws/controller/LaunchAsyncController.java
index ee4e818e9e..49c2521396 100644
--- a/src/main/java/com/epam/ta/reportportal/ws/controller/LaunchAsyncController.java
+++ b/src/main/java/com/epam/ta/reportportal/ws/controller/LaunchAsyncController.java
@@ -13,6 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package com.epam.ta.reportportal.ws.controller;
 
 import static com.epam.ta.reportportal.auth.permissions.Permissions.ALLOWED_TO_REPORT;
@@ -26,11 +27,11 @@
 import com.epam.ta.reportportal.core.launch.MergeLaunchHandler;
 import com.epam.ta.reportportal.core.launch.StartLaunchHandler;
 import com.epam.ta.reportportal.core.logging.HttpLogging;
+import com.epam.ta.reportportal.model.launch.FinishLaunchRS;
+import com.epam.ta.reportportal.model.launch.MergeLaunchesRQ;
 import com.epam.ta.reportportal.util.ProjectExtractor;
 import com.epam.ta.reportportal.ws.model.FinishExecutionRQ;
-import com.epam.ta.reportportal.ws.model.launch.FinishLaunchRS;
 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 io.swagger.annotations.ApiOperation;
@@ -82,10 +83,11 @@ public LaunchAsyncController(ProjectExtractor projectExtractor,
   @ResponseStatus(CREATED)
   @ApiOperation("Starts launch for specified project")
   public StartLaunchRS startLaunch(@PathVariable String projectName,
-      @ApiParam(value = "Start launch request body", required = true) @RequestBody @Validated StartLaunchRQ startLaunchRQ,
-      @AuthenticationPrincipal ReportPortalUser user) {
+      @ApiParam(value = "Start launch request body", required = true) @RequestBody @Validated
+      StartLaunchRQ startLaunchRQ, @AuthenticationPrincipal ReportPortalUser user) {
     return startLaunchHandler.startLaunch(user,
-        projectExtractor.extractProjectDetails(user, normalizeId(projectName)), startLaunchRQ);
+        projectExtractor.extractProjectDetails(user, normalizeId(projectName)), startLaunchRQ
+    );
   }
 
   @HttpLogging
@@ -94,15 +96,10 @@ public StartLaunchRS startLaunch(@PathVariable String projectName,
   @ResponseStatus(OK)
   @ApiOperation("Finish launch for specified project")
   public FinishLaunchRS finishLaunch(@PathVariable String projectName,
-      @PathVariable String launchId,
-      @RequestBody @Validated FinishExecutionRQ finishLaunchRQ,
-      @AuthenticationPrincipal ReportPortalUser user,
-      HttpServletRequest request) {
-    return finishLaunchHandler.finishLaunch(
-        launchId,
-        finishLaunchRQ,
-        projectExtractor.extractProjectDetails(user, normalizeId(projectName)),
-        user,
+      @PathVariable String launchId, @RequestBody @Validated FinishExecutionRQ finishLaunchRQ,
+      @AuthenticationPrincipal ReportPortalUser user, HttpServletRequest request) {
+    return finishLaunchHandler.finishLaunch(launchId, finishLaunchRQ,
+        projectExtractor.extractProjectDetails(user, normalizeId(projectName)), user,
         composeBaseUrl(request)
     );
   }
@@ -114,11 +111,12 @@ public FinishLaunchRS finishLaunch(@PathVariable String projectName,
   @ResponseStatus(OK)
   @ApiOperation("Merge set of specified launches in common one")
   public LaunchResource mergeLaunches(@PathVariable String projectName,
-      @ApiParam(value = "Merge launches request body", required = true) @RequestBody @Validated MergeLaunchesRQ mergeLaunchesRQ,
-      @AuthenticationPrincipal ReportPortalUser user) {
+      @ApiParam(value = "Merge launches request body", required = true) @RequestBody @Validated
+      MergeLaunchesRQ mergeLaunchesRQ, @AuthenticationPrincipal ReportPortalUser user) {
     return mergeLaunchesHandler.mergeLaunches(
         projectExtractor.extractProjectDetails(user, normalizeId(projectName)), user,
-        mergeLaunchesRQ);
+        mergeLaunchesRQ
+    );
   }
 
 }
diff --git a/src/main/java/com/epam/ta/reportportal/ws/controller/LaunchController.java b/src/main/java/com/epam/ta/reportportal/ws/controller/LaunchController.java
index 30412173f8..93c1331a03 100644
--- a/src/main/java/com/epam/ta/reportportal/ws/controller/LaunchController.java
+++ b/src/main/java/com/epam/ta/reportportal/ws/controller/LaunchController.java
@@ -13,6 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package com.epam.ta.reportportal.ws.controller;
 
 import static com.epam.ta.reportportal.auth.permissions.Permissions.ALLOWED_TO_REPORT;
@@ -38,24 +39,24 @@
 import com.epam.ta.reportportal.entity.launch.Launch;
 import com.epam.ta.reportportal.entity.widget.content.ChartStatisticsContent;
 import com.epam.ta.reportportal.exception.ReportPortalException;
+import com.epam.ta.reportportal.model.BulkRQ;
+import com.epam.ta.reportportal.model.DeleteBulkRQ;
+import com.epam.ta.reportportal.model.DeleteBulkRS;
+import com.epam.ta.reportportal.model.launch.AnalyzeLaunchRQ;
+import com.epam.ta.reportportal.model.launch.FinishLaunchRS;
+import com.epam.ta.reportportal.model.launch.LaunchImportRQ;
+import com.epam.ta.reportportal.model.launch.MergeLaunchesRQ;
+import com.epam.ta.reportportal.model.launch.UpdateLaunchRQ;
+import com.epam.ta.reportportal.model.launch.cluster.CreateClustersRQ;
 import com.epam.ta.reportportal.util.ProjectExtractor;
 import com.epam.ta.reportportal.ws.model.BulkInfoUpdateRQ;
-import com.epam.ta.reportportal.ws.model.BulkRQ;
-import com.epam.ta.reportportal.ws.model.DeleteBulkRQ;
-import com.epam.ta.reportportal.ws.model.DeleteBulkRS;
 import com.epam.ta.reportportal.ws.model.ErrorType;
 import com.epam.ta.reportportal.ws.model.FinishExecutionRQ;
 import com.epam.ta.reportportal.ws.model.OperationCompletionRS;
-import com.epam.ta.reportportal.ws.model.launch.AnalyzeLaunchRQ;
-import com.epam.ta.reportportal.ws.model.launch.FinishLaunchRS;
-import com.epam.ta.reportportal.ws.model.launch.LaunchImportRQ;
 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.launch.UpdateLaunchRQ;
 import com.epam.ta.reportportal.ws.model.launch.cluster.ClusterInfoResource;
-import com.epam.ta.reportportal.ws.model.launch.cluster.CreateClustersRQ;
 import com.epam.ta.reportportal.ws.resolver.FilterFor;
 import com.epam.ta.reportportal.ws.resolver.SortFor;
 import com.google.common.net.HttpHeaders;
@@ -119,9 +120,8 @@ public class LaunchController {
 
   @Autowired
   public LaunchController(ProjectExtractor projectExtractor, StartLaunchHandler startLaunchHandler,
-      FinishLaunchHandler finishLaunchHandler,
-      StopLaunchHandler stopLaunchHandler, DeleteLaunchHandler deleteLaunchMessageHandler,
-      GetLaunchHandler getLaunchMessageHandler,
+      FinishLaunchHandler finishLaunchHandler, StopLaunchHandler stopLaunchHandler,
+      DeleteLaunchHandler deleteLaunchMessageHandler, GetLaunchHandler getLaunchMessageHandler,
       UpdateLaunchHandler updateLaunchHandler, MergeLaunchHandler mergeLaunchesHandler,
       ImportLaunchHandler importLaunchHandler,
       @Qualifier("launchJasperReportHandler") GetJasperReportHandler<Launch> getJasperHandler) {
@@ -144,10 +144,11 @@ public LaunchController(ProjectExtractor projectExtractor, StartLaunchHandler st
   @ResponseStatus(CREATED)
   @ApiOperation("Starts launch for specified project")
   public StartLaunchRS startLaunch(@PathVariable String projectName,
-      @ApiParam(value = "Start launch request body", required = true) @RequestBody @Validated @Valid StartLaunchRQ startLaunchRQ,
-      @AuthenticationPrincipal ReportPortalUser user) {
+      @ApiParam(value = "Start launch request body", required = true) @RequestBody @Validated
+      @Valid StartLaunchRQ startLaunchRQ, @AuthenticationPrincipal ReportPortalUser user) {
     return startLaunchHandler.startLaunch(user,
-        projectExtractor.extractProjectDetails(user, normalizeId(projectName)), startLaunchRQ);
+        projectExtractor.extractProjectDetails(user, normalizeId(projectName)), startLaunchRQ
+    );
   }
 
   @PutMapping(value = "/{launchId}/finish")
@@ -155,14 +156,10 @@ public StartLaunchRS startLaunch(@PathVariable String projectName,
   @ResponseStatus(OK)
   @ApiOperation("Finish launch for specified project")
   public FinishLaunchRS finishLaunch(@PathVariable String projectName,
-      @PathVariable String launchId,
-      @RequestBody @Validated FinishExecutionRQ finishLaunchRQ,
-      @AuthenticationPrincipal ReportPortalUser user,
-      HttpServletRequest request) {
-    return finishLaunchHandler.finishLaunch(launchId,
-        finishLaunchRQ,
-        projectExtractor.extractProjectDetails(user, normalizeId(projectName)),
-        user,
+      @PathVariable String launchId, @RequestBody @Validated FinishExecutionRQ finishLaunchRQ,
+      @AuthenticationPrincipal ReportPortalUser user, HttpServletRequest request) {
+    return finishLaunchHandler.finishLaunch(launchId, finishLaunchRQ,
+        projectExtractor.extractProjectDetails(user, normalizeId(projectName)), user,
         composeBaseUrl(request)
     );
   }
@@ -175,11 +172,11 @@ public FinishLaunchRS finishLaunch(@PathVariable String projectName,
   @ResponseStatus(OK)
   @ApiOperation("Force finish launch for specified project")
   public OperationCompletionRS forceFinishLaunch(@PathVariable String projectName,
-      @PathVariable Long launchId,
-      @RequestBody @Validated FinishExecutionRQ finishExecutionRQ,
+      @PathVariable Long launchId, @RequestBody @Validated FinishExecutionRQ finishExecutionRQ,
       @AuthenticationPrincipal ReportPortalUser user) {
     return stopLaunchHandler.stopLaunch(launchId, finishExecutionRQ,
-        projectExtractor.extractProjectDetails(user, normalizeId(projectName)), user);
+        projectExtractor.extractProjectDetails(user, normalizeId(projectName)), user
+    );
   }
 
   @Transactional
@@ -191,7 +188,8 @@ public List<OperationCompletionRS> bulkForceFinish(@PathVariable String projectN
       @RequestBody @Validated BulkRQ<Long, FinishExecutionRQ> rq,
       @AuthenticationPrincipal ReportPortalUser user) {
     return stopLaunchHandler.stopLaunch(rq,
-        projectExtractor.extractProjectDetails(user, normalizeId(projectName)), user);
+        projectExtractor.extractProjectDetails(user, normalizeId(projectName)), user
+    );
   }
 
   @Transactional
@@ -200,12 +198,11 @@ public List<OperationCompletionRS> bulkForceFinish(@PathVariable String projectN
   @ResponseStatus(OK)
   @ApiOperation("Updates launch for specified project")
   public OperationCompletionRS updateLaunch(@PathVariable String projectName,
-      @PathVariable Long launchId,
-      @RequestBody @Validated UpdateLaunchRQ updateLaunchRQ,
+      @PathVariable Long launchId, @RequestBody @Validated UpdateLaunchRQ updateLaunchRQ,
       @AuthenticationPrincipal ReportPortalUser user) {
     return updateLaunchHandler.updateLaunch(launchId,
-        projectExtractor.extractProjectDetails(user, normalizeId(projectName)), user,
-        updateLaunchRQ);
+        projectExtractor.extractProjectDetails(user, normalizeId(projectName)), user, updateLaunchRQ
+    );
   }
 
   @Transactional
@@ -217,7 +214,8 @@ public List<OperationCompletionRS> updateLaunches(@PathVariable String projectNa
       @RequestBody @Validated BulkRQ<Long, UpdateLaunchRQ> rq,
       @AuthenticationPrincipal ReportPortalUser user) {
     return updateLaunchHandler.updateLaunch(rq,
-        projectExtractor.extractProjectDetails(user, normalizeId(projectName)), user);
+        projectExtractor.extractProjectDetails(user, normalizeId(projectName)), user
+    );
   }
 
   @Transactional
@@ -226,10 +224,10 @@ public List<OperationCompletionRS> updateLaunches(@PathVariable String projectNa
   @ResponseStatus(OK)
   @ApiOperation("Delete specified launch by ID")
   public OperationCompletionRS deleteLaunch(@PathVariable String projectName,
-      @PathVariable Long launchId,
-      @AuthenticationPrincipal ReportPortalUser user) {
+      @PathVariable Long launchId, @AuthenticationPrincipal ReportPortalUser user) {
     return deleteLaunchMessageHandler.deleteLaunch(launchId,
-        projectExtractor.extractProjectDetails(user, normalizeId(projectName)), user);
+        projectExtractor.extractProjectDetails(user, normalizeId(projectName)), user
+    );
   }
 
   @Transactional(readOnly = true)
@@ -239,7 +237,8 @@ public OperationCompletionRS deleteLaunch(@PathVariable String projectName,
   public LaunchResource getLaunch(@PathVariable String projectName, @PathVariable String launchId,
       @AuthenticationPrincipal ReportPortalUser user) {
     return getLaunchMessageHandler.getLaunch(launchId,
-        projectExtractor.extractProjectDetails(user, normalizeId(projectName)));
+        projectExtractor.extractProjectDetails(user, normalizeId(projectName))
+    );
   }
 
   @Transactional(readOnly = true)
@@ -247,10 +246,10 @@ public LaunchResource getLaunch(@PathVariable String projectName, @PathVariable
   @ResponseStatus(OK)
   @ApiOperation("Get specified launch by UUID")
   public LaunchResource getLaunchByUuid(@PathVariable String projectName,
-      @PathVariable String launchId,
-      @AuthenticationPrincipal ReportPortalUser user) {
+      @PathVariable String launchId, @AuthenticationPrincipal ReportPortalUser user) {
     return getLaunchMessageHandler.getLaunch(launchId,
-        projectExtractor.extractProjectDetails(user, normalizeId(projectName)));
+        projectExtractor.extractProjectDetails(user, normalizeId(projectName))
+    );
   }
 
   @Transactional(readOnly = true)
@@ -258,12 +257,10 @@ public LaunchResource getLaunchByUuid(@PathVariable String projectName,
   @ResponseStatus(OK)
   @ApiOperation("Get list of project launches by filter")
   public Iterable<LaunchResource> getProjectLaunches(@PathVariable String projectName,
-      @FilterFor(Launch.class) Filter filter,
-      @SortFor(Launch.class) Pageable pageable, @AuthenticationPrincipal ReportPortalUser user) {
+      @FilterFor(Launch.class) Filter filter, @SortFor(Launch.class) Pageable pageable,
+      @AuthenticationPrincipal ReportPortalUser user) {
     return getLaunchMessageHandler.getProjectLaunches(
-        projectExtractor.extractProjectDetails(user, normalizeId(projectName)),
-        filter,
-        pageable,
+        projectExtractor.extractProjectDetails(user, normalizeId(projectName)), filter, pageable,
         user.getUsername()
     );
   }
@@ -273,8 +270,8 @@ public Iterable<LaunchResource> getProjectLaunches(@PathVariable String projectN
   @ResponseStatus(OK)
   @ApiOperation("Get list of latest project launches by filter")
   public Iterable<LaunchResource> getLatestLaunches(@PathVariable String projectName,
-      @FilterFor(Launch.class) Filter filter,
-      @SortFor(Launch.class) Pageable pageable, @AuthenticationPrincipal ReportPortalUser user) {
+      @FilterFor(Launch.class) Filter filter, @SortFor(Launch.class) Pageable pageable,
+      @AuthenticationPrincipal ReportPortalUser user) {
     return getLaunchMessageHandler.getLatestLaunches(
         projectExtractor.extractProjectDetails(user, normalizeId(projectName)), filter, pageable);
   }
@@ -284,8 +281,8 @@ public Iterable<LaunchResource> getLatestLaunches(@PathVariable String projectNa
   @ResponseStatus(OK)
   @ApiOperation("Get launches of specified project from DEBUG mode")
   public Iterable<LaunchResource> getDebugLaunches(@PathVariable String projectName,
-      @FilterFor(Launch.class) Filter filter,
-      @SortFor(Launch.class) Pageable pageable, @AuthenticationPrincipal ReportPortalUser user) {
+      @FilterFor(Launch.class) Filter filter, @SortFor(Launch.class) Pageable pageable,
+      @AuthenticationPrincipal ReportPortalUser user) {
     return getLaunchMessageHandler.getDebugLaunches(
         projectExtractor.extractProjectDetails(user, normalizeId(projectName)), filter, pageable);
   }
@@ -320,8 +317,7 @@ public Iterable<ClusterInfoResource> getClusters(@PathVariable String projectNam
       @PathVariable String launchId, Pageable pageable,
       @AuthenticationPrincipal ReportPortalUser user) {
     return getLaunchMessageHandler.getClusters(launchId,
-        projectExtractor.extractProjectDetails(user, normalizeId(projectName)),
-        pageable
+        projectExtractor.extractProjectDetails(user, normalizeId(projectName)), pageable
     );
   }
 
@@ -334,7 +330,8 @@ public OperationCompletionRS bulkUpdate(@PathVariable String projectName,
       @RequestBody @Validated BulkInfoUpdateRQ bulkInfoUpdateRQ,
       @AuthenticationPrincipal ReportPortalUser user) {
     return updateLaunchHandler.bulkInfoUpdate(bulkInfoUpdateRQ,
-        projectExtractor.extractProjectDetails(user, projectName));
+        projectExtractor.extractProjectDetails(user, projectName)
+    );
   }
 
   @Transactional(readOnly = true)
@@ -354,9 +351,8 @@ public List<String> getAllOwners(@PathVariable String projectName,
   @ResponseStatus(OK)
   @ApiOperation("Get launch names of project")
   public List<String> getAllLaunchNames(@PathVariable String projectName,
-      @RequestParam(value = "filter." + "cnt."
-          + "name", required = false, defaultValue = "") String value,
-      @AuthenticationPrincipal ReportPortalUser user) {
+      @RequestParam(value = "filter." + "cnt." + "name", required = false, defaultValue = "")
+      String value, @AuthenticationPrincipal ReportPortalUser user) {
     return getLaunchMessageHandler.getLaunchNames(
         projectExtractor.extractProjectDetails(user, normalizeId(projectName)), value);
   }
@@ -377,11 +373,12 @@ public Map<String, List<ChartStatisticsContent>> compareLaunches(@PathVariable S
   @ResponseStatus(OK)
   @ApiOperation("Merge set of specified launches in common one")
   public LaunchResource mergeLaunches(@PathVariable String projectName,
-      @ApiParam(value = "Merge launches request body", required = true) @RequestBody @Validated MergeLaunchesRQ mergeLaunchesRQ,
-      @AuthenticationPrincipal ReportPortalUser user) {
+      @ApiParam(value = "Merge launches request body", required = true) @RequestBody @Validated
+      MergeLaunchesRQ mergeLaunchesRQ, @AuthenticationPrincipal ReportPortalUser user) {
     return mergeLaunchesHandler.mergeLaunches(
         projectExtractor.extractProjectDetails(user, normalizeId(projectName)), user,
-        mergeLaunchesRQ);
+        mergeLaunchesRQ
+    );
   }
 
   @Transactional
@@ -392,7 +389,8 @@ public OperationCompletionRS startLaunchAnalyzer(@PathVariable String projectNam
       @RequestBody @Validated AnalyzeLaunchRQ analyzeLaunchRQ,
       @AuthenticationPrincipal ReportPortalUser user) {
     return updateLaunchHandler.startLaunchAnalyzer(analyzeLaunchRQ,
-        projectExtractor.extractProjectDetails(user, normalizeId(projectName)), user);
+        projectExtractor.extractProjectDetails(user, normalizeId(projectName)), user
+    );
   }
 
   @PostMapping(value = "/cluster")
@@ -402,7 +400,8 @@ public OperationCompletionRS createClusters(@PathVariable String projectName,
       @RequestBody @Validated CreateClustersRQ createClustersRQ,
       @AuthenticationPrincipal ReportPortalUser user) {
     return updateLaunchHandler.createClusters(createClustersRQ,
-        projectExtractor.extractProjectDetails(user, normalizeId(projectName)), user);
+        projectExtractor.extractProjectDetails(user, normalizeId(projectName)), user
+    );
   }
 
   @Transactional(readOnly = true)
@@ -410,8 +409,7 @@ public OperationCompletionRS createClusters(@PathVariable String projectName,
   @ResponseStatus(OK)
 
   public Map<String, String> getStatuses(@PathVariable String projectName,
-      @RequestParam(value = "ids") Long[] ids,
-      @AuthenticationPrincipal ReportPortalUser user) {
+      @RequestParam(value = "ids") Long[] ids, @AuthenticationPrincipal ReportPortalUser user) {
     return getLaunchMessageHandler.getStatuses(
         projectExtractor.extractProjectDetails(user, normalizeId(projectName)), ids);
   }
@@ -422,7 +420,8 @@ public Map<String, String> getStatuses(@PathVariable String projectName,
   @PreAuthorize(ASSIGNED_TO_PROJECT)
   @ApiOperation(value = "Export specified launch", notes = "Only following formats are supported: pdf (by default), xls, html.")
   public void getLaunchReport(@PathVariable String projectName, @PathVariable Long launchId,
-      @ApiParam(allowableValues = "pdf, xls, html") @RequestParam(value = "view", required = false, defaultValue = "pdf") String view,
+      @ApiParam(allowableValues = "pdf, xls, html")
+      @RequestParam(value = "view", required = false, defaultValue = "pdf") String view,
       @AuthenticationPrincipal ReportPortalUser user, HttpServletResponse response) {
 
     ReportFormat format = getJasperHandler.getReportFormat(view);
@@ -430,14 +429,16 @@ public void getLaunchReport(@PathVariable String projectName, @PathVariable Long
 
     response.setHeader(HttpHeaders.CONTENT_DISPOSITION,
         String.format("attachment; filename=\"RP_LAUNCH_%s_Report.%s\"", format.name(),
-            format.getValue())
+            format.getValue()
+        )
     );
 
     try (OutputStream outputStream = response.getOutputStream()) {
       getLaunchMessageHandler.exportLaunch(launchId, format, outputStream, user);
     } catch (IOException e) {
       throw new ReportPortalException(ErrorType.BAD_REQUEST_ERROR,
-          "Unable to write data to the response.");
+          "Unable to write data to the response."
+      );
     }
   }
 
@@ -450,26 +451,21 @@ public DeleteBulkRS deleteLaunches(@PathVariable String projectName,
       @RequestBody @Valid DeleteBulkRQ deleteBulkRQ,
       @AuthenticationPrincipal ReportPortalUser user) {
     return deleteLaunchMessageHandler.deleteLaunches(deleteBulkRQ,
-        projectExtractor.extractProjectDetails(user, normalizeId(projectName)), user);
+        projectExtractor.extractProjectDetails(user, normalizeId(projectName)), user
+    );
   }
 
-  @ApiImplicitParams(
-      @ApiImplicitParam(name = "launchImportRq", dataType = "LaunchImportRQ", paramType = "body")
-  )
-  @PostMapping(value = "/import", consumes = {MediaType.MULTIPART_FORM_DATA_VALUE})
+  @ApiImplicitParams(@ApiImplicitParam(name = "launchImportRq", dataType = "LaunchImportRQ", paramType = "body"))
+  @PostMapping(value = "/import", consumes = { MediaType.MULTIPART_FORM_DATA_VALUE })
   @ResponseStatus(OK)
   @ApiOperation(value = "Import junit xml report", notes = "Only following formats are supported: zip and xml.")
   public OperationCompletionRS importLaunch(@PathVariable String projectName,
-      @RequestParam("file") MultipartFile file,
-      @AuthenticationPrincipal ReportPortalUser user, HttpServletRequest request,
+      @RequestParam("file") MultipartFile file, @AuthenticationPrincipal ReportPortalUser user,
+      HttpServletRequest request,
       @RequestPart(required = false) @Valid LaunchImportRQ launchImportRq) {
     return importLaunchHandler.importLaunch(
-        projectExtractor.extractProjectDetails(user, normalizeId(projectName)),
-        user,
-        "XUNIT",
-        file,
-        composeBaseUrl(request),
-        launchImportRq
+        projectExtractor.extractProjectDetails(user, normalizeId(projectName)), user, "XUNIT", file,
+        composeBaseUrl(request), launchImportRq
     );
   }
 }
diff --git a/src/main/java/com/epam/ta/reportportal/ws/controller/LogController.java b/src/main/java/com/epam/ta/reportportal/ws/controller/LogController.java
index c55898dc0d..50628ef033 100644
--- a/src/main/java/com/epam/ta/reportportal/ws/controller/LogController.java
+++ b/src/main/java/com/epam/ta/reportportal/ws/controller/LogController.java
@@ -38,6 +38,10 @@
 import com.epam.ta.reportportal.core.log.GetLogHandler;
 import com.epam.ta.reportportal.core.log.impl.PagedLogResource;
 import com.epam.ta.reportportal.entity.log.Log;
+import com.epam.ta.reportportal.model.log.GetLogsUnderRq;
+import com.epam.ta.reportportal.model.log.LogResource;
+import com.epam.ta.reportportal.model.log.SearchLogRq;
+import com.epam.ta.reportportal.model.log.SearchLogRs;
 import com.epam.ta.reportportal.util.ProjectExtractor;
 import com.epam.ta.reportportal.ws.model.BatchElementCreatedRS;
 import com.epam.ta.reportportal.ws.model.BatchSaveOperatingRS;
@@ -45,11 +49,7 @@
 import com.epam.ta.reportportal.ws.model.EntryCreatedAsyncRS;
 import com.epam.ta.reportportal.ws.model.ErrorType;
 import com.epam.ta.reportportal.ws.model.OperationCompletionRS;
-import com.epam.ta.reportportal.ws.model.log.GetLogsUnderRq;
-import com.epam.ta.reportportal.ws.model.log.LogResource;
 import com.epam.ta.reportportal.ws.model.log.SaveLogRQ;
-import com.epam.ta.reportportal.ws.model.log.SearchLogRq;
-import com.epam.ta.reportportal.ws.model.log.SearchLogRs;
 import com.epam.ta.reportportal.ws.resolver.FilterFor;
 import com.epam.ta.reportportal.ws.resolver.SortFor;
 import com.google.common.collect.ImmutableMap;
@@ -102,8 +102,7 @@ public class LogController {
   @Autowired
   public LogController(ProjectExtractor projectExtractor,
       @Autowired CreateLogHandler createLogHandler, DeleteLogHandler deleteLogHandler,
-      GetLogHandler getLogHandler,
-      SearchLogService searchLogService, Validator validator) {
+      GetLogHandler getLogHandler, SearchLogService searchLogService, Validator validator) {
     this.projectExtractor = projectExtractor;
     this.createLogHandler = createLogHandler;
     this.deleteLogHandler = deleteLogHandler;
@@ -119,32 +118,32 @@ public LogController(ProjectExtractor projectExtractor,
    */
   /* Report client API */
   @Deprecated
-  @PostMapping(consumes = {MediaType.APPLICATION_JSON_VALUE})
+  @PostMapping(consumes = { MediaType.APPLICATION_JSON_VALUE })
   @ResponseStatus(CREATED)
   @ApiIgnore
   @PreAuthorize(ALLOWED_TO_REPORT)
   public EntryCreatedAsyncRS createLog(@PathVariable String projectName,
-      @RequestBody SaveLogRQ createLogRQ,
-      @AuthenticationPrincipal ReportPortalUser user) {
+      @RequestBody SaveLogRQ createLogRQ, @AuthenticationPrincipal ReportPortalUser user) {
     validateSaveRQ(validator, createLogRQ);
     return createLogHandler.createLog(createLogRQ, null,
-        projectExtractor.extractProjectDetails(user, projectName));
+        projectExtractor.extractProjectDetails(user, projectName)
+    );
   }
 
   /* Report client API */
-  @PostMapping(value = "/entry", consumes = {MediaType.APPLICATION_JSON_VALUE})
+  @PostMapping(value = "/entry", consumes = { MediaType.APPLICATION_JSON_VALUE })
   @ResponseStatus(CREATED)
   @ApiOperation("Create log")
   @PreAuthorize(ALLOWED_TO_REPORT)
   public EntryCreatedAsyncRS createLogEntry(@PathVariable String projectName,
-      @RequestBody SaveLogRQ createLogRQ,
-      @AuthenticationPrincipal ReportPortalUser user) {
+      @RequestBody SaveLogRQ createLogRQ, @AuthenticationPrincipal ReportPortalUser user) {
     validateSaveRQ(validator, createLogRQ);
     return createLogHandler.createLog(createLogRQ, null,
-        projectExtractor.extractProjectDetails(user, projectName));
+        projectExtractor.extractProjectDetails(user, projectName)
+    );
   }
 
-  @PostMapping(consumes = {MediaType.MULTIPART_FORM_DATA_VALUE})
+  @PostMapping(consumes = { MediaType.MULTIPART_FORM_DATA_VALUE })
   @ApiOperation("Create log (batching operation)")
   // Specific handler should be added for springfox in case of similar POST
   // request mappings
@@ -152,8 +151,7 @@ public EntryCreatedAsyncRS createLogEntry(@PathVariable String projectName,
   @PreAuthorize(ALLOWED_TO_REPORT)
   public ResponseEntity<BatchSaveOperatingRS> createLog(@PathVariable String projectName,
       @RequestPart(value = Constants.LOG_REQUEST_JSON_PART) SaveLogRQ[] createLogRQs,
-      HttpServletRequest request,
-      @AuthenticationPrincipal ReportPortalUser user) {
+      HttpServletRequest request, @AuthenticationPrincipal ReportPortalUser user) {
 
     /*
      * Since this is multipart request we can retrieve list of uploaded
@@ -180,7 +178,8 @@ public ResponseEntity<BatchSaveOperatingRS> createLog(@PathVariable String proje
           BusinessRule.expect(data, Predicates.notNull())
               .verify(ErrorType.BINARY_DATA_CANNOT_BE_SAVED,
                   Suppliers.formattedSupplier("There is no request part or file with name {}",
-                      filename)
+                      filename
+                  )
               );
           /*
            * If provided content type is null or this is octet
@@ -189,12 +188,14 @@ public ResponseEntity<BatchSaveOperatingRS> createLog(@PathVariable String proje
            */
           //noinspection ConstantConditions
           responseItem = createLogHandler.createLog(createLogRq, data,
-              projectExtractor.extractProjectDetails(user, projectName));
+              projectExtractor.extractProjectDetails(user, projectName)
+          );
         }
         response.addResponse(new BatchElementCreatedRS(responseItem.getId()));
       } catch (Exception e) {
         response.addResponse(new BatchElementCreatedRS(ExceptionUtils.getStackTrace(e),
-            ExceptionUtils.getMessage(e)));
+            ExceptionUtils.getMessage(e)
+        ));
       }
     }
     return new ResponseEntity<>(response, CREATED);
@@ -209,20 +210,21 @@ public ResponseEntity<BatchSaveOperatingRS> createLog(@PathVariable String proje
   public OperationCompletionRS deleteLog(@PathVariable String projectName, @PathVariable Long logId,
       @AuthenticationPrincipal ReportPortalUser user) {
     return deleteLogHandler.deleteLog(logId,
-        projectExtractor.extractProjectDetails(user, projectName), user);
+        projectExtractor.extractProjectDetails(user, projectName), user
+    );
   }
 
   @RequestMapping(method = RequestMethod.GET)
   @ApiOperation("Get logs by filter")
   @Transactional(readOnly = true)
   public Iterable<LogResource> getLogs(@PathVariable String projectName,
-      @RequestParam(value = DEFAULT_FILTER_PREFIX + UNDR
-          + CRITERIA_PATH, required = false) String underPath,
-      @FilterFor(Log.class) Filter filter,
-      @SortDefault({"logTime"}) @SortFor(Log.class) Pageable pageable,
+      @RequestParam(value = DEFAULT_FILTER_PREFIX + UNDR + CRITERIA_PATH, required = false)
+      String underPath, @FilterFor(Log.class) Filter filter,
+      @SortDefault({ "logTime" }) @SortFor(Log.class) Pageable pageable,
       @AuthenticationPrincipal ReportPortalUser user) {
     return getLogHandler.getLogs(underPath,
-        projectExtractor.extractProjectDetails(user, projectName), filter, pageable);
+        projectExtractor.extractProjectDetails(user, projectName), filter, pageable
+    );
   }
 
   @PostMapping(value = "/under")
@@ -231,19 +233,20 @@ public Iterable<LogResource> getLogs(@PathVariable String projectName,
   public Map<Long, List<LogResource>> getLogsUnder(@PathVariable String projectName,
       @RequestBody GetLogsUnderRq logsUnderRq, @AuthenticationPrincipal ReportPortalUser user) {
     return getLogHandler.getLogs(logsUnderRq,
-        projectExtractor.extractProjectDetails(user, projectName));
+        projectExtractor.extractProjectDetails(user, projectName)
+    );
   }
 
   @GetMapping(value = "/{logId}/page")
   @ApiOperation("Get logs by filter")
   @Transactional(readOnly = true)
   public Map<String, Serializable> getPageNumber(@PathVariable String projectName,
-      @PathVariable Long logId,
-      @FilterFor(Log.class) Filter filter, @SortFor(Log.class) Pageable pageable,
-      @AuthenticationPrincipal ReportPortalUser user) {
+      @PathVariable Long logId, @FilterFor(Log.class) Filter filter,
+      @SortFor(Log.class) Pageable pageable, @AuthenticationPrincipal ReportPortalUser user) {
     return ImmutableMap.<String, Serializable>builder().put("number",
         getLogHandler.getPageNumber(logId,
-            projectExtractor.extractProjectDetails(user, projectName), filter, pageable)
+            projectExtractor.extractProjectDetails(user, projectName), filter, pageable
+        )
     ).build();
   }
 
@@ -253,7 +256,8 @@ public Map<String, Serializable> getPageNumber(@PathVariable String projectName,
   public LogResource getLog(@PathVariable String projectName, @PathVariable String logId,
       @AuthenticationPrincipal ReportPortalUser user) {
     return getLogHandler.getLog(logId, projectExtractor.extractProjectDetails(user, projectName),
-        user);
+        user
+    );
   }
 
   /**
@@ -267,7 +271,8 @@ public LogResource getLog(@PathVariable String projectName, @PathVariable String
   public LogResource getLogByUuid(@PathVariable String projectName, @PathVariable String logId,
       @AuthenticationPrincipal ReportPortalUser user) {
     return getLogHandler.getLog(logId, projectExtractor.extractProjectDetails(user, projectName),
-        user);
+        user
+    );
   }
 
   @GetMapping(value = "/nested/{parentId}")
@@ -275,10 +280,11 @@ public LogResource getLogByUuid(@PathVariable String projectName, @PathVariable
   @Transactional(readOnly = true)
   public Iterable<?> getNestedItems(@PathVariable String projectName, @PathVariable Long parentId,
       @ApiParam(required = false) @RequestParam Map<String, String> params,
-      @FilterFor(Log.class) Filter filter,
-      @SortFor(Log.class) Pageable pageable, @AuthenticationPrincipal ReportPortalUser user) {
+      @FilterFor(Log.class) Filter filter, @SortFor(Log.class) Pageable pageable,
+      @AuthenticationPrincipal ReportPortalUser user) {
     return getLogHandler.getNestedItems(parentId,
-        projectExtractor.extractProjectDetails(user, projectName), params, filter, pageable);
+        projectExtractor.extractProjectDetails(user, projectName), params, filter, pageable
+    );
   }
 
   @GetMapping(value = "/locations/{parentId}")
@@ -289,7 +295,8 @@ public List<PagedLogResource> getErrorPage(@PathVariable String projectName,
       @FilterFor(Log.class) Filter filter, @SortFor(Log.class) Pageable pageable,
       @AuthenticationPrincipal ReportPortalUser user) {
     return getLogHandler.getLogsWithLocation(parentId,
-        projectExtractor.extractProjectDetails(user, projectName), params, filter, pageable);
+        projectExtractor.extractProjectDetails(user, projectName), params, filter, pageable
+    );
   }
 
   @PostMapping("search/{itemId}")
@@ -299,7 +306,8 @@ public Iterable<SearchLogRs> searchLogs(@PathVariable String projectName,
       @RequestBody SearchLogRq request, @PathVariable Long itemId,
       @AuthenticationPrincipal ReportPortalUser user) {
     return searchLogService.search(itemId, request,
-        projectExtractor.extractProjectDetails(user, projectName));
+        projectExtractor.extractProjectDetails(user, projectName)
+    );
   }
 
 }
diff --git a/src/main/java/com/epam/ta/reportportal/ws/controller/PluginController.java b/src/main/java/com/epam/ta/reportportal/ws/controller/PluginController.java
index 8614e9108b..0ef56e4e81 100644
--- a/src/main/java/com/epam/ta/reportportal/ws/controller/PluginController.java
+++ b/src/main/java/com/epam/ta/reportportal/ws/controller/PluginController.java
@@ -16,36 +16,44 @@
 
 package com.epam.ta.reportportal.ws.controller;
 
+import static com.epam.ta.reportportal.auth.permissions.Permissions.ADMIN_ONLY;
+import static com.epam.ta.reportportal.auth.permissions.Permissions.ASSIGNED_TO_PROJECT;
+import static org.springframework.http.MediaType.APPLICATION_JSON_VALUE;
+
 import com.epam.ta.reportportal.commons.ReportPortalUser;
 import com.epam.ta.reportportal.core.integration.ExecuteIntegrationHandler;
 import com.epam.ta.reportportal.core.integration.plugin.CreatePluginHandler;
 import com.epam.ta.reportportal.core.integration.plugin.DeletePluginHandler;
 import com.epam.ta.reportportal.core.integration.plugin.GetPluginHandler;
 import com.epam.ta.reportportal.core.integration.plugin.UpdatePluginHandler;
+import com.epam.ta.reportportal.model.EntryCreatedRS;
+import com.epam.ta.reportportal.model.integration.IntegrationTypeResource;
+import com.epam.ta.reportportal.model.integration.UpdatePluginStateRQ;
 import com.epam.ta.reportportal.util.ProjectExtractor;
-import com.epam.ta.reportportal.ws.model.EntryCreatedRS;
 import com.epam.ta.reportportal.ws.model.OperationCompletionRS;
-import com.epam.ta.reportportal.ws.model.integration.IntegrationTypeResource;
-import com.epam.ta.reportportal.ws.model.integration.UpdatePluginStateRQ;
 import io.swagger.annotations.ApiOperation;
+import java.util.List;
+import java.util.Map;
+import javax.validation.Valid;
+import javax.validation.constraints.NotNull;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.MediaType;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.security.core.annotation.AuthenticationPrincipal;
 import org.springframework.transaction.annotation.Transactional;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.ResponseStatus;
+import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.multipart.MultipartFile;
 
-import javax.validation.Valid;
-import javax.validation.constraints.NotNull;
-import java.util.List;
-import java.util.Map;
-
-import static com.epam.ta.reportportal.auth.permissions.Permissions.ADMIN_ONLY;
-import static com.epam.ta.reportportal.auth.permissions.Permissions.ASSIGNED_TO_PROJECT;
-import static org.springframework.http.MediaType.APPLICATION_JSON_VALUE;
-
 /**
  * @author <a href="mailto:ivan_budayeu@epam.com">Ivan Budayeu</a>
  */
@@ -53,74 +61,78 @@
 @RequestMapping(value = "/v1/plugin")
 public class PluginController {
 
-	private final CreatePluginHandler createPluginHandler;
-	private final UpdatePluginHandler updatePluginHandler;
-	private final GetPluginHandler getPluginHandler;
-	private final DeletePluginHandler deletePluginHandler;
-	private final ExecuteIntegrationHandler executeIntegrationHandler;
-	private final ProjectExtractor projectExtractor;
+  private final CreatePluginHandler createPluginHandler;
+  private final UpdatePluginHandler updatePluginHandler;
+  private final GetPluginHandler getPluginHandler;
+  private final DeletePluginHandler deletePluginHandler;
+  private final ExecuteIntegrationHandler executeIntegrationHandler;
+  private final ProjectExtractor projectExtractor;
 
-	@Autowired
-	public PluginController(CreatePluginHandler createPluginHandler, UpdatePluginHandler updatePluginHandler,
-			GetPluginHandler getPluginHandler, DeletePluginHandler deletePluginHandler, ExecuteIntegrationHandler executeIntegrationHandler,
-			ProjectExtractor projectExtractor) {
-		this.createPluginHandler = createPluginHandler;
-		this.updatePluginHandler = updatePluginHandler;
-		this.getPluginHandler = getPluginHandler;
-		this.deletePluginHandler = deletePluginHandler;
-		this.executeIntegrationHandler = executeIntegrationHandler;
-		this.projectExtractor = projectExtractor;
-	}
+  @Autowired
+  public PluginController(CreatePluginHandler createPluginHandler,
+      UpdatePluginHandler updatePluginHandler, GetPluginHandler getPluginHandler,
+      DeletePluginHandler deletePluginHandler, ExecuteIntegrationHandler executeIntegrationHandler,
+      ProjectExtractor projectExtractor) {
+    this.createPluginHandler = createPluginHandler;
+    this.updatePluginHandler = updatePluginHandler;
+    this.getPluginHandler = getPluginHandler;
+    this.deletePluginHandler = deletePluginHandler;
+    this.executeIntegrationHandler = executeIntegrationHandler;
+    this.projectExtractor = projectExtractor;
+  }
 
-	@Transactional
-	@PostMapping(consumes = MediaType.MULTIPART_FORM_DATA_VALUE)
-	@ResponseStatus(HttpStatus.CREATED)
-	@ApiOperation("Upload new Report Portal plugin")
-	@PreAuthorize(ADMIN_ONLY)
-	public EntryCreatedRS uploadPlugin(@NotNull @RequestParam("file") MultipartFile pluginFile,
-			@AuthenticationPrincipal ReportPortalUser user) {
-		return createPluginHandler.uploadPlugin(pluginFile, user);
-	}
+  @Transactional
+  @PostMapping(consumes = MediaType.MULTIPART_FORM_DATA_VALUE)
+  @ResponseStatus(HttpStatus.CREATED)
+  @ApiOperation("Upload new Report Portal plugin")
+  @PreAuthorize(ADMIN_ONLY)
+  public EntryCreatedRS uploadPlugin(@NotNull @RequestParam("file") MultipartFile pluginFile,
+      @AuthenticationPrincipal ReportPortalUser user) {
+    return createPluginHandler.uploadPlugin(pluginFile, user);
+  }
 
-	@Transactional
-	@PutMapping(value = "/{pluginId}")
-	@ResponseStatus(HttpStatus.OK)
-	@ApiOperation("Update Report Portal plugin state")
-	@PreAuthorize(ADMIN_ONLY)
-	public OperationCompletionRS updatePluginState(@PathVariable(value = "pluginId") Long id,
-			@RequestBody @Valid UpdatePluginStateRQ updatePluginStateRQ, @AuthenticationPrincipal ReportPortalUser user) {
-		return updatePluginHandler.updatePluginState(id, updatePluginStateRQ, user);
-	}
+  @Transactional
+  @PutMapping(value = "/{pluginId}")
+  @ResponseStatus(HttpStatus.OK)
+  @ApiOperation("Update Report Portal plugin state")
+  @PreAuthorize(ADMIN_ONLY)
+  public OperationCompletionRS updatePluginState(@PathVariable(value = "pluginId") Long id,
+      @RequestBody @Valid UpdatePluginStateRQ updatePluginStateRQ,
+      @AuthenticationPrincipal ReportPortalUser user) {
+    return updatePluginHandler.updatePluginState(id, updatePluginStateRQ, user);
+  }
 
-	@Transactional(readOnly = true)
-	@GetMapping
-	@ResponseStatus(HttpStatus.OK)
-	@ApiOperation("Get all available plugins")
-	public List<IntegrationTypeResource> getPlugins(@AuthenticationPrincipal ReportPortalUser user) {
-		return getPluginHandler.getPlugins();
-	}
+  @Transactional(readOnly = true)
+  @GetMapping
+  @ResponseStatus(HttpStatus.OK)
+  @ApiOperation("Get all available plugins")
+  public List<IntegrationTypeResource> getPlugins(@AuthenticationPrincipal ReportPortalUser user) {
+    return getPluginHandler.getPlugins();
+  }
 
-	@Transactional
-	@DeleteMapping(value = "/{pluginId}")
-	@ResponseStatus(HttpStatus.OK)
-	@ApiOperation("Delete plugin by id")
-	@PreAuthorize(ADMIN_ONLY)
-	public OperationCompletionRS deletePlugin(@PathVariable(value = "pluginId") Long id, @AuthenticationPrincipal ReportPortalUser user) {
-		return deletePluginHandler.deleteById(id, user);
-	}
+  @Transactional
+  @DeleteMapping(value = "/{pluginId}")
+  @ResponseStatus(HttpStatus.OK)
+  @ApiOperation("Delete plugin by id")
+  @PreAuthorize(ADMIN_ONLY)
+  public OperationCompletionRS deletePlugin(@PathVariable(value = "pluginId") Long id,
+      @AuthenticationPrincipal ReportPortalUser user) {
+    return deletePluginHandler.deleteById(id, user);
+  }
 
-	@Transactional
-	@PutMapping(value = "{projectName}/{pluginName}/common/{command}", consumes = { APPLICATION_JSON_VALUE })
-	@ResponseStatus(HttpStatus.OK)
-	@PreAuthorize(ASSIGNED_TO_PROJECT)
-	@ApiOperation("Execute command to the plugin instance")
-	public Object executePluginCommand(@PathVariable String projectName, @PathVariable("pluginName") String pluginName,
-			@PathVariable("command") String command, @RequestBody Map<String, Object> executionParams,
-			@AuthenticationPrincipal ReportPortalUser user) {
-		return executeIntegrationHandler.executeCommand(projectExtractor.extractProjectDetails(user, projectName),
-				pluginName,
-				command,
-				executionParams
-		);
-	}
+  @Transactional
+  @PutMapping(value = "{projectName}/{pluginName}/common/{command}", consumes = {
+      APPLICATION_JSON_VALUE })
+  @ResponseStatus(HttpStatus.OK)
+  @PreAuthorize(ASSIGNED_TO_PROJECT)
+  @ApiOperation("Execute command to the plugin instance")
+  public Object executePluginCommand(@PathVariable String projectName,
+      @PathVariable("pluginName") String pluginName, @PathVariable("command") String command,
+      @RequestBody Map<String, Object> executionParams,
+      @AuthenticationPrincipal ReportPortalUser user) {
+    return executeIntegrationHandler.executeCommand(
+        projectExtractor.extractProjectDetails(user, projectName), pluginName, command,
+        executionParams
+    );
+  }
 }
diff --git a/src/main/java/com/epam/ta/reportportal/ws/controller/PluginPublicController.java b/src/main/java/com/epam/ta/reportportal/ws/controller/PluginPublicController.java
index b616ce2210..5766a5f230 100644
--- a/src/main/java/com/epam/ta/reportportal/ws/controller/PluginPublicController.java
+++ b/src/main/java/com/epam/ta/reportportal/ws/controller/PluginPublicController.java
@@ -22,8 +22,8 @@
 import com.epam.ta.reportportal.core.integration.plugin.GetPluginHandler;
 import com.epam.ta.reportportal.core.integration.plugin.binary.PluginFilesProvider;
 import com.epam.ta.reportportal.entity.attachment.BinaryData;
+import com.epam.ta.reportportal.model.integration.IntegrationTypeResource;
 import com.epam.ta.reportportal.util.BinaryDataResponseWriter;
-import com.epam.ta.reportportal.ws.model.integration.IntegrationTypeResource;
 import io.swagger.annotations.ApiOperation;
 import java.util.List;
 import java.util.Map;
@@ -62,13 +62,12 @@ public PluginPublicController(PluginFilesProvider pluginPublicFilesProvider,
   @ResponseStatus(HttpStatus.OK)
   @ApiOperation("Get public plugin file without authentication")
   public void getPublicFile(@PathVariable(value = "pluginName") String pluginName,
-      @PathVariable(value = "name") String fileName,
-      HttpServletResponse response) {
+      @PathVariable(value = "name") String fileName, HttpServletResponse response) {
     final BinaryData binaryData = pluginPublicFilesProvider.load(pluginName, fileName);
     binaryDataResponseWriter.write(binaryData, response);
   }
 
-  @PutMapping(value = "/{pluginName}/{command}", consumes = {APPLICATION_JSON_VALUE})
+  @PutMapping(value = "/{pluginName}/{command}", consumes = { APPLICATION_JSON_VALUE })
   @ResponseStatus(HttpStatus.OK)
   @ApiOperation("Execute public command without authentication")
   public Object executePublicPluginCommand(@PathVariable("pluginName") String pluginName,
diff --git a/src/main/java/com/epam/ta/reportportal/ws/controller/ProjectController.java b/src/main/java/com/epam/ta/reportportal/ws/controller/ProjectController.java
index ee505599a1..0fcea11f41 100644
--- a/src/main/java/com/epam/ta/reportportal/ws/controller/ProjectController.java
+++ b/src/main/java/com/epam/ta/reportportal/ws/controller/ProjectController.java
@@ -45,22 +45,22 @@
 import com.epam.ta.reportportal.entity.project.ProjectInfo;
 import com.epam.ta.reportportal.entity.user.User;
 import com.epam.ta.reportportal.exception.ReportPortalException;
+import com.epam.ta.reportportal.model.DeleteBulkRQ;
+import com.epam.ta.reportportal.model.DeleteBulkRS;
+import com.epam.ta.reportportal.model.EntryCreatedRS;
+import com.epam.ta.reportportal.model.preference.PreferenceResource;
+import com.epam.ta.reportportal.model.project.AssignUsersRQ;
+import com.epam.ta.reportportal.model.project.CreateProjectRQ;
+import com.epam.ta.reportportal.model.project.ProjectInfoResource;
+import com.epam.ta.reportportal.model.project.ProjectResource;
+import com.epam.ta.reportportal.model.project.UnassignUsersRQ;
+import com.epam.ta.reportportal.model.project.UpdateProjectRQ;
+import com.epam.ta.reportportal.model.project.email.ProjectNotificationConfigDTO;
+import com.epam.ta.reportportal.model.user.SearchUserResource;
+import com.epam.ta.reportportal.model.user.UserResource;
 import com.epam.ta.reportportal.util.ProjectExtractor;
-import com.epam.ta.reportportal.ws.model.DeleteBulkRQ;
-import com.epam.ta.reportportal.ws.model.DeleteBulkRS;
-import com.epam.ta.reportportal.ws.model.EntryCreatedRS;
 import com.epam.ta.reportportal.ws.model.ErrorType;
 import com.epam.ta.reportportal.ws.model.OperationCompletionRS;
-import com.epam.ta.reportportal.ws.model.preference.PreferenceResource;
-import com.epam.ta.reportportal.ws.model.project.AssignUsersRQ;
-import com.epam.ta.reportportal.ws.model.project.CreateProjectRQ;
-import com.epam.ta.reportportal.ws.model.project.ProjectInfoResource;
-import com.epam.ta.reportportal.ws.model.project.ProjectResource;
-import com.epam.ta.reportportal.ws.model.project.UnassignUsersRQ;
-import com.epam.ta.reportportal.ws.model.project.UpdateProjectRQ;
-import com.epam.ta.reportportal.ws.model.project.email.ProjectNotificationConfigDTO;
-import com.epam.ta.reportportal.ws.model.user.SearchUserResource;
-import com.epam.ta.reportportal.ws.model.user.UserResource;
 import com.epam.ta.reportportal.ws.resolver.FilterCriteriaResolver;
 import com.epam.ta.reportportal.ws.resolver.FilterFor;
 import com.epam.ta.reportportal.ws.resolver.SortFor;
@@ -114,13 +114,11 @@ public class ProjectController {
 
   @Autowired
   public ProjectController(ProjectExtractor projectExtractor, GetProjectHandler getProjectHandler,
-      GetProjectInfoHandler projectInfoHandler,
-      CreateProjectHandler createProjectHandler, UpdateProjectHandler updateProjectHandler,
-      DeleteProjectHandler deleteProjectHandler,
+      GetProjectInfoHandler projectInfoHandler, CreateProjectHandler createProjectHandler,
+      UpdateProjectHandler updateProjectHandler, DeleteProjectHandler deleteProjectHandler,
       GetUserHandler getUserHandler, GetPreferenceHandler getPreference,
-      UpdatePreferenceHandler updatePreference,
-      @Qualifier("projectJasperReportHandler")
-      GetJasperReportHandler<ProjectInfo> jasperReportHandler) {
+      UpdatePreferenceHandler updatePreference, @Qualifier("projectJasperReportHandler")
+  GetJasperReportHandler<ProjectInfo> jasperReportHandler) {
     this.projectExtractor = projectExtractor;
     this.getProjectHandler = getProjectHandler;
     this.projectInfoHandler = projectInfoHandler;
@@ -163,7 +161,8 @@ public OperationCompletionRS updateProjectNotificationConfig(@PathVariable Strin
       @RequestBody @Validated ProjectNotificationConfigDTO updateProjectNotificationConfigRQ,
       @AuthenticationPrincipal ReportPortalUser user) {
     return updateProjectHandler.updateProjectNotificationConfig(normalizeId(projectName), user,
-        updateProjectNotificationConfigRQ);
+        updateProjectNotificationConfigRQ
+    );
   }
 
   @DeleteMapping
@@ -208,8 +207,8 @@ public OperationCompletionRS indexProjectData(@PathVariable String projectName,
   @PreAuthorize(NOT_CUSTOMER)
   @ApiOperation("Get users assigned on current project")
   public Iterable<UserResource> getProjectUsers(@PathVariable String projectName,
-      @FilterFor(User.class) Filter filter,
-      @SortFor(User.class) Pageable pageable, @AuthenticationPrincipal ReportPortalUser user) {
+      @FilterFor(User.class) Filter filter, @SortFor(User.class) Pageable pageable,
+      @AuthenticationPrincipal ReportPortalUser user) {
     return getProjectHandler.getProjectUsers(normalizeId(projectName), filter, pageable);
   }
 
@@ -250,10 +249,11 @@ public OperationCompletionRS assignProjectUsers(@PathVariable String projectName
   @PreAuthorize(PROJECT_MANAGER)
   @ApiOperation(value = "Load users which can be assigned to specified project", notes = "Only for users with project manager permissions")
   public Iterable<UserResource> getUsersForAssign(@FilterFor(User.class) Filter filter,
-      @SortFor(User.class) Pageable pageable,
-      @PathVariable String projectName, @AuthenticationPrincipal ReportPortalUser user) {
+      @SortFor(User.class) Pageable pageable, @PathVariable String projectName,
+      @AuthenticationPrincipal ReportPortalUser user) {
     return getUserHandler.getUsers(filter, pageable,
-        projectExtractor.extractProjectDetails(user, projectName));
+        projectExtractor.extractProjectDetails(user, projectName)
+    );
   }
 
   @Transactional(readOnly = true)
@@ -263,10 +263,10 @@ public Iterable<UserResource> getUsersForAssign(@FilterFor(User.class) Filter fi
   @ApiOperation(value = "Load project users by filter", notes = "Only for users that are members of the project")
   public List<String> getProjectUsers(@PathVariable String projectName,
       @RequestParam(value = FilterCriteriaResolver.DEFAULT_FILTER_PREFIX + Condition.CNT + "users")
-      String value,
-      @AuthenticationPrincipal ReportPortalUser user) {
+      String value, @AuthenticationPrincipal ReportPortalUser user) {
     return getProjectHandler.getUserNames(projectExtractor.extractProjectDetails(user, projectName),
-        normalizeId(value));
+        normalizeId(value)
+    );
   }
 
   @Transactional(readOnly = true)
@@ -274,10 +274,11 @@ public List<String> getProjectUsers(@PathVariable String projectName,
   @ResponseStatus(OK)
   @PreAuthorize(PROJECT_MANAGER)
   public Iterable<SearchUserResource> searchForUser(@PathVariable String projectName,
-      @RequestParam(value = "term") String term,
-      Pageable pageable, @AuthenticationPrincipal ReportPortalUser user) {
+      @RequestParam(value = "term") String term, Pageable pageable,
+      @AuthenticationPrincipal ReportPortalUser user) {
     return getProjectHandler.getUserNames(term,
-        projectExtractor.extractProjectDetails(user, projectName), pageable);
+        projectExtractor.extractProjectDetails(user, projectName), pageable
+    );
   }
 
   @Transactional
@@ -285,10 +286,11 @@ public Iterable<SearchUserResource> searchForUser(@PathVariable String projectNa
   @ResponseStatus(HttpStatus.OK)
   @PreAuthorize(ALLOWED_TO_EDIT_USER)
   public OperationCompletionRS addUserPreference(@PathVariable String projectName,
-      @PathVariable String login,
-      @PathVariable Long filterId, @AuthenticationPrincipal ReportPortalUser user) {
+      @PathVariable String login, @PathVariable Long filterId,
+      @AuthenticationPrincipal ReportPortalUser user) {
     return updatePreference.addPreference(projectExtractor.extractProjectDetails(user, projectName),
-        user, filterId);
+        user, filterId
+    );
   }
 
   @Transactional
@@ -296,8 +298,8 @@ public OperationCompletionRS addUserPreference(@PathVariable String projectName,
   @ResponseStatus(HttpStatus.OK)
   @PreAuthorize(ALLOWED_TO_EDIT_USER)
   public OperationCompletionRS removeUserPreference(@PathVariable String projectName,
-      @PathVariable String login,
-      @PathVariable Long filterId, @AuthenticationPrincipal ReportPortalUser user) {
+      @PathVariable String login, @PathVariable Long filterId,
+      @AuthenticationPrincipal ReportPortalUser user) {
     return updatePreference.removePreference(
         projectExtractor.extractProjectDetails(user, projectName), user, filterId);
   }
@@ -308,10 +310,10 @@ public OperationCompletionRS removeUserPreference(@PathVariable String projectNa
   @PreAuthorize(ALLOWED_TO_EDIT_USER)
   @ApiOperation(value = "Load user preferences", notes = "Only for users that allowed to edit other users")
   public PreferenceResource getUserPreference(@PathVariable String projectName,
-      @PathVariable String login,
-      @AuthenticationPrincipal ReportPortalUser user) {
+      @PathVariable String login, @AuthenticationPrincipal ReportPortalUser user) {
     return getPreference.getPreference(projectExtractor.extractProjectDetails(user, projectName),
-        user);
+        user
+    );
   }
 
   @Transactional(readOnly = true)
@@ -332,9 +334,8 @@ public Iterable<ProjectInfoResource> getAllProjectsInfo(
   @GetMapping(value = "/export")
   @ResponseStatus(HttpStatus.OK)
   @ApiOperation(value = "Exports information about all projects", notes = "Allowable only for users with administrator role")
-  public void exportProjects(
-      @ApiParam(allowableValues = "csv")
-      @RequestParam(value = "view", required = false, defaultValue = "csv") String view,
+  public void exportProjects(@ApiParam(allowableValues = "csv")
+  @RequestParam(value = "view", required = false, defaultValue = "csv") String view,
       @FilterFor(ProjectInfo.class) Filter filter,
       @FilterFor(ProjectInfo.class) Queryable predefinedFilter,
       @AuthenticationPrincipal ReportPortalUser user, HttpServletResponse response) {
@@ -344,15 +345,18 @@ public void exportProjects(
 
     response.setHeader(CONTENT_DISPOSITION,
         String.format("attachment; filename=\"RP_PROJECTS_%s_Report.%s\"", format.name(),
-            format.getValue())
+            format.getValue()
+        )
     );
 
     try (OutputStream outputStream = response.getOutputStream()) {
       getProjectHandler.exportProjects(format,
-          new CompositeFilter(Operator.AND, filter, predefinedFilter), outputStream);
+          new CompositeFilter(Operator.AND, filter, predefinedFilter), outputStream
+      );
     } catch (IOException e) {
       throw new ReportPortalException(ErrorType.BAD_REQUEST_ERROR,
-          "Unable to write data to the response.");
+          "Unable to write data to the response."
+      );
     }
 
   }
@@ -373,8 +377,7 @@ public ProjectInfoResource getProjectInfo(@PathVariable String projectName,
   @ResponseStatus(HttpStatus.OK)
   public Map<String, ?> getProjectWidget(@PathVariable String projectName,
       @RequestParam(value = "interval", required = false, defaultValue = "3M") String interval,
-      @PathVariable String widgetCode,
-      @AuthenticationPrincipal ReportPortalUser user) {
+      @PathVariable String widgetCode, @AuthenticationPrincipal ReportPortalUser user) {
     return projectInfoHandler.getProjectInfoWidgetContent(projectName, interval, widgetCode);
   }
 
diff --git a/src/main/java/com/epam/ta/reportportal/ws/controller/ProjectSettingsController.java b/src/main/java/com/epam/ta/reportportal/ws/controller/ProjectSettingsController.java
index f4cc134fbf..b5b50ba943 100644
--- a/src/main/java/com/epam/ta/reportportal/ws/controller/ProjectSettingsController.java
+++ b/src/main/java/com/epam/ta/reportportal/ws/controller/ProjectSettingsController.java
@@ -33,15 +33,15 @@
 import com.epam.ta.reportportal.core.project.settings.notification.DeleteProjectNotificationHandler;
 import com.epam.ta.reportportal.core.project.settings.notification.GetProjectNotificationsHandler;
 import com.epam.ta.reportportal.core.project.settings.notification.UpdateProjectNotificationHandler;
-import com.epam.ta.reportportal.ws.model.EntryCreatedRS;
+import com.epam.ta.reportportal.model.EntryCreatedRS;
+import com.epam.ta.reportportal.model.project.config.CreateIssueSubTypeRQ;
+import com.epam.ta.reportportal.model.project.config.IssueSubTypeCreatedRS;
+import com.epam.ta.reportportal.model.project.config.ProjectSettingsResource;
+import com.epam.ta.reportportal.model.project.config.UpdateIssueSubTypeRQ;
+import com.epam.ta.reportportal.model.project.config.pattern.CreatePatternTemplateRQ;
+import com.epam.ta.reportportal.model.project.config.pattern.UpdatePatternTemplateRQ;
+import com.epam.ta.reportportal.model.project.email.SenderCaseDTO;
 import com.epam.ta.reportportal.ws.model.OperationCompletionRS;
-import com.epam.ta.reportportal.ws.model.project.config.CreateIssueSubTypeRQ;
-import com.epam.ta.reportportal.ws.model.project.config.IssueSubTypeCreatedRS;
-import com.epam.ta.reportportal.ws.model.project.config.ProjectSettingsResource;
-import com.epam.ta.reportportal.ws.model.project.config.UpdateIssueSubTypeRQ;
-import com.epam.ta.reportportal.ws.model.project.config.pattern.CreatePatternTemplateRQ;
-import com.epam.ta.reportportal.ws.model.project.config.pattern.UpdatePatternTemplateRQ;
-import com.epam.ta.reportportal.ws.model.project.email.SenderCaseDTO;
 import io.swagger.annotations.ApiOperation;
 import java.util.List;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -90,9 +90,8 @@ public class ProjectSettingsController {
 
   @Autowired
   public ProjectSettingsController(CreateProjectSettingsHandler createHandler,
-      UpdateProjectSettingsHandler updateHandler,
-      DeleteProjectSettingsHandler deleteHandler, GetProjectSettingsHandler getHandler,
-      GetProjectHandler getProjectHandler,
+      UpdateProjectSettingsHandler updateHandler, DeleteProjectSettingsHandler deleteHandler,
+      GetProjectSettingsHandler getHandler, GetProjectHandler getProjectHandler,
       GetProjectNotificationsHandler getProjectNotificationsHandler,
       CreateProjectNotificationHandler createProjectNotificationHandler,
       UpdateProjectNotificationHandler updateProjectNotificationHandler,
@@ -133,8 +132,7 @@ public OperationCompletionRS updateProjectIssueSubType(@PathVariable String proj
   @PreAuthorize(PROJECT_MANAGER)
   @ApiOperation("Delete custom project specific issue sub-type")
   public OperationCompletionRS deleteProjectIssueSubType(@PathVariable String projectName,
-      @PathVariable Long id,
-      @AuthenticationPrincipal ReportPortalUser user) {
+      @PathVariable Long id, @AuthenticationPrincipal ReportPortalUser user) {
     return deleteHandler.deleteProjectIssueSubType(normalizeId(projectName), user, id);
   }
 
@@ -155,7 +153,8 @@ public EntryCreatedRS createPatternTemplate(@PathVariable String projectName,
       @RequestBody @Validated CreatePatternTemplateRQ createPatternTemplateRQ,
       @AuthenticationPrincipal ReportPortalUser user) {
     return createHandler.createPatternTemplate(normalizeId(projectName), createPatternTemplateRQ,
-        user);
+        user
+    );
   }
 
   @PutMapping("/pattern/{id}")
@@ -167,7 +166,8 @@ public OperationCompletionRS updatePatternTemplate(@PathVariable String projectN
       @RequestBody @Validated UpdatePatternTemplateRQ updatePatternTemplateRQ,
       @AuthenticationPrincipal ReportPortalUser user) {
     return updateHandler.updatePatternTemplate(id, normalizeId(projectName),
-        updatePatternTemplateRQ, user);
+        updatePatternTemplateRQ, user
+    );
   }
 
   @DeleteMapping("/pattern/{id}")
@@ -175,8 +175,7 @@ public OperationCompletionRS updatePatternTemplate(@PathVariable String projectN
   @PreAuthorize(PROJECT_MANAGER)
   @ApiOperation("Delete pattern template for items' log messages pattern analysis")
   public OperationCompletionRS deletePatternTemplate(@PathVariable String projectName,
-      @PathVariable Long id,
-      @AuthenticationPrincipal ReportPortalUser user) {
+      @PathVariable Long id, @AuthenticationPrincipal ReportPortalUser user) {
     return deleteHandler.deletePatternTemplate(normalizeId(projectName), user, id);
   }
 
@@ -199,10 +198,7 @@ public EntryCreatedRS createNotification(@PathVariable String projectName,
       @RequestBody @Validated SenderCaseDTO createNotificationRQ,
       @AuthenticationPrincipal ReportPortalUser user) {
     return createProjectNotificationHandler.createNotification(
-        getProjectHandler.get(normalizeId(projectName)),
-        createNotificationRQ,
-        user
-    );
+        getProjectHandler.get(normalizeId(projectName)), createNotificationRQ, user);
   }
 
   @Transactional
@@ -214,10 +210,7 @@ public OperationCompletionRS updateNotification(@PathVariable String projectName
       @RequestBody @Validated SenderCaseDTO updateNotificationRQ,
       @AuthenticationPrincipal ReportPortalUser user) {
     return updateProjectNotificationHandler.updateNotification(
-        getProjectHandler.get(normalizeId(projectName)),
-        updateNotificationRQ,
-        user
-    );
+        getProjectHandler.get(normalizeId(projectName)), updateNotificationRQ, user);
   }
 
   @Transactional
@@ -226,8 +219,7 @@ public OperationCompletionRS updateNotification(@PathVariable String projectName
   @PreAuthorize(PROJECT_MANAGER_OR_ADMIN)
   @ApiOperation(value = "Deletes notification for specified project", notes = "Only for users with PROJECT_MANAGER or ADMIN roles")
   public OperationCompletionRS deleteNotification(@PathVariable String projectName,
-      @PathVariable Long notificationId,
-      @AuthenticationPrincipal ReportPortalUser user) {
+      @PathVariable Long notificationId, @AuthenticationPrincipal ReportPortalUser user) {
     return deleteNotificationHandler.deleteNotification(
         getProjectHandler.get(normalizeId(projectName)), notificationId, user);
   }
diff --git a/src/main/java/com/epam/ta/reportportal/ws/controller/SettingsController.java b/src/main/java/com/epam/ta/reportportal/ws/controller/SettingsController.java
index f9726ff2df..f6cc50d1e0 100644
--- a/src/main/java/com/epam/ta/reportportal/ws/controller/SettingsController.java
+++ b/src/main/java/com/epam/ta/reportportal/ws/controller/SettingsController.java
@@ -20,8 +20,8 @@
 
 import com.epam.ta.reportportal.commons.ReportPortalUser;
 import com.epam.ta.reportportal.core.admin.ServerAdminHandler;
+import com.epam.ta.reportportal.model.settings.AnalyticsResource;
 import com.epam.ta.reportportal.ws.model.OperationCompletionRS;
-import com.epam.ta.reportportal.ws.model.settings.AnalyticsResource;
 import io.swagger.annotations.ApiOperation;
 import java.util.Map;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -54,7 +54,7 @@ public SettingsController(ServerAdminHandler serverHandler) {
   }
 
   @Transactional
-  @RequestMapping(value = "/analytics", method = {RequestMethod.PUT, RequestMethod.POST})
+  @RequestMapping(value = "/analytics", method = { RequestMethod.PUT, RequestMethod.POST })
   @ResponseStatus(HttpStatus.OK)
   @ApiOperation(value = "Update analytics settings")
   public OperationCompletionRS saveAnalyticsSettings(
diff --git a/src/main/java/com/epam/ta/reportportal/ws/controller/TestItemController.java b/src/main/java/com/epam/ta/reportportal/ws/controller/TestItemController.java
index ae6cf080ab..3a31a568fa 100644
--- a/src/main/java/com/epam/ta/reportportal/ws/controller/TestItemController.java
+++ b/src/main/java/com/epam/ta/reportportal/ws/controller/TestItemController.java
@@ -47,19 +47,19 @@
 import com.epam.ta.reportportal.core.item.history.TestItemsHistoryHandler;
 import com.epam.ta.reportportal.core.item.impl.history.param.HistoryRequestParams;
 import com.epam.ta.reportportal.entity.item.TestItem;
+import com.epam.ta.reportportal.model.TestItemHistoryElement;
+import com.epam.ta.reportportal.model.TestItemResource;
+import com.epam.ta.reportportal.model.issue.DefineIssueRQ;
+import com.epam.ta.reportportal.model.item.LinkExternalIssueRQ;
+import com.epam.ta.reportportal.model.item.UnlinkExternalIssueRQ;
+import com.epam.ta.reportportal.model.item.UpdateTestItemRQ;
 import com.epam.ta.reportportal.util.ProjectExtractor;
 import com.epam.ta.reportportal.ws.model.BulkInfoUpdateRQ;
 import com.epam.ta.reportportal.ws.model.EntryCreatedAsyncRS;
 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.TestItemHistoryElement;
-import com.epam.ta.reportportal.ws.model.TestItemResource;
-import com.epam.ta.reportportal.ws.model.issue.DefineIssueRQ;
 import com.epam.ta.reportportal.ws.model.issue.Issue;
-import com.epam.ta.reportportal.ws.model.item.LinkExternalIssueRQ;
-import com.epam.ta.reportportal.ws.model.item.UnlinkExternalIssueRQ;
-import com.epam.ta.reportportal.ws.model.item.UpdateTestItemRQ;
 import com.epam.ta.reportportal.ws.model.statistics.StatisticsResource;
 import com.epam.ta.reportportal.ws.resolver.FilterFor;
 import com.epam.ta.reportportal.ws.resolver.SortFor;
@@ -117,8 +117,8 @@ public class TestItemController {
   public TestItemController(ProjectExtractor projectExtractor,
       StartTestItemHandler startTestItemHandler, DeleteTestItemHandler deleteTestItemHandler,
       FinishTestItemHandler finishTestItemHandler, UpdateTestItemHandler updateTestItemHandler,
-      GetTestItemHandler getTestItemHandler,
-      TestItemsHistoryHandler testItemsHistoryHandler, SuggestItemService suggestItemService) {
+      GetTestItemHandler getTestItemHandler, TestItemsHistoryHandler testItemsHistoryHandler,
+      SuggestItemService suggestItemService) {
     this.projectExtractor = projectExtractor;
     this.startTestItemHandler = startTestItemHandler;
     this.deleteTestItemHandler = deleteTestItemHandler;
@@ -139,7 +139,8 @@ public EntryCreatedAsyncRS startRootItem(@PathVariable String projectName,
       @AuthenticationPrincipal ReportPortalUser user,
       @RequestBody @Validated StartTestItemRQ startTestItemRQ) {
     return startTestItemHandler.startRootItem(user,
-        projectExtractor.extractProjectDetails(user, projectName), startTestItemRQ);
+        projectExtractor.extractProjectDetails(user, projectName), startTestItemRQ
+    );
   }
 
   @PostMapping("/{parentItem}")
@@ -147,10 +148,11 @@ public EntryCreatedAsyncRS startRootItem(@PathVariable String projectName,
   @ApiOperation("Start a child test item")
   @PreAuthorize(ALLOWED_TO_REPORT)
   public EntryCreatedAsyncRS startChildItem(@PathVariable String projectName,
-      @AuthenticationPrincipal ReportPortalUser user,
-      @PathVariable String parentItem, @RequestBody @Validated StartTestItemRQ startTestItemRQ) {
+      @AuthenticationPrincipal ReportPortalUser user, @PathVariable String parentItem,
+      @RequestBody @Validated StartTestItemRQ startTestItemRQ) {
     return startTestItemHandler.startChildItem(user,
-        projectExtractor.extractProjectDetails(user, projectName), startTestItemRQ, parentItem);
+        projectExtractor.extractProjectDetails(user, projectName), startTestItemRQ, parentItem
+    );
   }
 
   @PutMapping("/{testItemId}")
@@ -158,10 +160,11 @@ public EntryCreatedAsyncRS startChildItem(@PathVariable String projectName,
   @ApiOperation("Finish test item")
   @PreAuthorize(ALLOWED_TO_REPORT)
   public OperationCompletionRS finishTestItem(@PathVariable String projectName,
-      @AuthenticationPrincipal ReportPortalUser user,
-      @PathVariable String testItemId, @RequestBody @Validated FinishTestItemRQ finishExecutionRQ) {
+      @AuthenticationPrincipal ReportPortalUser user, @PathVariable String testItemId,
+      @RequestBody @Validated FinishTestItemRQ finishExecutionRQ) {
     return finishTestItemHandler.finishTestItem(user,
-        projectExtractor.extractProjectDetails(user, projectName), testItemId, finishExecutionRQ);
+        projectExtractor.extractProjectDetails(user, projectName), testItemId, finishExecutionRQ
+    );
   }
 
 
@@ -172,10 +175,10 @@ public OperationCompletionRS finishTestItem(@PathVariable String projectName,
   @ResponseStatus(OK)
   @ApiOperation("Find test item by ID")
   public TestItemResource getTestItem(@PathVariable String projectName,
-      @AuthenticationPrincipal ReportPortalUser user,
-      @PathVariable String itemId) {
+      @AuthenticationPrincipal ReportPortalUser user, @PathVariable String itemId) {
     return getTestItemHandler.getTestItem(itemId,
-        projectExtractor.extractProjectDetails(user, projectName), user);
+        projectExtractor.extractProjectDetails(user, projectName), user
+    );
 
   }
 
@@ -184,10 +187,10 @@ public TestItemResource getTestItem(@PathVariable String projectName,
   @ResponseStatus(OK)
   @ApiOperation("Find test item by UUID")
   public TestItemResource getTestItemByUuid(@PathVariable String projectName,
-      @AuthenticationPrincipal ReportPortalUser user,
-      @PathVariable String itemId) {
+      @AuthenticationPrincipal ReportPortalUser user, @PathVariable String itemId) {
     return getTestItemHandler.getTestItem(itemId,
-        projectExtractor.extractProjectDetails(user, projectName), user);
+        projectExtractor.extractProjectDetails(user, projectName), user
+    );
 
   }
 
@@ -196,20 +199,20 @@ public TestItemResource getTestItemByUuid(@PathVariable String projectName,
   @ResponseStatus(OK)
   @ApiOperation("Search suggested items in analyzer for provided one")
   public List<SuggestedItem> getSuggestedItems(@PathVariable String projectName,
-      @AuthenticationPrincipal ReportPortalUser user,
-      @PathVariable Long itemId) {
+      @AuthenticationPrincipal ReportPortalUser user, @PathVariable Long itemId) {
     return suggestItemService.suggestItems(itemId,
-        projectExtractor.extractProjectDetails(user, projectName), user);
+        projectExtractor.extractProjectDetails(user, projectName), user
+    );
   }
 
   @GetMapping("/suggest/cluster/{clusterId}")
   @ResponseStatus(OK)
   @ApiOperation("Search suggested items in analyzer for provided one")
   public List<SuggestedItem> getSuggestedClusterItems(@PathVariable String projectName,
-      @AuthenticationPrincipal ReportPortalUser user,
-      @PathVariable Long clusterId) {
+      @AuthenticationPrincipal ReportPortalUser user, @PathVariable Long clusterId) {
     return suggestItemService.suggestClusterItems(clusterId,
-        projectExtractor.extractProjectDetails(user, projectName), user);
+        projectExtractor.extractProjectDetails(user, projectName), user
+    );
   }
 
   @Transactional
@@ -229,24 +232,20 @@ public OperationCompletionRS handleSuggestChoose(@PathVariable String projectNam
   @ResponseStatus(OK)
   @ApiOperation("Find test items by specified filter")
   public Iterable<TestItemResource> getTestItems(@PathVariable String projectName,
-      @AuthenticationPrincipal ReportPortalUser user,
-      @Nullable @RequestParam(value = DEFAULT_FILTER_PREFIX + Condition.EQ
-          + CRITERIA_LAUNCH_ID, required = false) Long launchId,
+      @AuthenticationPrincipal ReportPortalUser user, @Nullable
+  @RequestParam(value = DEFAULT_FILTER_PREFIX + Condition.EQ + CRITERIA_LAUNCH_ID, required = false)
+  Long launchId,
       @Nullable @RequestParam(value = FILTER_ID_REQUEST_PARAM, required = false) Long filterId,
-      @RequestParam(value = IS_LATEST_LAUNCHES_REQUEST_PARAM, defaultValue = "false", required = false) boolean isLatest,
-      @RequestParam(value = LAUNCHES_LIMIT_REQUEST_PARAM, defaultValue = "0", required = false) int launchesLimit,
-      @FilterFor(TestItem.class) Filter filter,
+      @RequestParam(value = IS_LATEST_LAUNCHES_REQUEST_PARAM, defaultValue = "false", required = false)
+      boolean isLatest,
+      @RequestParam(value = LAUNCHES_LIMIT_REQUEST_PARAM, defaultValue = "0", required = false)
+      int launchesLimit, @FilterFor(TestItem.class) Filter filter,
       @FilterFor(TestItem.class) Queryable predefinedFilter,
       @SortFor(TestItem.class) Pageable pageable) {
     return getTestItemHandler.getTestItems(
-        new CompositeFilter(Operator.AND, filter, predefinedFilter),
-        pageable,
-        projectExtractor.extractProjectDetails(user, projectName),
-        user,
-        launchId,
-        filterId,
-        isLatest,
-        launchesLimit
+        new CompositeFilter(Operator.AND, filter, predefinedFilter), pageable,
+        projectExtractor.extractProjectDetails(user, projectName), user, launchId, filterId,
+        isLatest, launchesLimit
     );
   }
 
@@ -255,8 +254,8 @@ public Iterable<TestItemResource> getTestItems(@PathVariable String projectName,
   @ResponseStatus(OK)
   @ApiOperation("Find test items by specified filter")
   public Iterable<TestItemResource> getTestItemsV2(@PathVariable String projectName,
-      @AuthenticationPrincipal ReportPortalUser user,
-      @RequestParam Map<String, String> params, @FilterFor(TestItem.class) Filter filter,
+      @AuthenticationPrincipal ReportPortalUser user, @RequestParam Map<String, String> params,
+      @FilterFor(TestItem.class) Filter filter,
       @FilterFor(TestItem.class) Queryable predefinedFilter,
       @SortFor(TestItem.class) Pageable pageable) {
     // tmp return null for project, to fix perf issue
@@ -264,11 +263,8 @@ public Iterable<TestItemResource> getTestItemsV2(@PathVariable String projectNam
       return null;
     }
     return getTestItemHandler.getTestItemsByProvider(
-        new CompositeFilter(Operator.AND, filter, predefinedFilter),
-        pageable,
-        projectExtractor.extractProjectDetails(user, projectName),
-        user,
-        params
+        new CompositeFilter(Operator.AND, filter, predefinedFilter), pageable,
+        projectExtractor.extractProjectDetails(user, projectName), user, params
     );
   }
 
@@ -277,15 +273,12 @@ public Iterable<TestItemResource> getTestItemsV2(@PathVariable String projectNam
   @ResponseStatus(OK)
   @ApiOperation("Find accumulated statistics of items by specified filter")
   public StatisticsResource getTestItems(@PathVariable String projectName,
-      @AuthenticationPrincipal ReportPortalUser user,
-      @FilterFor(TestItem.class) Filter filter,
+      @AuthenticationPrincipal ReportPortalUser user, @FilterFor(TestItem.class) Filter filter,
       @FilterFor(TestItem.class) Queryable predefinedFilter,
       @RequestParam Map<String, String> params) {
     return getTestItemHandler.getStatisticsByProvider(
         new CompositeFilter(Operator.AND, filter, predefinedFilter),
-        projectExtractor.extractProjectDetails(user, projectName),
-        user,
-        params
+        projectExtractor.extractProjectDetails(user, projectName), user, params
     );
   }
 
@@ -294,10 +287,10 @@ public StatisticsResource getTestItems(@PathVariable String projectName,
   @ResponseStatus(OK)
   @ApiOperation("Delete test item")
   public OperationCompletionRS deleteTestItem(@PathVariable String projectName,
-      @AuthenticationPrincipal ReportPortalUser user,
-      @PathVariable Long itemId) {
+      @AuthenticationPrincipal ReportPortalUser user, @PathVariable Long itemId) {
     return deleteTestItemHandler.deleteTestItem(itemId,
-        projectExtractor.extractProjectDetails(user, projectName), user);
+        projectExtractor.extractProjectDetails(user, projectName), user
+    );
   }
 
   @Transactional
@@ -305,10 +298,10 @@ public OperationCompletionRS deleteTestItem(@PathVariable String projectName,
   @ResponseStatus(OK)
   @ApiOperation("Delete test items by specified ids")
   public List<OperationCompletionRS> deleteTestItems(@PathVariable String projectName,
-      @AuthenticationPrincipal ReportPortalUser user,
-      @RequestParam(value = "ids") Set<Long> ids) {
+      @AuthenticationPrincipal ReportPortalUser user, @RequestParam(value = "ids") Set<Long> ids) {
     return deleteTestItemHandler.deleteTestItems(ids,
-        projectExtractor.extractProjectDetails(user, projectName), user);
+        projectExtractor.extractProjectDetails(user, projectName), user
+    );
   }
 
   @Transactional
@@ -329,26 +322,27 @@ public List<Issue> defineTestItemIssueType(@PathVariable String projectName,
   public Iterable<TestItemHistoryElement> getItemsHistory(@PathVariable String projectName,
       @AuthenticationPrincipal ReportPortalUser user, @FilterFor(TestItem.class) Filter filter,
       @FilterFor(TestItem.class) Queryable predefinedFilter,
-      @SortFor(TestItem.class) Pageable pageable,
-      @Nullable @RequestParam(value = DEFAULT_FILTER_PREFIX + Condition.EQ
-          + CRITERIA_PARENT_ID, required = false) Long parentId,
-      @Nullable @RequestParam(value = DEFAULT_FILTER_PREFIX + Condition.EQ
-          + CRITERIA_ID, required = false) Long itemId,
-      @Nullable @RequestParam(value = DEFAULT_FILTER_PREFIX + Condition.EQ
-          + CRITERIA_LAUNCH_ID, required = false) Long launchId,
-      @Nullable @RequestParam(value = HISTORY_TYPE_PARAM, required = false) String type,
+      @SortFor(TestItem.class) Pageable pageable, @Nullable
+  @RequestParam(value = DEFAULT_FILTER_PREFIX + Condition.EQ + CRITERIA_PARENT_ID, required = false)
+  Long parentId, @Nullable
+  @RequestParam(value = DEFAULT_FILTER_PREFIX + Condition.EQ + CRITERIA_ID, required = false)
+  Long itemId, @Nullable
+  @RequestParam(value = DEFAULT_FILTER_PREFIX + Condition.EQ + CRITERIA_LAUNCH_ID, required = false)
+  Long launchId, @Nullable @RequestParam(value = HISTORY_TYPE_PARAM, required = false) String type,
       @Nullable @RequestParam(value = FILTER_ID_REQUEST_PARAM, required = false) Long filterId,
-      @RequestParam(value = IS_LATEST_LAUNCHES_REQUEST_PARAM, defaultValue = "false", required = false) boolean isLatest,
-      @RequestParam(value = LAUNCHES_LIMIT_REQUEST_PARAM, defaultValue = "0", required = false) int launchesLimit,
-      @RequestParam(value = HISTORY_DEPTH_PARAM, required = false, defaultValue = HISTORY_DEPTH_DEFAULT_VALUE) int historyDepth) {
+      @RequestParam(value = IS_LATEST_LAUNCHES_REQUEST_PARAM, defaultValue = "false", required = false)
+      boolean isLatest,
+      @RequestParam(value = LAUNCHES_LIMIT_REQUEST_PARAM, defaultValue = "0", required = false)
+      int launchesLimit,
+      @RequestParam(value = HISTORY_DEPTH_PARAM, required = false, defaultValue = HISTORY_DEPTH_DEFAULT_VALUE)
+      int historyDepth) {
 
     return testItemsHistoryHandler.getItemsHistory(
         projectExtractor.extractProjectDetails(user, projectName),
-        new CompositeFilter(Operator.AND, filter, predefinedFilter),
-        pageable,
+        new CompositeFilter(Operator.AND, filter, predefinedFilter), pageable,
         HistoryRequestParams.of(historyDepth, parentId, itemId, launchId, type, filterId,
-            launchesLimit, isLatest),
-        user
+            launchesLimit, isLatest
+        ), user
     );
   }
 
@@ -357,8 +351,8 @@ public Iterable<TestItemHistoryElement> getItemsHistory(@PathVariable String pro
   @ResponseStatus(OK)
   @ApiOperation("Get tickets that contains a term as a part inside for specified launch")
   public List<String> getTicketIds(@AuthenticationPrincipal ReportPortalUser user,
-      @PathVariable String projectName,
-      @RequestParam(value = "launch") Long id, @RequestParam(value = "term") String term) {
+      @PathVariable String projectName, @RequestParam(value = "launch") Long id,
+      @RequestParam(value = "term") String term) {
     return getTestItemHandler.getTicketIds(id, normalizeId(term));
   }
 
@@ -367,8 +361,7 @@ public List<String> getTicketIds(@AuthenticationPrincipal ReportPortalUser user,
   @ResponseStatus(OK)
   @ApiOperation("Get tickets that contains a term as a part inside for specified launch")
   public List<String> getTicketIdsForProject(@AuthenticationPrincipal ReportPortalUser user,
-      @PathVariable String projectName,
-      @RequestParam(value = "term") String term) {
+      @PathVariable String projectName, @RequestParam(value = "term") String term) {
     return getTestItemHandler.getTicketIds(
         projectExtractor.extractProjectDetails(user, projectName), normalizeId(term));
   }
@@ -379,10 +372,9 @@ public List<String> getTicketIdsForProject(@AuthenticationPrincipal ReportPortal
   @ResponseStatus(OK)
   @ApiOperation("Get all unique attribute keys of specified launch")
   public List<String> getAttributeKeys(@PathVariable String projectName,
-      @AuthenticationPrincipal ReportPortalUser user,
-      @RequestParam(value = "launch") Long id,
-      @RequestParam(value = DEFAULT_FILTER_PREFIX + Condition.CNT
-          + CRITERIA_ITEM_ATTRIBUTE_KEY) String value) {
+      @AuthenticationPrincipal ReportPortalUser user, @RequestParam(value = "launch") Long id,
+      @RequestParam(value = DEFAULT_FILTER_PREFIX + Condition.CNT + CRITERIA_ITEM_ATTRIBUTE_KEY)
+      String value) {
     return getTestItemHandler.getAttributeKeys(id, value);
   }
 
@@ -393,16 +385,13 @@ public List<String> getAttributeKeys(@PathVariable String projectName,
   @ApiOperation("Get all unique attribute keys of specified launch")
   public List<String> getAttributeKeysForProject(@PathVariable String projectName,
       @AuthenticationPrincipal ReportPortalUser user,
-      @RequestParam(value = DEFAULT_FILTER_PREFIX + Condition.CNT
-          + CRITERIA_ITEM_ATTRIBUTE_KEY) String value,
-      @RequestParam(value = FILTER_ID_REQUEST_PARAM) Long launchFilterId,
-      @RequestParam(value = IS_LATEST_LAUNCHES_REQUEST_PARAM, defaultValue = "false", required = false) boolean isLatest,
+      @RequestParam(value = DEFAULT_FILTER_PREFIX + Condition.CNT + CRITERIA_ITEM_ATTRIBUTE_KEY)
+      String value, @RequestParam(value = FILTER_ID_REQUEST_PARAM) Long launchFilterId,
+      @RequestParam(value = IS_LATEST_LAUNCHES_REQUEST_PARAM, defaultValue = "false", required = false)
+      boolean isLatest,
       @RequestParam(value = LAUNCHES_LIMIT_REQUEST_PARAM, defaultValue = "0") int launchesLimit) {
-    return getTestItemHandler.getAttributeKeys(launchFilterId,
-        isLatest,
-        launchesLimit,
-        projectExtractor.extractProjectDetails(user, projectName),
-        value
+    return getTestItemHandler.getAttributeKeys(launchFilterId, isLatest, launchesLimit,
+        projectExtractor.extractProjectDetails(user, projectName), value
     );
   }
 
@@ -412,12 +401,11 @@ public List<String> getAttributeKeysForProject(@PathVariable String projectName,
   @ResponseStatus(OK)
   @ApiOperation("Get all unique attribute values of specified launch")
   public List<String> getAttributeValues(@PathVariable String projectName,
-      @AuthenticationPrincipal ReportPortalUser user,
-      @RequestParam(value = "launch") Long id,
+      @AuthenticationPrincipal ReportPortalUser user, @RequestParam(value = "launch") Long id,
       @RequestParam(value = DEFAULT_FILTER_PREFIX + Condition.EQ
           + CRITERIA_ITEM_ATTRIBUTE_KEY, required = false) String key,
-      @RequestParam(value = DEFAULT_FILTER_PREFIX + Condition.CNT
-          + CRITERIA_ITEM_ATTRIBUTE_VALUE) String value) {
+      @RequestParam(value = DEFAULT_FILTER_PREFIX + Condition.CNT + CRITERIA_ITEM_ATTRIBUTE_VALUE)
+      String value) {
     return getTestItemHandler.getAttributeValues(id, key, value);
   }
 
@@ -427,13 +415,13 @@ public List<String> getAttributeValues(@PathVariable String projectName,
   @ApiOperation("Get all unique attribute keys of step items under specified project")
   public List<String> getAttributeKeys(@PathVariable String projectName,
       @AuthenticationPrincipal ReportPortalUser user,
-      @RequestParam(value = DEFAULT_FILTER_PREFIX + Condition.EQ
-          + CRITERIA_NAME, required = false) String launchName,
-      @RequestParam(value = DEFAULT_FILTER_PREFIX + Condition.CNT
-          + CRITERIA_ITEM_ATTRIBUTE_KEY) String value) {
-    return ofNullable(launchName).filter(StringUtils::isNotBlank)
-        .map(name -> getTestItemHandler.getAttributeKeys(
-            projectExtractor.extractProjectDetails(user, projectName), name, value))
+      @RequestParam(value = DEFAULT_FILTER_PREFIX + Condition.EQ + CRITERIA_NAME, required = false)
+      String launchName,
+      @RequestParam(value = DEFAULT_FILTER_PREFIX + Condition.CNT + CRITERIA_ITEM_ATTRIBUTE_KEY)
+      String value) {
+    return ofNullable(launchName).filter(StringUtils::isNotBlank).map(
+            name -> getTestItemHandler.getAttributeKeys(
+                projectExtractor.extractProjectDetails(user, projectName), name, value))
         .orElseGet(Collections::emptyList);
   }
 
@@ -443,15 +431,14 @@ public List<String> getAttributeKeys(@PathVariable String projectName,
   @ApiOperation("Get all unique attribute values of step items under specified project")
   public List<String> getAttributeValues(@PathVariable String projectName,
       @AuthenticationPrincipal ReportPortalUser user,
-      @RequestParam(value = DEFAULT_FILTER_PREFIX + Condition.EQ
-          + CRITERIA_NAME, required = false) String launchName,
-      @RequestParam(value = DEFAULT_FILTER_PREFIX + Condition.EQ
-          + CRITERIA_ITEM_ATTRIBUTE_KEY, required = false) String key,
-      @RequestParam(value = DEFAULT_FILTER_PREFIX + Condition.CNT
-          + CRITERIA_ITEM_ATTRIBUTE_VALUE) String value) {
-    return ofNullable(launchName).filter(StringUtils::isNotBlank)
-        .map(name -> getTestItemHandler.getAttributeValues(
-            projectExtractor.extractProjectDetails(user, projectName), name, key, value))
+      @RequestParam(value = DEFAULT_FILTER_PREFIX + Condition.EQ + CRITERIA_NAME, required = false)
+      String launchName, @RequestParam(value = DEFAULT_FILTER_PREFIX + Condition.EQ
+      + CRITERIA_ITEM_ATTRIBUTE_KEY, required = false) String key,
+      @RequestParam(value = DEFAULT_FILTER_PREFIX + Condition.CNT + CRITERIA_ITEM_ATTRIBUTE_VALUE)
+      String value) {
+    return ofNullable(launchName).filter(StringUtils::isNotBlank).map(
+            name -> getTestItemHandler.getAttributeValues(
+                projectExtractor.extractProjectDetails(user, projectName), name, key, value))
         .orElseGet(Collections::emptyList);
   }
 
@@ -464,7 +451,8 @@ public OperationCompletionRS bulkUpdate(@PathVariable String projectName,
       @RequestBody @Validated BulkInfoUpdateRQ bulkInfoUpdateRQ,
       @AuthenticationPrincipal ReportPortalUser user) {
     return updateTestItemHandler.bulkInfoUpdate(bulkInfoUpdateRQ,
-        projectExtractor.extractProjectDetails(user, projectName));
+        projectExtractor.extractProjectDetails(user, projectName)
+    );
   }
 
   @Transactional
@@ -472,8 +460,8 @@ public OperationCompletionRS bulkUpdate(@PathVariable String projectName,
   @ResponseStatus(OK)
   @ApiOperation("Update test item")
   public OperationCompletionRS updateTestItem(@PathVariable String projectName,
-      @AuthenticationPrincipal ReportPortalUser user,
-      @PathVariable Long itemId, @RequestBody @Validated UpdateTestItemRQ rq) {
+      @AuthenticationPrincipal ReportPortalUser user, @PathVariable Long itemId,
+      @RequestBody @Validated UpdateTestItemRQ rq) {
     return updateTestItemHandler.updateTestItem(
         projectExtractor.extractProjectDetails(user, projectName), itemId, rq, user);
   }
@@ -486,7 +474,8 @@ public List<OperationCompletionRS> linkExternalIssues(@PathVariable String proje
       @AuthenticationPrincipal ReportPortalUser user,
       @RequestBody @Validated LinkExternalIssueRQ rq) {
     return updateTestItemHandler.processExternalIssues(rq,
-        projectExtractor.extractProjectDetails(user, projectName), user);
+        projectExtractor.extractProjectDetails(user, projectName), user
+    );
   }
 
   @Transactional
@@ -497,7 +486,8 @@ public List<OperationCompletionRS> unlinkExternalIssues(@PathVariable String pro
       @AuthenticationPrincipal ReportPortalUser user,
       @RequestBody @Validated UnlinkExternalIssueRQ rq) {
     return updateTestItemHandler.processExternalIssues(rq,
-        projectExtractor.extractProjectDetails(user, projectName), user);
+        projectExtractor.extractProjectDetails(user, projectName), user
+    );
   }
 
   @Transactional(readOnly = true)
@@ -505,9 +495,9 @@ public List<OperationCompletionRS> unlinkExternalIssues(@PathVariable String pro
   @ResponseStatus(OK)
   @ApiOperation("Get test items by specified ids")
   public List<TestItemResource> getTestItems(@PathVariable String projectName,
-      @AuthenticationPrincipal ReportPortalUser user,
-      @RequestParam(value = "ids") Long[] ids) {
+      @AuthenticationPrincipal ReportPortalUser user, @RequestParam(value = "ids") Long[] ids) {
     return getTestItemHandler.getTestItems(ids,
-        projectExtractor.extractProjectDetails(user, projectName), user);
+        projectExtractor.extractProjectDetails(user, projectName), user
+    );
   }
 }
diff --git a/src/main/java/com/epam/ta/reportportal/ws/controller/UserController.java b/src/main/java/com/epam/ta/reportportal/ws/controller/UserController.java
index d2ccfd71c3..7ebb7a84f7 100644
--- a/src/main/java/com/epam/ta/reportportal/ws/controller/UserController.java
+++ b/src/main/java/com/epam/ta/reportportal/ws/controller/UserController.java
@@ -37,26 +37,26 @@
 import com.epam.ta.reportportal.entity.user.User;
 import com.epam.ta.reportportal.entity.user.UserRole;
 import com.epam.ta.reportportal.exception.ReportPortalException;
-import com.epam.ta.reportportal.ws.model.ApiKeyRQ;
-import com.epam.ta.reportportal.ws.model.ApiKeyRS;
-import com.epam.ta.reportportal.ws.model.ApiKeysRS;
-import com.epam.ta.reportportal.ws.model.DeleteBulkRQ;
-import com.epam.ta.reportportal.ws.model.DeleteBulkRS;
+import com.epam.ta.reportportal.model.ApiKeyRQ;
+import com.epam.ta.reportportal.model.ApiKeyRS;
+import com.epam.ta.reportportal.model.ApiKeysRS;
+import com.epam.ta.reportportal.model.DeleteBulkRQ;
+import com.epam.ta.reportportal.model.DeleteBulkRS;
+import com.epam.ta.reportportal.model.ModelViews;
+import com.epam.ta.reportportal.model.YesNoRS;
+import com.epam.ta.reportportal.model.user.ChangePasswordRQ;
+import com.epam.ta.reportportal.model.user.CreateUserBidRS;
+import com.epam.ta.reportportal.model.user.CreateUserRQ;
+import com.epam.ta.reportportal.model.user.CreateUserRQConfirm;
+import com.epam.ta.reportportal.model.user.CreateUserRQFull;
+import com.epam.ta.reportportal.model.user.CreateUserRS;
+import com.epam.ta.reportportal.model.user.EditUserRQ;
+import com.epam.ta.reportportal.model.user.ResetPasswordRQ;
+import com.epam.ta.reportportal.model.user.RestorePasswordRQ;
+import com.epam.ta.reportportal.model.user.UserBidRS;
+import com.epam.ta.reportportal.model.user.UserResource;
 import com.epam.ta.reportportal.ws.model.ErrorType;
-import com.epam.ta.reportportal.ws.model.ModelViews;
 import com.epam.ta.reportportal.ws.model.OperationCompletionRS;
-import com.epam.ta.reportportal.ws.model.YesNoRS;
-import com.epam.ta.reportportal.ws.model.user.ChangePasswordRQ;
-import com.epam.ta.reportportal.ws.model.user.CreateUserBidRS;
-import com.epam.ta.reportportal.ws.model.user.CreateUserRQ;
-import com.epam.ta.reportportal.ws.model.user.CreateUserRQConfirm;
-import com.epam.ta.reportportal.ws.model.user.CreateUserRQFull;
-import com.epam.ta.reportportal.ws.model.user.CreateUserRS;
-import com.epam.ta.reportportal.ws.model.user.EditUserRQ;
-import com.epam.ta.reportportal.ws.model.user.ResetPasswordRQ;
-import com.epam.ta.reportportal.ws.model.user.RestorePasswordRQ;
-import com.epam.ta.reportportal.ws.model.user.UserBidRS;
-import com.epam.ta.reportportal.ws.model.user.UserResource;
 import com.epam.ta.reportportal.ws.resolver.ActiveRole;
 import com.epam.ta.reportportal.ws.resolver.FilterFor;
 import com.epam.ta.reportportal.ws.resolver.ResponseView;
@@ -190,7 +190,7 @@ public UserResource getUser(@PathVariable String login,
   }
 
   @Transactional(readOnly = true)
-  @GetMapping(value = {"", "/"})
+  @GetMapping(value = { "", "/" })
   @ApiOperation("Return information about current logged-in user")
   public UserResource getMyself(@AuthenticationPrincipal ReportPortalUser currentUser) {
     return getUserHandler.getUser(currentUser);
diff --git a/src/main/java/com/epam/ta/reportportal/ws/controller/UserFilterController.java b/src/main/java/com/epam/ta/reportportal/ws/controller/UserFilterController.java
index b5aa7464d3..f872a88179 100644
--- a/src/main/java/com/epam/ta/reportportal/ws/controller/UserFilterController.java
+++ b/src/main/java/com/epam/ta/reportportal/ws/controller/UserFilterController.java
@@ -16,24 +16,28 @@
 
 package com.epam.ta.reportportal.ws.controller;
 
+import static com.epam.ta.reportportal.auth.permissions.Permissions.ASSIGNED_TO_PROJECT;
+
 import com.epam.ta.reportportal.commons.ReportPortalUser;
 import com.epam.ta.reportportal.commons.querygen.Filter;
 import com.epam.ta.reportportal.core.filter.DeleteUserFilterHandler;
 import com.epam.ta.reportportal.core.filter.GetUserFilterHandler;
 import com.epam.ta.reportportal.core.filter.UpdateUserFilterHandler;
 import com.epam.ta.reportportal.entity.filter.UserFilter;
+import com.epam.ta.reportportal.model.CollectionsRQ;
+import com.epam.ta.reportportal.model.EntryCreatedRS;
+import com.epam.ta.reportportal.model.OwnedEntityResource;
+import com.epam.ta.reportportal.model.filter.BulkUpdateFilterRQ;
+import com.epam.ta.reportportal.model.filter.UpdateUserFilterRQ;
+import com.epam.ta.reportportal.model.filter.UserFilterResource;
 import com.epam.ta.reportportal.util.ProjectExtractor;
 import com.epam.ta.reportportal.ws.converter.converters.UserFilterConverter;
-import com.epam.ta.reportportal.ws.model.CollectionsRQ;
-import com.epam.ta.reportportal.ws.model.EntryCreatedRS;
 import com.epam.ta.reportportal.ws.model.OperationCompletionRS;
-import com.epam.ta.reportportal.ws.model.OwnedEntityResource;
-import com.epam.ta.reportportal.ws.model.filter.BulkUpdateFilterRQ;
-import com.epam.ta.reportportal.ws.model.filter.UpdateUserFilterRQ;
-import com.epam.ta.reportportal.ws.model.filter.UserFilterResource;
 import com.epam.ta.reportportal.ws.resolver.FilterFor;
 import com.epam.ta.reportportal.ws.resolver.SortFor;
 import io.swagger.annotations.ApiOperation;
+import java.util.List;
+import java.util.stream.Collectors;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.Pageable;
 import org.springframework.http.HttpStatus;
@@ -41,12 +45,17 @@
 import org.springframework.security.core.annotation.AuthenticationPrincipal;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.*;
-
-import java.util.List;
-import java.util.stream.Collectors;
-
-import static com.epam.ta.reportportal.auth.permissions.Permissions.ASSIGNED_TO_PROJECT;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.ResponseStatus;
+import org.springframework.web.bind.annotation.RestController;
 
 /**
  * @author Pavel Bortnik
@@ -57,96 +66,106 @@
 @RequestMapping("/v1/{projectName}/filter")
 public class UserFilterController {
 
-	private final ProjectExtractor projectExtractor;
-	private final GetUserFilterHandler getFilterHandler;
-	private final DeleteUserFilterHandler deleteFilterHandler;
-	private final UpdateUserFilterHandler updateUserFilterHandler;
-
-	@Autowired
-	public UserFilterController(ProjectExtractor projectExtractor, GetUserFilterHandler getFilterHandler,
-			DeleteUserFilterHandler deleteFilterHandler, UpdateUserFilterHandler updateUserFilterHandler) {
-		this.projectExtractor = projectExtractor;
-		this.getFilterHandler = getFilterHandler;
-		this.deleteFilterHandler = deleteFilterHandler;
-		this.updateUserFilterHandler = updateUserFilterHandler;
-	}
-
-	@Transactional
-	@PostMapping
-	@ResponseStatus(HttpStatus.CREATED)
-	@ApiOperation("Create user filter")
-	public EntryCreatedRS createFilter(@PathVariable String projectName, @RequestBody @Validated UpdateUserFilterRQ createFilterRQ,
-			@AuthenticationPrincipal ReportPortalUser user) {
-		return updateUserFilterHandler.createFilter(createFilterRQ, projectName, user);
-	}
-
-	@Transactional(readOnly = true)
-	@GetMapping(value = "/{filterId}")
-	@ResponseStatus(HttpStatus.OK)
-	@ApiOperation("Get specified user filter by id")
-	public UserFilterResource getFilter(@PathVariable String projectName, @PathVariable Long filterId,
-			@AuthenticationPrincipal ReportPortalUser user) {
-		return getFilterHandler.getUserFilter(filterId, projectExtractor.extractProjectDetails(user, projectName));
-	}
-
-	@Transactional(readOnly = true)
-	@GetMapping
-	@ResponseStatus(HttpStatus.OK)
-	@ApiOperation("Get filters")
-	public Iterable<UserFilterResource> getAllFilters(@PathVariable String projectName, @SortFor(UserFilter.class) Pageable pageable,
-			@FilterFor(UserFilter.class) Filter filter, @AuthenticationPrincipal ReportPortalUser user) {
-		return getFilterHandler.getUserFilters(projectName, pageable, filter, user);
-	}
-
-	@Transactional
-	@DeleteMapping(value = "/{filterId}")
-	@ResponseStatus(HttpStatus.OK)
-	@ApiOperation("Delete specified user filter by id")
-	public OperationCompletionRS deleteFilter(@PathVariable String projectName, @PathVariable Long filterId,
-			@AuthenticationPrincipal ReportPortalUser user) {
-		return deleteFilterHandler.deleteFilter(filterId, projectExtractor.extractProjectDetails(user, projectName), user);
-	}
-
-	@Transactional(readOnly = true)
-	@GetMapping(value = "/names")
-	@ResponseStatus(HttpStatus.OK)
-	@ApiOperation("Get available filter names")
-	public Iterable<OwnedEntityResource> getAllFiltersNames(@PathVariable String projectName, @SortFor(UserFilter.class) Pageable pageable,
-			@FilterFor(UserFilter.class) Filter filter, @AuthenticationPrincipal ReportPortalUser user) {
-		return getFilterHandler.getFiltersNames(projectExtractor.extractProjectDetails(user, projectName), pageable, filter, user);
-	}
-
-	@Transactional
-	@PutMapping(value = "/{filterId}")
-	@ResponseStatus(HttpStatus.OK)
-	@ApiOperation("Update specified user filter")
-	public OperationCompletionRS updateUserFilter(@PathVariable String projectName, @PathVariable Long filterId,
-			@RequestBody @Validated UpdateUserFilterRQ updateRQ, @AuthenticationPrincipal ReportPortalUser user) {
-		return updateUserFilterHandler.updateUserFilter(
-				filterId,
-				updateRQ,
-				projectExtractor.extractProjectDetails(user, projectName),
-				user
-		);
-	}
-
-	@Transactional(readOnly = true)
-	@GetMapping(value = "/filters")
-	@ResponseStatus(HttpStatus.OK)
-	@ApiOperation("Get list of specified user filters")
-	public List<UserFilterResource> getUserFilters(@PathVariable String projectName, @RequestParam(value = "ids") Long[] ids,
-			@AuthenticationPrincipal ReportPortalUser user) {
-		List<UserFilter> filters = getFilterHandler.getFiltersById(ids, projectExtractor.extractProjectDetails(user, projectName), user);
-		return filters.stream().map(UserFilterConverter.TO_FILTER_RESOURCE).collect(Collectors.toList());
-	}
-
-	@Transactional
-	@RequestMapping(method = RequestMethod.PUT)
-	@ResponseStatus(HttpStatus.OK)
-	@ApiOperation("Update list of user filters")
-	public List<OperationCompletionRS> updateUserFilters(@PathVariable String projectName,
-			@RequestBody @Validated CollectionsRQ<BulkUpdateFilterRQ> updateRQ, @AuthenticationPrincipal ReportPortalUser user) {
-		return updateUserFilterHandler.updateUserFilter(updateRQ, projectExtractor.extractProjectDetails(user, projectName), user);
-	}
+  private final ProjectExtractor projectExtractor;
+  private final GetUserFilterHandler getFilterHandler;
+  private final DeleteUserFilterHandler deleteFilterHandler;
+  private final UpdateUserFilterHandler updateUserFilterHandler;
+
+  @Autowired
+  public UserFilterController(ProjectExtractor projectExtractor,
+      GetUserFilterHandler getFilterHandler, DeleteUserFilterHandler deleteFilterHandler,
+      UpdateUserFilterHandler updateUserFilterHandler) {
+    this.projectExtractor = projectExtractor;
+    this.getFilterHandler = getFilterHandler;
+    this.deleteFilterHandler = deleteFilterHandler;
+    this.updateUserFilterHandler = updateUserFilterHandler;
+  }
+
+  @Transactional
+  @PostMapping
+  @ResponseStatus(HttpStatus.CREATED)
+  @ApiOperation("Create user filter")
+  public EntryCreatedRS createFilter(@PathVariable String projectName,
+      @RequestBody @Validated UpdateUserFilterRQ createFilterRQ,
+      @AuthenticationPrincipal ReportPortalUser user) {
+    return updateUserFilterHandler.createFilter(createFilterRQ, projectName, user);
+  }
+
+  @Transactional(readOnly = true)
+  @GetMapping(value = "/{filterId}")
+  @ResponseStatus(HttpStatus.OK)
+  @ApiOperation("Get specified user filter by id")
+  public UserFilterResource getFilter(@PathVariable String projectName, @PathVariable Long filterId,
+      @AuthenticationPrincipal ReportPortalUser user) {
+    return getFilterHandler.getUserFilter(
+        filterId, projectExtractor.extractProjectDetails(user, projectName));
+  }
+
+  @Transactional(readOnly = true)
+  @GetMapping
+  @ResponseStatus(HttpStatus.OK)
+  @ApiOperation("Get filters")
+  public Iterable<UserFilterResource> getAllFilters(@PathVariable String projectName,
+      @SortFor(UserFilter.class) Pageable pageable, @FilterFor(UserFilter.class) Filter filter,
+      @AuthenticationPrincipal ReportPortalUser user) {
+    return getFilterHandler.getUserFilters(projectName, pageable, filter, user);
+  }
+
+  @Transactional
+  @DeleteMapping(value = "/{filterId}")
+  @ResponseStatus(HttpStatus.OK)
+  @ApiOperation("Delete specified user filter by id")
+  public OperationCompletionRS deleteFilter(@PathVariable String projectName,
+      @PathVariable Long filterId, @AuthenticationPrincipal ReportPortalUser user) {
+    return deleteFilterHandler.deleteFilter(
+        filterId, projectExtractor.extractProjectDetails(user, projectName), user);
+  }
+
+  @Transactional(readOnly = true)
+  @GetMapping(value = "/names")
+  @ResponseStatus(HttpStatus.OK)
+  @ApiOperation("Get available filter names")
+  public Iterable<OwnedEntityResource> getAllFiltersNames(@PathVariable String projectName,
+      @SortFor(UserFilter.class) Pageable pageable, @FilterFor(UserFilter.class) Filter filter,
+      @AuthenticationPrincipal ReportPortalUser user) {
+    return getFilterHandler.getFiltersNames(
+        projectExtractor.extractProjectDetails(user, projectName), pageable, filter, user);
+  }
+
+  @Transactional
+  @PutMapping(value = "/{filterId}")
+  @ResponseStatus(HttpStatus.OK)
+  @ApiOperation("Update specified user filter")
+  public OperationCompletionRS updateUserFilter(@PathVariable String projectName,
+      @PathVariable Long filterId, @RequestBody @Validated UpdateUserFilterRQ updateRQ,
+      @AuthenticationPrincipal ReportPortalUser user) {
+    return updateUserFilterHandler.updateUserFilter(filterId, updateRQ,
+        projectExtractor.extractProjectDetails(user, projectName), user
+    );
+  }
+
+  @Transactional(readOnly = true)
+  @GetMapping(value = "/filters")
+  @ResponseStatus(HttpStatus.OK)
+  @ApiOperation("Get list of specified user filters")
+  public List<UserFilterResource> getUserFilters(@PathVariable String projectName,
+      @RequestParam(value = "ids") Long[] ids, @AuthenticationPrincipal ReportPortalUser user) {
+    List<UserFilter> filters = getFilterHandler.getFiltersById(ids,
+        projectExtractor.extractProjectDetails(user, projectName), user
+    );
+    return filters.stream().map(UserFilterConverter.TO_FILTER_RESOURCE)
+        .collect(Collectors.toList());
+  }
+
+  @Transactional
+  @RequestMapping(method = RequestMethod.PUT)
+  @ResponseStatus(HttpStatus.OK)
+  @ApiOperation("Update list of user filters")
+  public List<OperationCompletionRS> updateUserFilters(@PathVariable String projectName,
+      @RequestBody @Validated CollectionsRQ<BulkUpdateFilterRQ> updateRQ,
+      @AuthenticationPrincipal ReportPortalUser user) {
+    return updateUserFilterHandler.updateUserFilter(
+        updateRQ, projectExtractor.extractProjectDetails(user, projectName), user);
+  }
 
 }
diff --git a/src/main/java/com/epam/ta/reportportal/ws/controller/WidgetController.java b/src/main/java/com/epam/ta/reportportal/ws/controller/WidgetController.java
index 14a9fc7eb7..384c6de639 100644
--- a/src/main/java/com/epam/ta/reportportal/ws/controller/WidgetController.java
+++ b/src/main/java/com/epam/ta/reportportal/ws/controller/WidgetController.java
@@ -16,21 +16,27 @@
 
 package com.epam.ta.reportportal.ws.controller;
 
+import static com.epam.ta.reportportal.auth.permissions.Permissions.ASSIGNED_TO_PROJECT;
+import static com.epam.ta.reportportal.commons.EntityUtils.normalizeId;
+import static org.springframework.http.HttpStatus.CREATED;
+import static org.springframework.http.HttpStatus.OK;
+
 import com.epam.ta.reportportal.commons.ReportPortalUser;
 import com.epam.ta.reportportal.commons.querygen.Filter;
 import com.epam.ta.reportportal.core.widget.CreateWidgetHandler;
 import com.epam.ta.reportportal.core.widget.GetWidgetHandler;
 import com.epam.ta.reportportal.core.widget.UpdateWidgetHandler;
 import com.epam.ta.reportportal.entity.widget.Widget;
+import com.epam.ta.reportportal.model.EntryCreatedRS;
+import com.epam.ta.reportportal.model.widget.WidgetPreviewRQ;
+import com.epam.ta.reportportal.model.widget.WidgetRQ;
+import com.epam.ta.reportportal.model.widget.WidgetResource;
 import com.epam.ta.reportportal.util.ProjectExtractor;
-import com.epam.ta.reportportal.ws.model.EntryCreatedRS;
 import com.epam.ta.reportportal.ws.model.OperationCompletionRS;
-import com.epam.ta.reportportal.ws.model.widget.WidgetPreviewRQ;
-import com.epam.ta.reportportal.ws.model.widget.WidgetRQ;
-import com.epam.ta.reportportal.ws.model.widget.WidgetResource;
 import com.epam.ta.reportportal.ws.resolver.FilterFor;
 import com.epam.ta.reportportal.ws.resolver.SortFor;
 import io.swagger.annotations.ApiOperation;
+import java.util.Map;
 import org.apache.commons.lang3.ArrayUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.Pageable;
@@ -39,14 +45,15 @@
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.MultiValueMap;
 import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.*;
-
-import java.util.Map;
-
-import static com.epam.ta.reportportal.auth.permissions.Permissions.ASSIGNED_TO_PROJECT;
-import static com.epam.ta.reportportal.commons.EntityUtils.normalizeId;
-import static org.springframework.http.HttpStatus.CREATED;
-import static org.springframework.http.HttpStatus.OK;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.ResponseStatus;
+import org.springframework.web.bind.annotation.RestController;
 
 /**
  * @author Pavel Bortnik
@@ -56,71 +63,85 @@
 @RequestMapping("/v1/{projectName}/widget")
 public class WidgetController {
 
-	private final ProjectExtractor projectExtractor;
-	private final CreateWidgetHandler createWidgetHandler;
-	private final UpdateWidgetHandler updateWidgetHandler;
-	private final GetWidgetHandler getWidgetHandler;
+  private final ProjectExtractor projectExtractor;
+  private final CreateWidgetHandler createWidgetHandler;
+  private final UpdateWidgetHandler updateWidgetHandler;
+  private final GetWidgetHandler getWidgetHandler;
 
-	@Autowired
-	public WidgetController(ProjectExtractor projectExtractor, CreateWidgetHandler createWidgetHandler, UpdateWidgetHandler updateWidgetHandler,
-			GetWidgetHandler getWidgetHandler) {
-		this.projectExtractor = projectExtractor;
-		this.createWidgetHandler = createWidgetHandler;
-		this.updateWidgetHandler = updateWidgetHandler;
-		this.getWidgetHandler = getWidgetHandler;
-	}
+  @Autowired
+  public WidgetController(ProjectExtractor projectExtractor,
+      CreateWidgetHandler createWidgetHandler, UpdateWidgetHandler updateWidgetHandler,
+      GetWidgetHandler getWidgetHandler) {
+    this.projectExtractor = projectExtractor;
+    this.createWidgetHandler = createWidgetHandler;
+    this.updateWidgetHandler = updateWidgetHandler;
+    this.getWidgetHandler = getWidgetHandler;
+  }
 
-	@Transactional
-	@PostMapping
-	@ResponseStatus(CREATED)
-	@ApiOperation("Create a new widget")
-	public EntryCreatedRS createWidget(@RequestBody @Validated WidgetRQ createWidget, @AuthenticationPrincipal ReportPortalUser user,
-			@PathVariable String projectName) {
-		return createWidgetHandler.createWidget(createWidget, projectExtractor.extractProjectDetails(user, projectName), user);
-	}
+  @Transactional
+  @PostMapping
+  @ResponseStatus(CREATED)
+  @ApiOperation("Create a new widget")
+  public EntryCreatedRS createWidget(@RequestBody @Validated WidgetRQ createWidget,
+      @AuthenticationPrincipal ReportPortalUser user, @PathVariable String projectName) {
+    return createWidgetHandler.createWidget(
+        createWidget, projectExtractor.extractProjectDetails(user, projectName), user);
+  }
 
-	@Transactional(readOnly = true)
-	@GetMapping(value = "/{widgetId}")
-	@ResponseStatus(OK)
-	@ApiOperation("Get widget by ID")
-	public WidgetResource getWidget(@PathVariable String projectName, @PathVariable Long widgetId,
-			@AuthenticationPrincipal ReportPortalUser user) {
-		return getWidgetHandler.getWidget(widgetId, projectExtractor.extractProjectDetails(user, projectName), user);
-	}
+  @Transactional(readOnly = true)
+  @GetMapping(value = "/{widgetId}")
+  @ResponseStatus(OK)
+  @ApiOperation("Get widget by ID")
+  public WidgetResource getWidget(@PathVariable String projectName, @PathVariable Long widgetId,
+      @AuthenticationPrincipal ReportPortalUser user) {
+    return getWidgetHandler.getWidget(
+        widgetId, projectExtractor.extractProjectDetails(user, projectName), user);
+  }
 
-	@Transactional(readOnly = true)
-	@GetMapping(value = "multilevel/{widgetId}")
-	@ResponseStatus(OK)
-	@ApiOperation("Get multilevel widget by ID")
-	public WidgetResource getWidget(@PathVariable String projectName, @PathVariable Long widgetId,
-			@RequestParam(required = false, name = "attributes") String[] attributes, @RequestParam MultiValueMap<String, String> params, @AuthenticationPrincipal ReportPortalUser user) {
-		return getWidgetHandler.getWidget(widgetId, ArrayUtils.nullToEmpty(attributes), params, projectExtractor.extractProjectDetails(user, projectName), user);
-	}
+  @Transactional(readOnly = true)
+  @GetMapping(value = "multilevel/{widgetId}")
+  @ResponseStatus(OK)
+  @ApiOperation("Get multilevel widget by ID")
+  public WidgetResource getWidget(@PathVariable String projectName, @PathVariable Long widgetId,
+      @RequestParam(required = false, name = "attributes") String[] attributes,
+      @RequestParam MultiValueMap<String, String> params,
+      @AuthenticationPrincipal ReportPortalUser user) {
+    return getWidgetHandler.getWidget(
+        widgetId, ArrayUtils.nullToEmpty(attributes), params,
+        projectExtractor.extractProjectDetails(user, projectName), user
+    );
+  }
 
-	@Transactional(readOnly = true)
-	@PostMapping(value = "/preview")
-	@ResponseStatus(OK)
-	@ApiOperation("Get widget preview")
-	public Map<String, ?> getWidgetPreview(@PathVariable String projectName, @RequestBody @Validated WidgetPreviewRQ previewRQ,
-			@AuthenticationPrincipal ReportPortalUser user) {
-		return getWidgetHandler.getWidgetPreview(previewRQ, projectExtractor.extractProjectDetails(user, normalizeId(projectName)), user);
-	}
+  @Transactional(readOnly = true)
+  @PostMapping(value = "/preview")
+  @ResponseStatus(OK)
+  @ApiOperation("Get widget preview")
+  public Map<String, ?> getWidgetPreview(@PathVariable String projectName,
+      @RequestBody @Validated WidgetPreviewRQ previewRQ,
+      @AuthenticationPrincipal ReportPortalUser user) {
+    return getWidgetHandler.getWidgetPreview(
+        previewRQ, projectExtractor.extractProjectDetails(user, normalizeId(projectName)), user);
+  }
 
-	@Transactional
-	@PutMapping(value = "/{widgetId}")
-	@ResponseStatus(OK)
-	@ApiOperation("Update specified widget")
-	public OperationCompletionRS updateWidget(@PathVariable String projectName, @PathVariable Long widgetId,
-			@RequestBody @Validated WidgetRQ updateRQ, @AuthenticationPrincipal ReportPortalUser user) {
-		return updateWidgetHandler.updateWidget(widgetId, updateRQ, projectExtractor.extractProjectDetails(user, projectName), user);
-	}
+  @Transactional
+  @PutMapping(value = "/{widgetId}")
+  @ResponseStatus(OK)
+  @ApiOperation("Update specified widget")
+  public OperationCompletionRS updateWidget(@PathVariable String projectName,
+      @PathVariable Long widgetId, @RequestBody @Validated WidgetRQ updateRQ,
+      @AuthenticationPrincipal ReportPortalUser user) {
+    return updateWidgetHandler.updateWidget(
+        widgetId, updateRQ, projectExtractor.extractProjectDetails(user, projectName), user);
+  }
 
-	@Transactional(readOnly = true)
-	@GetMapping(value = "/names/all")
-	@ResponseStatus(OK)
-	@ApiOperation("Load all widget names which belong to a user")
-	public Iterable<Object> getWidgetNames(@PathVariable String projectName, @SortFor(Widget.class) Pageable pageable,
-			@FilterFor(Widget.class) Filter filter, @AuthenticationPrincipal ReportPortalUser user) {
-		return getWidgetHandler.getOwnNames(projectExtractor.extractProjectDetails(user, projectName), pageable, filter, user);
-	}
+  @Transactional(readOnly = true)
+  @GetMapping(value = "/names/all")
+  @ResponseStatus(OK)
+  @ApiOperation("Load all widget names which belong to a user")
+  public Iterable<Object> getWidgetNames(@PathVariable String projectName,
+      @SortFor(Widget.class) Pageable pageable, @FilterFor(Widget.class) Filter filter,
+      @AuthenticationPrincipal ReportPortalUser user) {
+    return getWidgetHandler.getOwnNames(
+        projectExtractor.extractProjectDetails(user, projectName), pageable, filter, user);
+  }
 }
\ No newline at end of file
diff --git a/src/main/java/com/epam/ta/reportportal/ws/converter/LogResourceAssembler.java b/src/main/java/com/epam/ta/reportportal/ws/converter/LogResourceAssembler.java
index 79910bbbe5..ae7f4f0d25 100644
--- a/src/main/java/com/epam/ta/reportportal/ws/converter/LogResourceAssembler.java
+++ b/src/main/java/com/epam/ta/reportportal/ws/converter/LogResourceAssembler.java
@@ -17,8 +17,8 @@
 package com.epam.ta.reportportal.ws.converter;
 
 import com.epam.ta.reportportal.entity.log.LogFull;
+import com.epam.ta.reportportal.model.log.LogResource;
 import com.epam.ta.reportportal.ws.converter.converters.LogConverter;
-import com.epam.ta.reportportal.ws.model.log.LogResource;
 import org.springframework.stereotype.Service;
 
 /**
diff --git a/src/main/java/com/epam/ta/reportportal/ws/converter/PagedResourcesAssembler.java b/src/main/java/com/epam/ta/reportportal/ws/converter/PagedResourcesAssembler.java
index c4fb6315a9..95fa131a6d 100644
--- a/src/main/java/com/epam/ta/reportportal/ws/converter/PagedResourcesAssembler.java
+++ b/src/main/java/com/epam/ta/reportportal/ws/converter/PagedResourcesAssembler.java
@@ -17,7 +17,7 @@
 
 package com.epam.ta.reportportal.ws.converter;
 
-import com.epam.ta.reportportal.ws.model.PagedResponse;
+import com.epam.ta.reportportal.model.PagedResponse;
 import com.google.common.base.Preconditions;
 import java.util.List;
 import java.util.function.Function;
@@ -35,16 +35,16 @@
  */
 public abstract class PagedResourcesAssembler<T, R> extends ResourceAssembler<T, R> {
 
-  public static <T> Function<Page<T>, com.epam.ta.reportportal.ws.model.Page<T>> pageConverter() {
-    return page -> new com.epam.ta.reportportal.ws.model.Page<>(page.getContent(),
-        new com.epam.ta.reportportal.ws.model.Page.PageMetadata(page.getSize(),
+  public static <T> Function<Page<T>, com.epam.ta.reportportal.model.Page<T>> pageConverter() {
+    return page -> new com.epam.ta.reportportal.model.Page<>(page.getContent(),
+        new com.epam.ta.reportportal.model.Page.PageMetadata(page.getSize(),
             page.getNumber() + 1L, page.getTotalElements(),
             page.getTotalPages()
         )
     );
   }
 
-  public static <T, R> Function<Page<T>, com.epam.ta.reportportal.ws.model.Page<R>> pageConverter(
+  public static <T, R> Function<Page<T>, com.epam.ta.reportportal.model.Page<R>> pageConverter(
       Function<T, R> modelConverter) {
     return page -> PagedResourcesAssembler.<R>pageConverter().apply(page.map(modelConverter));
   }
@@ -67,7 +67,7 @@ public static <T, R> Function<Page<T>, PagedResponse<R>> pagedResponseConverter(
         .apply(page.map(modelConverter));
   }
 
-  public static <T, R> Function<Page<T>, com.epam.ta.reportportal.ws.model.Page<R>> pageMultiConverter(
+  public static <T, R> Function<Page<T>, com.epam.ta.reportportal.model.Page<R>> pageMultiConverter(
       Function<List<T>, List<R>> modelConverter) {
     return page -> PagedResourcesAssembler.<R>pageConverter()
         .apply(new PageImpl<>(modelConverter.apply(page.getContent()),
@@ -77,18 +77,18 @@ public static <T, R> Function<Page<T>, com.epam.ta.reportportal.ws.model.Page<R>
   }
 
   /**
-   * Creates {@link com.epam.ta.reportportal.ws.model.Page} from {@link Page} DB query result
+   * Creates {@link com.epam.ta.reportportal.model.Page} from {@link Page} DB query result
    *
    * @param content Page to be processed
    * @return Transformed Page
    * @deprecated in favor of using converters based on JDK8 Functions
    */
   @Deprecated
-  public com.epam.ta.reportportal.ws.model.Page<R> toPagedResources(Page<T> content) {
+  public com.epam.ta.reportportal.model.Page<R> toPagedResources(Page<T> content) {
     Preconditions.checkNotNull(content, "Content should be null");
 
-    return new com.epam.ta.reportportal.ws.model.Page<>(toResources(content),
-        new com.epam.ta.reportportal.ws.model.Page.PageMetadata(content.getSize(),
+    return new com.epam.ta.reportportal.model.Page<>(toResources(content),
+        new com.epam.ta.reportportal.model.Page.PageMetadata(content.getSize(),
             content.getNumber() + 1L,
             content.getTotalElements(), content.getTotalPages()
         )
diff --git a/src/main/java/com/epam/ta/reportportal/ws/converter/TestItemResourceAssembler.java b/src/main/java/com/epam/ta/reportportal/ws/converter/TestItemResourceAssembler.java
index cf5ac71417..3c19c4feab 100644
--- a/src/main/java/com/epam/ta/reportportal/ws/converter/TestItemResourceAssembler.java
+++ b/src/main/java/com/epam/ta/reportportal/ws/converter/TestItemResourceAssembler.java
@@ -20,8 +20,8 @@
 
 import com.epam.ta.reportportal.entity.item.PathName;
 import com.epam.ta.reportportal.entity.item.TestItem;
+import com.epam.ta.reportportal.model.TestItemResource;
 import com.epam.ta.reportportal.ws.converter.converters.TestItemConverter;
-import com.epam.ta.reportportal.ws.model.TestItemResource;
 import javax.annotation.Nullable;
 import org.springframework.stereotype.Component;
 
diff --git a/src/main/java/com/epam/ta/reportportal/ws/converter/builders/DashboardBuilder.java b/src/main/java/com/epam/ta/reportportal/ws/converter/builders/DashboardBuilder.java
index 4ed3e4e8ef..06afe99aaa 100644
--- a/src/main/java/com/epam/ta/reportportal/ws/converter/builders/DashboardBuilder.java
+++ b/src/main/java/com/epam/ta/reportportal/ws/converter/builders/DashboardBuilder.java
@@ -16,75 +16,75 @@
 
 package com.epam.ta.reportportal.ws.converter.builders;
 
+import static java.util.Optional.ofNullable;
+
 import com.epam.ta.reportportal.entity.dashboard.Dashboard;
 import com.epam.ta.reportportal.entity.dashboard.DashboardWidget;
 import com.epam.ta.reportportal.entity.project.Project;
-import com.epam.ta.reportportal.ws.model.dashboard.CreateDashboardRQ;
-import com.epam.ta.reportportal.ws.model.dashboard.UpdateDashboardRQ;
-
+import com.epam.ta.reportportal.model.dashboard.CreateDashboardRQ;
+import com.epam.ta.reportportal.model.dashboard.UpdateDashboardRQ;
 import java.util.Objects;
 import java.util.Optional;
 import java.util.function.Supplier;
 
-import static java.util.Optional.ofNullable;
-
 /**
  * @author Pavel Bortnik
  */
 public class DashboardBuilder implements Supplier<Dashboard> {
 
-	private Dashboard dashboard;
+  private Dashboard dashboard;
 
-	public DashboardBuilder() {
-		dashboard = new Dashboard();
-	}
+  public DashboardBuilder() {
+    dashboard = new Dashboard();
+  }
 
-	public DashboardBuilder(Dashboard dashboard) {
-		this.dashboard = dashboard;
-	}
+  public DashboardBuilder(Dashboard dashboard) {
+    this.dashboard = dashboard;
+  }
 
-	public DashboardBuilder addDashboardRq(CreateDashboardRQ rq) {
-		dashboard.setName(rq.getName());
-		dashboard.setDescription(rq.getDescription());
-		return this;
-	}
+  public DashboardBuilder addDashboardRq(CreateDashboardRQ rq) {
+    dashboard.setName(rq.getName());
+    dashboard.setDescription(rq.getDescription());
+    return this;
+  }
 
-	public DashboardBuilder addProject(Long projectId) {
-		Project project = new Project();
-		project.setId(projectId);
-		dashboard.setProject(project);
-		return this;
-	}
+  public DashboardBuilder addProject(Long projectId) {
+    Project project = new Project();
+    project.setId(projectId);
+    dashboard.setProject(project);
+    return this;
+  }
 
-	public DashboardBuilder addUpdateRq(UpdateDashboardRQ rq) {
-		Optional.ofNullable(rq.getName()).ifPresent(name -> dashboard.setName(name));
-		Optional.ofNullable(rq.getDescription()).ifPresent(description -> dashboard.setDescription(description));
-		Optional.ofNullable(rq.getWidgets()).ifPresent(widgets -> {
-			for (DashboardWidget dashboardWidget : dashboard.getDashboardWidgets()) {
-				widgets.stream()
-						.filter(updWidget -> Objects.equals(dashboardWidget.getId().getWidgetId(), updWidget.getWidgetId()))
-						.forEach(updWidget -> {
-							ofNullable(updWidget.getWidgetPosition()).ifPresent(position -> {
-								dashboardWidget.setPositionX(position.getX());
-								dashboardWidget.setPositionY(position.getY());
-							});
-							ofNullable(updWidget.getWidgetSize()).ifPresent(size -> {
-								dashboardWidget.setWidth(size.getWidth());
-								dashboardWidget.setHeight(size.getHeight());
-							});
-						});
-			}
-		});
-		return this;
-	}
+  public DashboardBuilder addUpdateRq(UpdateDashboardRQ rq) {
+    Optional.ofNullable(rq.getName()).ifPresent(name -> dashboard.setName(name));
+    Optional.ofNullable(rq.getDescription())
+        .ifPresent(description -> dashboard.setDescription(description));
+    Optional.ofNullable(rq.getWidgets()).ifPresent(widgets -> {
+      for (DashboardWidget dashboardWidget : dashboard.getDashboardWidgets()) {
+        widgets.stream().filter(updWidget -> Objects.equals(dashboardWidget.getId().getWidgetId(),
+            updWidget.getWidgetId()
+        )).forEach(updWidget -> {
+          ofNullable(updWidget.getWidgetPosition()).ifPresent(position -> {
+            dashboardWidget.setPositionX(position.getX());
+            dashboardWidget.setPositionY(position.getY());
+          });
+          ofNullable(updWidget.getWidgetSize()).ifPresent(size -> {
+            dashboardWidget.setWidth(size.getWidth());
+            dashboardWidget.setHeight(size.getHeight());
+          });
+        });
+      }
+    });
+    return this;
+  }
 
-	public DashboardBuilder addOwner(String owner) {
-		dashboard.setOwner(owner);
-		return this;
-	}
+  public DashboardBuilder addOwner(String owner) {
+    dashboard.setOwner(owner);
+    return this;
+  }
 
-	@Override
-	public Dashboard get() {
-		return dashboard;
-	}
+  @Override
+  public Dashboard get() {
+    return dashboard;
+  }
 }
diff --git a/src/main/java/com/epam/ta/reportportal/ws/converter/builders/PatternTemplateBuilder.java b/src/main/java/com/epam/ta/reportportal/ws/converter/builders/PatternTemplateBuilder.java
index f60ef03f0c..612695ff08 100644
--- a/src/main/java/com/epam/ta/reportportal/ws/converter/builders/PatternTemplateBuilder.java
+++ b/src/main/java/com/epam/ta/reportportal/ws/converter/builders/PatternTemplateBuilder.java
@@ -20,8 +20,8 @@
 import com.epam.ta.reportportal.entity.pattern.PatternTemplate;
 import com.epam.ta.reportportal.entity.pattern.PatternTemplateType;
 import com.epam.ta.reportportal.exception.ReportPortalException;
+import com.epam.ta.reportportal.model.project.config.pattern.CreatePatternTemplateRQ;
 import com.epam.ta.reportportal.ws.model.ErrorType;
-import com.epam.ta.reportportal.ws.model.project.config.pattern.CreatePatternTemplateRQ;
 import java.util.function.Supplier;
 import org.apache.commons.lang3.StringUtils;
 
@@ -38,10 +38,10 @@ public PatternTemplateBuilder() {
 
   public PatternTemplateBuilder withCreateRequest(CreatePatternTemplateRQ createRequest) {
     patternTemplate.setTemplateType(PatternTemplateType.fromString(createRequest.getType())
-        .orElseThrow(() -> new ReportPortalException(
-            ErrorType.BAD_REQUEST_ERROR,
+        .orElseThrow(() -> new ReportPortalException(ErrorType.BAD_REQUEST_ERROR,
             Suppliers.formattedSupplier("Unknown pattern template type - '{}'",
-                createRequest.getType()).get()
+                createRequest.getType()
+            ).get()
         )));
     patternTemplate.setName(StringUtils.trim(createRequest.getName()));
     patternTemplate.setValue(createRequest.getValue());
diff --git a/src/main/java/com/epam/ta/reportportal/ws/converter/builders/UserBuilder.java b/src/main/java/com/epam/ta/reportportal/ws/converter/builders/UserBuilder.java
index 1586fc65f1..ed44e2dc4f 100644
--- a/src/main/java/com/epam/ta/reportportal/ws/converter/builders/UserBuilder.java
+++ b/src/main/java/com/epam/ta/reportportal/ws/converter/builders/UserBuilder.java
@@ -23,8 +23,8 @@
 import com.epam.ta.reportportal.entity.user.User;
 import com.epam.ta.reportportal.entity.user.UserRole;
 import com.epam.ta.reportportal.entity.user.UserType;
-import com.epam.ta.reportportal.ws.model.user.CreateUserRQConfirm;
-import com.epam.ta.reportportal.ws.model.user.CreateUserRQFull;
+import com.epam.ta.reportportal.model.user.CreateUserRQConfirm;
+import com.epam.ta.reportportal.model.user.CreateUserRQFull;
 import java.util.Date;
 import java.util.HashMap;
 import java.util.Map;
diff --git a/src/main/java/com/epam/ta/reportportal/ws/converter/builders/UserFilterBuilder.java b/src/main/java/com/epam/ta/reportportal/ws/converter/builders/UserFilterBuilder.java
index a53778e74d..7cec599439 100644
--- a/src/main/java/com/epam/ta/reportportal/ws/converter/builders/UserFilterBuilder.java
+++ b/src/main/java/com/epam/ta/reportportal/ws/converter/builders/UserFilterBuilder.java
@@ -16,6 +16,9 @@
 
 package com.epam.ta.reportportal.ws.converter.builders;
 
+import static java.util.Optional.ofNullable;
+import static java.util.stream.Collectors.toList;
+
 import com.epam.ta.reportportal.commons.querygen.Condition;
 import com.epam.ta.reportportal.commons.querygen.FilterCondition;
 import com.epam.ta.reportportal.entity.filter.FilterSort;
@@ -23,97 +26,91 @@
 import com.epam.ta.reportportal.entity.filter.UserFilter;
 import com.epam.ta.reportportal.entity.project.Project;
 import com.epam.ta.reportportal.exception.ReportPortalException;
+import com.epam.ta.reportportal.model.filter.Order;
+import com.epam.ta.reportportal.model.filter.UpdateUserFilterRQ;
+import com.epam.ta.reportportal.model.filter.UserFilterCondition;
 import com.epam.ta.reportportal.ws.model.ErrorType;
-import com.epam.ta.reportportal.ws.model.filter.Order;
-import com.epam.ta.reportportal.ws.model.filter.UpdateUserFilterRQ;
-import com.epam.ta.reportportal.ws.model.filter.UserFilterCondition;
-import org.springframework.data.domain.Sort;
-
 import java.util.List;
 import java.util.Set;
 import java.util.function.Supplier;
-
-import static java.util.Optional.ofNullable;
-import static java.util.stream.Collectors.toList;
+import org.springframework.data.domain.Sort;
 
 /**
  * @author Pavel Bortnik
  */
 public class UserFilterBuilder implements Supplier<UserFilter> {
 
-	private UserFilter userFilter;
+  private UserFilter userFilter;
 
-	public UserFilterBuilder() {
-		userFilter = new UserFilter();
-	}
+  public UserFilterBuilder() {
+    userFilter = new UserFilter();
+  }
 
-	public UserFilterBuilder(UserFilter userFilter) {
-		this.userFilter = userFilter;
-	}
+  public UserFilterBuilder(UserFilter userFilter) {
+    this.userFilter = userFilter;
+  }
 
-	public UserFilterBuilder addFilterRq(UpdateUserFilterRQ rq) {
-		userFilter.setDescription(rq.getDescription());
-		ofNullable(rq.getName()).ifPresent(it -> userFilter.setName(it));
-		ofNullable(rq.getObjectType()).ifPresent(it -> userFilter.setTargetClass(ObjectType.getObjectTypeByName(rq.getObjectType())));
-		addFilterConditions(rq.getConditions());
-		addSelectionParameters(rq.getOrders());
-		return this;
-	}
+  public UserFilterBuilder addFilterRq(UpdateUserFilterRQ rq) {
+    userFilter.setDescription(rq.getDescription());
+    ofNullable(rq.getName()).ifPresent(it -> userFilter.setName(it));
+    ofNullable(rq.getObjectType()).ifPresent(
+        it -> userFilter.setTargetClass(ObjectType.getObjectTypeByName(rq.getObjectType())));
+    addFilterConditions(rq.getConditions());
+    addSelectionParameters(rq.getOrders());
+    return this;
+  }
 
-	/**
-	 * Convert provided conditions into db and add them to filter object
-	 *
-	 * @param conditions Conditions from rq
-	 * @return UserFilterBuilder
-	 */
-	public UserFilterBuilder addFilterConditions(Set<UserFilterCondition> conditions) {
-		userFilter.getFilterCondition().clear();
-		ofNullable(conditions).ifPresent(c -> userFilter.getFilterCondition()
-				.addAll(c.stream()
-						.map(entity -> FilterCondition.builder()
-								.withSearchCriteria(entity.getFilteringField())
-								.withValue(entity.getValue())
-								.withNegative(Condition.isNegative(entity.getCondition()))
-								.withCondition(Condition.findByMarker(entity.getCondition())
-										.orElseThrow(() -> new ReportPortalException(ErrorType.INCORRECT_REQUEST, entity.getCondition())))
-								.build())
-						.collect(toList())));
+  /**
+   * Convert provided conditions into db and add them to filter object
+   *
+   * @param conditions Conditions from rq
+   * @return UserFilterBuilder
+   */
+  public UserFilterBuilder addFilterConditions(Set<UserFilterCondition> conditions) {
+    userFilter.getFilterCondition().clear();
+    ofNullable(conditions).ifPresent(c -> userFilter.getFilterCondition().addAll(c.stream().map(
+        entity -> FilterCondition.builder().withSearchCriteria(entity.getFilteringField())
+            .withValue(entity.getValue()).withNegative(Condition.isNegative(entity.getCondition()))
+            .withCondition(Condition.findByMarker(entity.getCondition()).orElseThrow(
+                () -> new ReportPortalException(ErrorType.INCORRECT_REQUEST,
+                    entity.getCondition()
+                ))).build()).collect(toList())));
 
-		return this;
-	}
+    return this;
+  }
 
-	/**
-	 * Convert provided selection into db and add them in correct order
-	 * to filter object
-	 *
-	 * @param orders Filter sorting conditions
-	 * @return UserFilterBuilder
-	 */
-	public UserFilterBuilder addSelectionParameters(List<Order> orders) {
-		userFilter.getFilterSorts().clear();
-		ofNullable(orders).ifPresent(o -> o.forEach(order -> {
-			FilterSort filterSort = new FilterSort();
-			filterSort.setField(order.getSortingColumnName());
-			filterSort.setDirection(order.getIsAsc() ? Sort.Direction.ASC : Sort.Direction.DESC);
-			userFilter.getFilterSorts().add(filterSort);
-		}));
-		return this;
-	}
+  /**
+   * Convert provided selection into db and add them in correct order
+   * to filter object
+   *
+   * @param orders Filter sorting conditions
+   * @return UserFilterBuilder
+   */
+  public UserFilterBuilder addSelectionParameters(List<Order> orders) {
+    userFilter.getFilterSorts().clear();
+    ofNullable(orders).ifPresent(o -> o.forEach(order -> {
+      FilterSort filterSort = new FilterSort();
+      filterSort.setField(order.getSortingColumnName());
+      filterSort.setDirection(order.getIsAsc() ? Sort.Direction.ASC : Sort.Direction.DESC);
+      userFilter.getFilterSorts().add(filterSort);
+    }));
+    return this;
+  }
 
-	public UserFilterBuilder addProject(Long projectId) {
-		Project project = new Project();
-		project.setId(projectId);
-		userFilter.setProject(project);
-		return this;
-	}
+  public UserFilterBuilder addProject(Long projectId) {
+    Project project = new Project();
+    project.setId(projectId);
+    userFilter.setProject(project);
+    return this;
+  }
 
-	public UserFilterBuilder addOwner(String owner) {
-		userFilter.setOwner(owner);
-		return this;
-	}
+  public UserFilterBuilder addOwner(String owner) {
+    userFilter.setOwner(owner);
+    return this;
+  }
 
-	@Override
-	public UserFilter get() {
-		return userFilter;
-	}
+  @Override
+  public UserFilter get() {
+    return userFilter;
+  }
 }
diff --git a/src/main/java/com/epam/ta/reportportal/ws/converter/builders/WidgetBuilder.java b/src/main/java/com/epam/ta/reportportal/ws/converter/builders/WidgetBuilder.java
index 7dcc0e1465..820af285ff 100644
--- a/src/main/java/com/epam/ta/reportportal/ws/converter/builders/WidgetBuilder.java
+++ b/src/main/java/com/epam/ta/reportportal/ws/converter/builders/WidgetBuilder.java
@@ -16,106 +16,113 @@
 
 package com.epam.ta.reportportal.ws.converter.builders;
 
+import static java.util.Optional.ofNullable;
+
 import com.epam.ta.reportportal.entity.filter.UserFilter;
 import com.epam.ta.reportportal.entity.project.Project;
 import com.epam.ta.reportportal.entity.widget.Widget;
 import com.epam.ta.reportportal.entity.widget.WidgetOptions;
-import com.epam.ta.reportportal.ws.model.widget.WidgetPreviewRQ;
-import com.epam.ta.reportportal.ws.model.widget.WidgetRQ;
+import com.epam.ta.reportportal.model.widget.WidgetPreviewRQ;
+import com.epam.ta.reportportal.model.widget.WidgetRQ;
 import com.google.common.collect.Sets;
-
 import java.util.Collections;
 import java.util.LinkedHashMap;
 import java.util.Map;
 import java.util.function.Supplier;
 
-import static java.util.Optional.ofNullable;
-
 /**
  * @author Pavel Bortnik
  */
 public class WidgetBuilder implements Supplier<Widget> {
 
-	private Widget widget;
-
-	public WidgetBuilder() {
-		widget = new Widget();
-	}
-
-	public WidgetBuilder(Widget widget) {
-		this.widget = widget;
-	}
-
-	public WidgetBuilder addWidgetRq(WidgetRQ widgetRQ) {
-		ofNullable(widgetRQ.getName()).ifPresent(name -> widget.setName(name));
-		widget.setDescription(widgetRQ.getDescription());
-
-		ofNullable(widgetRQ.getContentParameters().getWidgetOptions()).ifPresent(wo -> {
-			WidgetOptions widgetOptions = ofNullable(widget.getWidgetOptions()).orElseGet(WidgetOptions::new);
-			Map<String, Object> options = ofNullable(widgetOptions.getOptions()).orElseGet(LinkedHashMap::new);
-			options.putAll(wo);
-			widgetOptions.setOptions(options);
-			widget.setWidgetOptions(widgetOptions);
-		});
-
-		widget.setWidgetType(widgetRQ.getWidgetType());
-		widget.setItemsCount(widgetRQ.getContentParameters().getItemsCount());
-
-		widget.getContentFields().clear();
-		widget.getContentFields().addAll(ofNullable(widgetRQ.getContentParameters().getContentFields()).orElse(Collections.emptyList()));
-		return this;
-	}
-
-	public WidgetBuilder addWidgetPreviewRq(WidgetPreviewRQ previewRQ) {
-		WidgetOptions widgetOptions = ofNullable(widget.getWidgetOptions()).orElseGet(WidgetOptions::new);
-		Map<String, Object> options = ofNullable(widgetOptions.getOptions()).orElseGet(LinkedHashMap::new);
-		options.putAll(previewRQ.getContentParameters().getWidgetOptions());
-
-		widgetOptions.setOptions(options);
-		widget.setWidgetOptions(widgetOptions);
-
-		widget.setWidgetType(previewRQ.getWidgetType());
-		widget.setItemsCount(previewRQ.getContentParameters().getItemsCount());
-
-		widget.getContentFields().clear();
-		widget.getContentFields().addAll(ofNullable(previewRQ.getContentParameters().getContentFields()).orElse(Collections.emptyList()));
-		return this;
-	}
-
-	public WidgetBuilder addProject(Long projectId) {
-		Project project = new Project();
-		project.setId(projectId);
-		widget.setProject(project);
-		return this;
-	}
-
-	public WidgetBuilder addFilters(Iterable<UserFilter> userFilters) {
-		ofNullable(userFilters).ifPresent(it -> widget.setFilters(Sets.newLinkedHashSet(it)));
-		return this;
-	}
-
-	public WidgetBuilder addOwner(String owner) {
-		widget.setOwner(owner);
-		return this;
-	}
-
-	public WidgetBuilder addOption(String key, Object value) {
-		WidgetOptions widgetOptions = ofNullable(widget.getWidgetOptions()).orElseGet(() -> {
-			WidgetOptions opts = new WidgetOptions();
-			widget.setWidgetOptions(opts);
-			return opts;
-		});
-		Map<String, Object> options = ofNullable(widgetOptions.getOptions()).orElseGet(() -> {
-			LinkedHashMap<String, Object> opts = new LinkedHashMap<>();
-			widgetOptions.setOptions(opts);
-			return opts;
-		});
-		options.put(key, value);
-		return this;
-	}
-
-	@Override
-	public Widget get() {
-		return widget;
-	}
+  private Widget widget;
+
+  public WidgetBuilder() {
+    widget = new Widget();
+  }
+
+  public WidgetBuilder(Widget widget) {
+    this.widget = widget;
+  }
+
+  public WidgetBuilder addWidgetRq(WidgetRQ widgetRQ) {
+    ofNullable(widgetRQ.getName()).ifPresent(name -> widget.setName(name));
+    widget.setDescription(widgetRQ.getDescription());
+
+    ofNullable(widgetRQ.getContentParameters().getWidgetOptions()).ifPresent(wo -> {
+      WidgetOptions widgetOptions =
+          ofNullable(widget.getWidgetOptions()).orElseGet(WidgetOptions::new);
+      Map<String, Object> options =
+          ofNullable(widgetOptions.getOptions()).orElseGet(LinkedHashMap::new);
+      options.putAll(wo);
+      widgetOptions.setOptions(options);
+      widget.setWidgetOptions(widgetOptions);
+    });
+
+    widget.setWidgetType(widgetRQ.getWidgetType());
+    widget.setItemsCount(widgetRQ.getContentParameters().getItemsCount());
+
+    widget.getContentFields().clear();
+    widget.getContentFields().addAll(
+        ofNullable(widgetRQ.getContentParameters().getContentFields()).orElse(
+            Collections.emptyList()));
+    return this;
+  }
+
+  public WidgetBuilder addWidgetPreviewRq(WidgetPreviewRQ previewRQ) {
+    WidgetOptions widgetOptions =
+        ofNullable(widget.getWidgetOptions()).orElseGet(WidgetOptions::new);
+    Map<String, Object> options =
+        ofNullable(widgetOptions.getOptions()).orElseGet(LinkedHashMap::new);
+    options.putAll(previewRQ.getContentParameters().getWidgetOptions());
+
+    widgetOptions.setOptions(options);
+    widget.setWidgetOptions(widgetOptions);
+
+    widget.setWidgetType(previewRQ.getWidgetType());
+    widget.setItemsCount(previewRQ.getContentParameters().getItemsCount());
+
+    widget.getContentFields().clear();
+    widget.getContentFields().addAll(
+        ofNullable(previewRQ.getContentParameters().getContentFields()).orElse(
+            Collections.emptyList()));
+    return this;
+  }
+
+  public WidgetBuilder addProject(Long projectId) {
+    Project project = new Project();
+    project.setId(projectId);
+    widget.setProject(project);
+    return this;
+  }
+
+  public WidgetBuilder addFilters(Iterable<UserFilter> userFilters) {
+    ofNullable(userFilters).ifPresent(it -> widget.setFilters(Sets.newLinkedHashSet(it)));
+    return this;
+  }
+
+  public WidgetBuilder addOwner(String owner) {
+    widget.setOwner(owner);
+    return this;
+  }
+
+  public WidgetBuilder addOption(String key, Object value) {
+    WidgetOptions widgetOptions = ofNullable(widget.getWidgetOptions()).orElseGet(() -> {
+      WidgetOptions opts = new WidgetOptions();
+      widget.setWidgetOptions(opts);
+      return opts;
+    });
+    Map<String, Object> options = ofNullable(widgetOptions.getOptions()).orElseGet(() -> {
+      LinkedHashMap<String, Object> opts = new LinkedHashMap<>();
+      widgetOptions.setOptions(opts);
+      return opts;
+    });
+    options.put(key, value);
+    return this;
+  }
+
+  @Override
+  public Widget get() {
+    return widget;
+  }
 }
diff --git a/src/main/java/com/epam/ta/reportportal/ws/converter/converters/ActivityEventConverter.java b/src/main/java/com/epam/ta/reportportal/ws/converter/converters/ActivityEventConverter.java
index 3889e3bab4..528af4e1bf 100644
--- a/src/main/java/com/epam/ta/reportportal/ws/converter/converters/ActivityEventConverter.java
+++ b/src/main/java/com/epam/ta/reportportal/ws/converter/converters/ActivityEventConverter.java
@@ -18,7 +18,7 @@
 
 import com.epam.ta.reportportal.commons.EntityUtils;
 import com.epam.ta.reportportal.entity.activity.Activity;
-import com.epam.ta.reportportal.ws.model.ActivityEventResource;
+import com.epam.ta.reportportal.model.ActivityEventResource;
 import java.util.Objects;
 import java.util.function.Function;
 
@@ -32,20 +32,14 @@ public final class ActivityEventConverter {
   private ActivityEventConverter() {
   }
 
-  public static final Function<Activity, ActivityEventResource> TO_RESOURCE = activity ->
-      ActivityEventResource.builder()
-          .id(activity.getId())
+  public static final Function<Activity, ActivityEventResource> TO_RESOURCE =
+      activity -> ActivityEventResource.builder().id(activity.getId())
           .createdAt(EntityUtils.TO_DATE.apply(activity.getCreatedAt()))
-          .eventName(activity.getEventName())
-          .objectId(activity.getObjectId())
-          .objectName(activity.getObjectName())
-          .objectType(activity.getObjectType().getValue())
-          .projectId(activity.getProjectId())
-          .projectName(activity.getProjectName())
-          .subjectName(activity.getSubjectName())
-          .subjectType(activity.getSubjectType().getValue())
-          .subjectId(Objects.toString(activity.getSubjectId(), null))
-          .details(activity.getDetails())
+          .eventName(activity.getEventName()).objectId(activity.getObjectId())
+          .objectName(activity.getObjectName()).objectType(activity.getObjectType().getValue())
+          .projectId(activity.getProjectId()).projectName(activity.getProjectName())
+          .subjectName(activity.getSubjectName()).subjectType(activity.getSubjectType().getValue())
+          .subjectId(Objects.toString(activity.getSubjectId(), null)).details(activity.getDetails())
           .build();
 
 }
diff --git a/src/main/java/com/epam/ta/reportportal/ws/converter/converters/ApiKeyConverter.java b/src/main/java/com/epam/ta/reportportal/ws/converter/converters/ApiKeyConverter.java
index fb88ee5de0..980182a12c 100644
--- a/src/main/java/com/epam/ta/reportportal/ws/converter/converters/ApiKeyConverter.java
+++ b/src/main/java/com/epam/ta/reportportal/ws/converter/converters/ApiKeyConverter.java
@@ -18,7 +18,7 @@
 
 import com.epam.ta.reportportal.commons.EntityUtils;
 import com.epam.ta.reportportal.entity.user.ApiKey;
-import com.epam.ta.reportportal.ws.model.ApiKeyRS;
+import com.epam.ta.reportportal.model.ApiKeyRS;
 import java.util.function.Function;
 
 /**
diff --git a/src/main/java/com/epam/ta/reportportal/ws/converter/converters/BaseEntityConverter.java b/src/main/java/com/epam/ta/reportportal/ws/converter/converters/BaseEntityConverter.java
index 96f6c2086b..3ec2f15c33 100644
--- a/src/main/java/com/epam/ta/reportportal/ws/converter/converters/BaseEntityConverter.java
+++ b/src/main/java/com/epam/ta/reportportal/ws/converter/converters/BaseEntityConverter.java
@@ -17,8 +17,7 @@
 package com.epam.ta.reportportal.ws.converter.converters;
 
 import com.epam.ta.reportportal.entity.OwnedEntity;
-import com.epam.ta.reportportal.ws.model.OwnedEntityResource;
-
+import com.epam.ta.reportportal.model.OwnedEntityResource;
 import java.util.function.Function;
 
 /**
@@ -30,10 +29,11 @@ private BaseEntityConverter() {
     //static only
   }
 
-  public static final Function<? super OwnedEntity, OwnedEntityResource> TO_OWNED_ENTITY = shareable -> {
-    OwnedEntityResource ownedEntity = new OwnedEntityResource();
-    ownedEntity.setId(String.valueOf(shareable.getId()));
-    ownedEntity.setOwner(shareable.getOwner());
-    return ownedEntity;
-  };
+  public static final Function<? super OwnedEntity, OwnedEntityResource> TO_OWNED_ENTITY =
+      shareable -> {
+        OwnedEntityResource ownedEntity = new OwnedEntityResource();
+        ownedEntity.setId(String.valueOf(shareable.getId()));
+        ownedEntity.setOwner(shareable.getOwner());
+        return ownedEntity;
+      };
 }
diff --git a/src/main/java/com/epam/ta/reportportal/ws/converter/converters/DashboardConverter.java b/src/main/java/com/epam/ta/reportportal/ws/converter/converters/DashboardConverter.java
index 8a2188a33a..26f6924520 100644
--- a/src/main/java/com/epam/ta/reportportal/ws/converter/converters/DashboardConverter.java
+++ b/src/main/java/com/epam/ta/reportportal/ws/converter/converters/DashboardConverter.java
@@ -17,9 +17,8 @@
 package com.epam.ta.reportportal.ws.converter.converters;
 
 import com.epam.ta.reportportal.entity.dashboard.Dashboard;
-import com.epam.ta.reportportal.ws.model.activity.DashboardActivityResource;
-import com.epam.ta.reportportal.ws.model.dashboard.DashboardResource;
-
+import com.epam.ta.reportportal.model.activity.DashboardActivityResource;
+import com.epam.ta.reportportal.model.dashboard.DashboardResource;
 import java.util.function.Function;
 import java.util.stream.Collectors;
 
@@ -28,27 +27,30 @@
  */
 public final class DashboardConverter {
 
-	private DashboardConverter() {
-		//static only
-	}
-
-	public static final Function<Dashboard, DashboardResource> TO_RESOURCE = dashboard -> {
-		DashboardResource resource = new DashboardResource();
-		resource.setDashboardId(dashboard.getId());
-		resource.setName(dashboard.getName());
-		resource.setDescription(dashboard.getDescription());
-		resource.setWidgets(dashboard.getDashboardWidgets().stream().map(WidgetConverter.TO_OBJECT_MODEL).collect(Collectors.toList()));
-		resource.setOwner(dashboard.getOwner());
-		return resource;
-	};
-
-	public static final Function<Dashboard, DashboardActivityResource> TO_ACTIVITY_RESOURCE = dashboard -> {
-		DashboardActivityResource resource = new DashboardActivityResource();
-		resource.setId(dashboard.getId());
-		resource.setName(dashboard.getName());
-		resource.setProjectId(dashboard.getProject().getId());
-		resource.setDescription(dashboard.getDescription());
-		return resource;
-	};
+  private DashboardConverter() {
+    //static only
+  }
+
+  public static final Function<Dashboard, DashboardResource> TO_RESOURCE = dashboard -> {
+    DashboardResource resource = new DashboardResource();
+    resource.setDashboardId(dashboard.getId());
+    resource.setName(dashboard.getName());
+    resource.setDescription(dashboard.getDescription());
+    resource.setWidgets(
+        dashboard.getDashboardWidgets().stream().map(WidgetConverter.TO_OBJECT_MODEL)
+            .collect(Collectors.toList()));
+    resource.setOwner(dashboard.getOwner());
+    return resource;
+  };
+
+  public static final Function<Dashboard, DashboardActivityResource> TO_ACTIVITY_RESOURCE =
+      dashboard -> {
+        DashboardActivityResource resource = new DashboardActivityResource();
+        resource.setId(dashboard.getId());
+        resource.setName(dashboard.getName());
+        resource.setProjectId(dashboard.getProject().getId());
+        resource.setDescription(dashboard.getDescription());
+        return resource;
+      };
 
 }
diff --git a/src/main/java/com/epam/ta/reportportal/ws/converter/converters/IntegrationConverter.java b/src/main/java/com/epam/ta/reportportal/ws/converter/converters/IntegrationConverter.java
index 0200049578..837c5d803e 100644
--- a/src/main/java/com/epam/ta/reportportal/ws/converter/converters/IntegrationConverter.java
+++ b/src/main/java/com/epam/ta/reportportal/ws/converter/converters/IntegrationConverter.java
@@ -25,10 +25,10 @@
 import com.epam.ta.reportportal.entity.EmailSettingsEnum;
 import com.epam.ta.reportportal.entity.integration.Integration;
 import com.epam.ta.reportportal.entity.integration.IntegrationParams;
-import com.epam.ta.reportportal.ws.model.activity.IntegrationActivityResource;
-import com.epam.ta.reportportal.ws.model.integration.AuthFlowEnum;
-import com.epam.ta.reportportal.ws.model.integration.IntegrationResource;
-import com.epam.ta.reportportal.ws.model.integration.IntegrationTypeResource;
+import com.epam.ta.reportportal.model.activity.IntegrationActivityResource;
+import com.epam.ta.reportportal.model.integration.AuthFlowEnum;
+import com.epam.ta.reportportal.model.integration.IntegrationResource;
+import com.epam.ta.reportportal.model.integration.IntegrationTypeResource;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -41,62 +41,61 @@
  */
 public final class IntegrationConverter {
 
-  private static final List<String> IGNORE_FIELDS = List.of(
-      EmailSettingsEnum.PASSWORD.getAttribute(),
-      SauceLabsProperties.ACCESS_TOKEN.getName(),
-      BtsProperties.OAUTH_ACCESS_KEY.getName(),
-      BtsProperties.API_TOKEN.getName(),
-      AuthProperties.MANAGER_PASSWORD.getName()
-  );
+  private static final List<String> IGNORE_FIELDS =
+      List.of(EmailSettingsEnum.PASSWORD.getAttribute(), SauceLabsProperties.ACCESS_TOKEN.getName(),
+          BtsProperties.OAUTH_ACCESS_KEY.getName(), BtsProperties.API_TOKEN.getName(),
+          AuthProperties.MANAGER_PASSWORD.getName()
+      );
 
-  private static final Predicate<Map.Entry<String, Object>> IGNORE_FIELDS_CONDITION = entry -> IGNORE_FIELDS.stream()
-      .noneMatch(field -> field.equalsIgnoreCase(entry.getKey()));
+  private static final Predicate<Map.Entry<String, Object>> IGNORE_FIELDS_CONDITION =
+      entry -> IGNORE_FIELDS.stream().noneMatch(field -> field.equalsIgnoreCase(entry.getKey()));
 
-  public static final Function<Integration, IntegrationResource> TO_INTEGRATION_RESOURCE = integration -> {
-    IntegrationResource resource = new IntegrationResource();
-    resource.setId(integration.getId());
-    resource.setName(integration.getName());
-    resource.setCreator(integration.getCreator());
-    resource.setCreationDate(EntityUtils.TO_DATE.apply(integration.getCreationDate()));
-    resource.setEnabled(integration.isEnabled());
-    ofNullable(integration.getProject()).ifPresent(p -> resource.setProjectId(p.getId()));
-    ofNullable(integration.getParams()).flatMap(IntegrationConverter::convertToResourceParams)
-        .ifPresent(resource::setIntegrationParams);
-    IntegrationTypeResource type = new IntegrationTypeResource();
-    type.setId(integration.getType().getId());
-    type.setName(integration.getType().getName());
-    type.setEnabled(integration.getType().isEnabled());
-    type.setCreationDate(EntityUtils.TO_DATE.apply(integration.getType().getCreationDate()));
-    type.setGroupType(integration.getType().getIntegrationGroup().name());
-    ofNullable(integration.getType().getDetails()).ifPresent(
-        it -> type.setDetails(it.getDetails()));
-    ofNullable(integration.getType().getAuthFlow()).ifPresent(
-        it -> type.setAuthFlow(AuthFlowEnum.valueOf(it.name())));
-    resource.setIntegrationType(type);
+  public static final Function<Integration, IntegrationResource> TO_INTEGRATION_RESOURCE =
+      integration -> {
+        IntegrationResource resource = new IntegrationResource();
+        resource.setId(integration.getId());
+        resource.setName(integration.getName());
+        resource.setCreator(integration.getCreator());
+        resource.setCreationDate(EntityUtils.TO_DATE.apply(integration.getCreationDate()));
+        resource.setEnabled(integration.isEnabled());
+        ofNullable(integration.getProject()).ifPresent(p -> resource.setProjectId(p.getId()));
+        ofNullable(integration.getParams()).flatMap(IntegrationConverter::convertToResourceParams)
+            .ifPresent(resource::setIntegrationParams);
+        IntegrationTypeResource type = new IntegrationTypeResource();
+        type.setId(integration.getType().getId());
+        type.setName(integration.getType().getName());
+        type.setEnabled(integration.getType().isEnabled());
+        type.setCreationDate(EntityUtils.TO_DATE.apply(integration.getType().getCreationDate()));
+        type.setGroupType(integration.getType().getIntegrationGroup().name());
+        ofNullable(integration.getType().getDetails()).ifPresent(
+            it -> type.setDetails(it.getDetails()));
+        ofNullable(integration.getType().getAuthFlow()).ifPresent(
+            it -> type.setAuthFlow(AuthFlowEnum.valueOf(it.name())));
+        resource.setIntegrationType(type);
 
-    return resource;
-  };
+        return resource;
+      };
 
   private static Optional<Map<String, Object>> convertToResourceParams(IntegrationParams it) {
-    return ofNullable(it.getParams()).map(p -> p.entrySet()
-        .stream()
-        .filter(IGNORE_FIELDS_CONDITION)
+    return ofNullable(it.getParams()).map(p -> p.entrySet().stream().filter(IGNORE_FIELDS_CONDITION)
         .collect(HashMap::new,
             (resourceParams, entry) -> resourceParams.put(entry.getKey(), entry.getValue()),
-            Map::putAll));
+            Map::putAll
+        ));
   }
 
-  public static final Function<Integration, IntegrationActivityResource> TO_ACTIVITY_RESOURCE = integration -> {
-    IntegrationActivityResource resource = new IntegrationActivityResource();
-    resource.setId(integration.getId());
-    resource.setName(integration.getName());
-    ofNullable(integration.getProject()).ifPresent(p -> {
-      resource.setProjectId(p.getId());
-      resource.setProjectName(p.getName());
-    });
-    resource.setTypeName(integration.getType().getName());
-    return resource;
-  };
+  public static final Function<Integration, IntegrationActivityResource> TO_ACTIVITY_RESOURCE =
+      integration -> {
+        IntegrationActivityResource resource = new IntegrationActivityResource();
+        resource.setId(integration.getId());
+        resource.setName(integration.getName());
+        ofNullable(integration.getProject()).ifPresent(p -> {
+          resource.setProjectId(p.getId());
+          resource.setProjectName(p.getName());
+        });
+        resource.setTypeName(integration.getType().getName());
+        return resource;
+      };
 
   private IntegrationConverter() {
     //static only
diff --git a/src/main/java/com/epam/ta/reportportal/ws/converter/converters/IntegrationTypeConverter.java b/src/main/java/com/epam/ta/reportportal/ws/converter/converters/IntegrationTypeConverter.java
index ee68f161e9..62c2518c86 100644
--- a/src/main/java/com/epam/ta/reportportal/ws/converter/converters/IntegrationTypeConverter.java
+++ b/src/main/java/com/epam/ta/reportportal/ws/converter/converters/IntegrationTypeConverter.java
@@ -20,7 +20,7 @@
 
 import com.epam.ta.reportportal.commons.EntityUtils;
 import com.epam.ta.reportportal.entity.integration.IntegrationType;
-import com.epam.ta.reportportal.ws.model.integration.IntegrationTypeResource;
+import com.epam.ta.reportportal.model.integration.IntegrationTypeResource;
 import java.util.function.Function;
 
 /**
@@ -28,17 +28,18 @@
  */
 public final class IntegrationTypeConverter {
 
-  public static final Function<IntegrationType, IntegrationTypeResource> TO_RESOURCE = integrationType -> {
-    IntegrationTypeResource resource = new IntegrationTypeResource();
-    resource.setId(integrationType.getId());
-    resource.setName(integrationType.getName());
-    resource.setEnabled(integrationType.isEnabled());
-    resource.setCreationDate(EntityUtils.TO_DATE.apply(integrationType.getCreationDate()));
-    resource.setGroupType(integrationType.getIntegrationGroup().name());
-    ofNullable(integrationType.getDetails()).ifPresent(
-        it -> resource.setDetails(integrationType.getDetails().getDetails()));
-    return resource;
-  };
+  public static final Function<IntegrationType, IntegrationTypeResource> TO_RESOURCE =
+      integrationType -> {
+        IntegrationTypeResource resource = new IntegrationTypeResource();
+        resource.setId(integrationType.getId());
+        resource.setName(integrationType.getName());
+        resource.setEnabled(integrationType.isEnabled());
+        resource.setCreationDate(EntityUtils.TO_DATE.apply(integrationType.getCreationDate()));
+        resource.setGroupType(integrationType.getIntegrationGroup().name());
+        ofNullable(integrationType.getDetails()).ifPresent(
+            it -> resource.setDetails(integrationType.getDetails().getDetails()));
+        return resource;
+      };
 
   private IntegrationTypeConverter() {
     //static only
diff --git a/src/main/java/com/epam/ta/reportportal/ws/converter/converters/IssueTypeConverter.java b/src/main/java/com/epam/ta/reportportal/ws/converter/converters/IssueTypeConverter.java
index 98e0423176..3e84edeb9b 100644
--- a/src/main/java/com/epam/ta/reportportal/ws/converter/converters/IssueTypeConverter.java
+++ b/src/main/java/com/epam/ta/reportportal/ws/converter/converters/IssueTypeConverter.java
@@ -17,7 +17,7 @@
 package com.epam.ta.reportportal.ws.converter.converters;
 
 import com.epam.ta.reportportal.entity.item.issue.IssueType;
-import com.epam.ta.reportportal.ws.model.activity.IssueTypeActivityResource;
+import com.epam.ta.reportportal.model.activity.IssueTypeActivityResource;
 import java.util.function.Function;
 
 /**
@@ -29,10 +29,11 @@ private IssueTypeConverter() {
     //static only
   }
 
-  public static final Function<IssueType, IssueTypeActivityResource> TO_ACTIVITY_RESOURCE = issueType -> {
-    IssueTypeActivityResource resource = new IssueTypeActivityResource();
-    resource.setId(issueType.getId());
-    resource.setLongName(issueType.getLongName());
-    return resource;
-  };
+  public static final Function<IssueType, IssueTypeActivityResource> TO_ACTIVITY_RESOURCE =
+      issueType -> {
+        IssueTypeActivityResource resource = new IssueTypeActivityResource();
+        resource.setId(issueType.getId());
+        resource.setLongName(issueType.getLongName());
+        return resource;
+      };
 }
diff --git a/src/main/java/com/epam/ta/reportportal/ws/converter/converters/LaunchConverter.java b/src/main/java/com/epam/ta/reportportal/ws/converter/converters/LaunchConverter.java
index eeceb6ae92..fec7c04f4c 100644
--- a/src/main/java/com/epam/ta/reportportal/ws/converter/converters/LaunchConverter.java
+++ b/src/main/java/com/epam/ta/reportportal/ws/converter/converters/LaunchConverter.java
@@ -25,10 +25,10 @@
 import com.epam.ta.reportportal.dao.UserRepository;
 import com.epam.ta.reportportal.entity.ItemAttribute;
 import com.epam.ta.reportportal.entity.launch.Launch;
+import com.epam.ta.reportportal.model.activity.LaunchActivityResource;
 import com.epam.ta.reportportal.ws.converter.resource.handler.attribute.ItemAttributeType;
 import com.epam.ta.reportportal.ws.converter.resource.handler.attribute.ResourceAttributeHandler;
 import com.epam.ta.reportportal.ws.converter.resource.handler.attribute.resolver.ItemAttributeTypeResolver;
-import com.epam.ta.reportportal.ws.model.activity.LaunchActivityResource;
 import com.epam.ta.reportportal.ws.model.launch.LaunchResource;
 import com.epam.ta.reportportal.ws.model.launch.Mode;
 import com.google.common.base.Preconditions;
diff --git a/src/main/java/com/epam/ta/reportportal/ws/converter/converters/LogConverter.java b/src/main/java/com/epam/ta/reportportal/ws/converter/converters/LogConverter.java
index 05a4ca0801..ba9678adeb 100644
--- a/src/main/java/com/epam/ta/reportportal/ws/converter/converters/LogConverter.java
+++ b/src/main/java/com/epam/ta/reportportal/ws/converter/converters/LogConverter.java
@@ -24,8 +24,8 @@
 import com.epam.ta.reportportal.entity.enums.LogLevel;
 import com.epam.ta.reportportal.entity.log.Log;
 import com.epam.ta.reportportal.entity.log.LogFull;
-import com.epam.ta.reportportal.ws.model.log.LogResource;
-import com.epam.ta.reportportal.ws.model.log.SearchLogRs;
+import com.epam.ta.reportportal.model.log.LogResource;
+import com.epam.ta.reportportal.model.log.SearchLogRs;
 import com.google.common.base.Preconditions;
 import java.util.function.BiFunction;
 import java.util.function.Function;
diff --git a/src/main/java/com/epam/ta/reportportal/ws/converter/converters/NotificationConfigConverter.java b/src/main/java/com/epam/ta/reportportal/ws/converter/converters/NotificationConfigConverter.java
index f2a6feb6e3..fc8050385b 100644
--- a/src/main/java/com/epam/ta/reportportal/ws/converter/converters/NotificationConfigConverter.java
+++ b/src/main/java/com/epam/ta/reportportal/ws/converter/converters/NotificationConfigConverter.java
@@ -16,100 +16,102 @@
 
 package com.epam.ta.reportportal.ws.converter.converters;
 
+import static java.util.Optional.ofNullable;
+
 import com.epam.ta.reportportal.entity.enums.LogicalOperator;
 import com.epam.ta.reportportal.entity.enums.SendCase;
 import com.epam.ta.reportportal.entity.project.email.LaunchAttributeRule;
 import com.epam.ta.reportportal.entity.project.email.SenderCase;
 import com.epam.ta.reportportal.exception.ReportPortalException;
+import com.epam.ta.reportportal.model.project.email.SenderCaseDTO;
 import com.epam.ta.reportportal.ws.model.ErrorType;
 import com.epam.ta.reportportal.ws.model.ValidationConstraints;
 import com.epam.ta.reportportal.ws.model.attribute.ItemAttributeResource;
-import com.epam.ta.reportportal.ws.model.project.email.SenderCaseDTO;
 import com.google.common.base.Preconditions;
 import com.google.common.collect.Lists;
 import com.google.common.collect.Sets;
-
 import java.util.List;
 import java.util.Set;
 import java.util.function.Function;
 import java.util.stream.Collectors;
 
-import static java.util.Optional.ofNullable;
-
 /**
  * @author <a href="mailto:ivan_budayeu@epam.com">Ivan Budayeu</a>
  */
 public final class NotificationConfigConverter {
 
-	private NotificationConfigConverter() {
-		//static only
-	}
+  private NotificationConfigConverter() {
+    //static only
+  }
 
-	public final static Function<Set<SenderCase>, List<SenderCaseDTO>> TO_RESOURCE = senderCaseSet -> senderCaseSet.stream()
-			.map(NotificationConfigConverter.TO_CASE_RESOURCE)
-			.collect(Collectors.toList());
+  public final static Function<Set<SenderCase>, List<SenderCaseDTO>> TO_RESOURCE =
+      senderCaseSet -> senderCaseSet.stream().map(NotificationConfigConverter.TO_CASE_RESOURCE)
+          .collect(Collectors.toList());
 
-	public static final Function<LaunchAttributeRule, ItemAttributeResource> TO_ATTRIBUTE_RULE_RESOURCE = model -> {
-		ItemAttributeResource attributeResource = new ItemAttributeResource();
-		attributeResource.setKey(model.getKey());
-		attributeResource.setValue(model.getValue());
-		return attributeResource;
-	};
+  public static final Function<LaunchAttributeRule, ItemAttributeResource>
+      TO_ATTRIBUTE_RULE_RESOURCE = model -> {
+    ItemAttributeResource attributeResource = new ItemAttributeResource();
+    attributeResource.setKey(model.getKey());
+    attributeResource.setValue(model.getValue());
+    return attributeResource;
+  };
 
-	public final static Function<SenderCase, SenderCaseDTO> TO_CASE_RESOURCE = model -> {
-		Preconditions.checkNotNull(model);
-		SenderCaseDTO resource = new SenderCaseDTO();
-		resource.setLaunchNames(Lists.newArrayList(model.getLaunchNames()));
-		ofNullable(model.getLaunchAttributeRules()).ifPresent(launchAttributeRules -> resource.setAttributes(launchAttributeRules.stream()
-				.map(TO_ATTRIBUTE_RULE_RESOURCE)
-				.collect(Collectors.toSet())));
-		resource.setSendCase(model.getSendCase().getCaseString());
-		resource.setRecipients(Lists.newArrayList(model.getRecipients()));
-		resource.setEnabled(model.isEnabled());
-		resource.setAttributesOperator(model.getAttributesOperator().getOperator());
-		resource.setRuleName(model.getRuleName());
-		resource.setId(model.getId());
-		return resource;
-	};
+  public final static Function<SenderCase, SenderCaseDTO> TO_CASE_RESOURCE = model -> {
+    Preconditions.checkNotNull(model);
+    SenderCaseDTO resource = new SenderCaseDTO();
+    resource.setLaunchNames(Lists.newArrayList(model.getLaunchNames()));
+    ofNullable(model.getLaunchAttributeRules()).ifPresent(
+        launchAttributeRules -> resource.setAttributes(
+            launchAttributeRules.stream().map(TO_ATTRIBUTE_RULE_RESOURCE)
+                .collect(Collectors.toSet())));
+    resource.setSendCase(model.getSendCase().getCaseString());
+    resource.setRecipients(Lists.newArrayList(model.getRecipients()));
+    resource.setEnabled(model.isEnabled());
+    resource.setAttributesOperator(model.getAttributesOperator().getOperator());
+    resource.setRuleName(model.getRuleName());
+    resource.setId(model.getId());
+    return resource;
+  };
 
-	public static final Function<ItemAttributeResource, LaunchAttributeRule> TO_ATTRIBUTE_RULE_MODEL = resource -> {
-		LaunchAttributeRule launchAttributeRule = new LaunchAttributeRule();
-		cutAttributeToMaxLength(resource);
-		launchAttributeRule.setKey(resource.getKey());
-		launchAttributeRule.setValue(resource.getValue());
-		return launchAttributeRule;
-	};
+  public static final Function<ItemAttributeResource, LaunchAttributeRule> TO_ATTRIBUTE_RULE_MODEL =
+      resource -> {
+        LaunchAttributeRule launchAttributeRule = new LaunchAttributeRule();
+        cutAttributeToMaxLength(resource);
+        launchAttributeRule.setKey(resource.getKey());
+        launchAttributeRule.setValue(resource.getValue());
+        return launchAttributeRule;
+      };
 
-	private static void cutAttributeToMaxLength(ItemAttributeResource entity) {
-		String key = entity.getKey();
-		String value = entity.getValue();
-		if (key != null && key.length() > ValidationConstraints.MAX_ATTRIBUTE_LENGTH) {
-			entity.setKey(key.trim().substring(0, ValidationConstraints.MAX_ATTRIBUTE_LENGTH));
-		}
-		if (value != null && value.length() > ValidationConstraints.MAX_ATTRIBUTE_LENGTH) {
-			entity.setValue(value.trim().substring(0, ValidationConstraints.MAX_ATTRIBUTE_LENGTH));
-		}
-	}
+  private static void cutAttributeToMaxLength(ItemAttributeResource entity) {
+    String key = entity.getKey();
+    String value = entity.getValue();
+    if (key != null && key.length() > ValidationConstraints.MAX_ATTRIBUTE_LENGTH) {
+      entity.setKey(key.trim().substring(0, ValidationConstraints.MAX_ATTRIBUTE_LENGTH));
+    }
+    if (value != null && value.length() > ValidationConstraints.MAX_ATTRIBUTE_LENGTH) {
+      entity.setValue(value.trim().substring(0, ValidationConstraints.MAX_ATTRIBUTE_LENGTH));
+    }
+  }
 
-	public final static Function<SenderCaseDTO, SenderCase> TO_CASE_MODEL = resource -> {
-		SenderCase senderCase = new SenderCase();
-		ofNullable(resource.getAttributes()).ifPresent(attributes -> senderCase.setLaunchAttributeRules(attributes.stream()
-				.map(attribute -> {
-					LaunchAttributeRule launchAttributeRule = TO_ATTRIBUTE_RULE_MODEL.apply(attribute);
-					launchAttributeRule.setSenderCase(senderCase);
-					return launchAttributeRule;
-				})
-				.collect(Collectors.toSet())));
-		ofNullable(resource.getLaunchNames()).ifPresent(launchNames -> senderCase.setLaunchNames(Sets.newHashSet(launchNames)));
-		senderCase.setRecipients(Sets.newHashSet(resource.getRecipients()));
-		senderCase.setSendCase(SendCase.findByName(resource.getSendCase())
-				.orElseThrow(() -> new ReportPortalException(ErrorType.BAD_REQUEST_ERROR,
-						"Incorrect send case type " + resource.getSendCase()
-				)));
-		senderCase.setEnabled(resource.isEnabled());
-		senderCase.setAttributesOperator(LogicalOperator.valueOf(resource.getAttributesOperator()));
-		senderCase.setRuleName(resource.getRuleName());
-		senderCase.setId(resource.getId());
-		return senderCase;
-	};
+  public final static Function<SenderCaseDTO, SenderCase> TO_CASE_MODEL = resource -> {
+    SenderCase senderCase = new SenderCase();
+    ofNullable(resource.getAttributes()).ifPresent(
+        attributes -> senderCase.setLaunchAttributeRules(attributes.stream().map(attribute -> {
+          LaunchAttributeRule launchAttributeRule = TO_ATTRIBUTE_RULE_MODEL.apply(attribute);
+          launchAttributeRule.setSenderCase(senderCase);
+          return launchAttributeRule;
+        }).collect(Collectors.toSet())));
+    ofNullable(resource.getLaunchNames()).ifPresent(
+        launchNames -> senderCase.setLaunchNames(Sets.newHashSet(launchNames)));
+    senderCase.setRecipients(Sets.newHashSet(resource.getRecipients()));
+    senderCase.setSendCase(SendCase.findByName(resource.getSendCase()).orElseThrow(
+        () -> new ReportPortalException(ErrorType.BAD_REQUEST_ERROR,
+            "Incorrect send case type " + resource.getSendCase()
+        )));
+    senderCase.setEnabled(resource.isEnabled());
+    senderCase.setAttributesOperator(LogicalOperator.valueOf(resource.getAttributesOperator()));
+    senderCase.setRuleName(resource.getRuleName());
+    senderCase.setId(resource.getId());
+    return senderCase;
+  };
 }
diff --git a/src/main/java/com/epam/ta/reportportal/ws/converter/converters/PatternTemplateConverter.java b/src/main/java/com/epam/ta/reportportal/ws/converter/converters/PatternTemplateConverter.java
index 9c5214db63..592adcde2f 100644
--- a/src/main/java/com/epam/ta/reportportal/ws/converter/converters/PatternTemplateConverter.java
+++ b/src/main/java/com/epam/ta/reportportal/ws/converter/converters/PatternTemplateConverter.java
@@ -17,8 +17,8 @@
 package com.epam.ta.reportportal.ws.converter.converters;
 
 import com.epam.ta.reportportal.entity.pattern.PatternTemplate;
-import com.epam.ta.reportportal.ws.model.activity.PatternTemplateActivityResource;
-import com.epam.ta.reportportal.ws.model.project.config.pattern.PatternTemplateResource;
+import com.epam.ta.reportportal.model.activity.PatternTemplateActivityResource;
+import com.epam.ta.reportportal.model.project.config.pattern.PatternTemplateResource;
 import java.util.function.Function;
 
 /**
@@ -30,18 +30,20 @@ private PatternTemplateConverter() {
     //static only
   }
 
-  public static final Function<PatternTemplate, PatternTemplateResource> TO_RESOURCE = patternTemplate -> {
-    PatternTemplateResource resource = new PatternTemplateResource();
-    resource.setId(patternTemplate.getId());
-    resource.setType(patternTemplate.getTemplateType().name());
-    resource.setName(patternTemplate.getName());
-    resource.setValue(patternTemplate.getValue());
-    resource.setEnabled(patternTemplate.isEnabled());
+  public static final Function<PatternTemplate, PatternTemplateResource> TO_RESOURCE =
+      patternTemplate -> {
+        PatternTemplateResource resource = new PatternTemplateResource();
+        resource.setId(patternTemplate.getId());
+        resource.setType(patternTemplate.getTemplateType().name());
+        resource.setName(patternTemplate.getName());
+        resource.setValue(patternTemplate.getValue());
+        resource.setEnabled(patternTemplate.isEnabled());
 
-    return resource;
-  };
+        return resource;
+      };
 
-  public static final Function<PatternTemplate, PatternTemplateActivityResource> TO_ACTIVITY_RESOURCE = patternTemplate -> {
+  public static final Function<PatternTemplate, PatternTemplateActivityResource>
+      TO_ACTIVITY_RESOURCE = patternTemplate -> {
     PatternTemplateActivityResource resource = new PatternTemplateActivityResource();
     resource.setId(patternTemplate.getId());
     resource.setName(patternTemplate.getName());
diff --git a/src/main/java/com/epam/ta/reportportal/ws/converter/converters/ProjectActivityConverter.java b/src/main/java/com/epam/ta/reportportal/ws/converter/converters/ProjectActivityConverter.java
index 6bdb4d288c..09308eb3ea 100644
--- a/src/main/java/com/epam/ta/reportportal/ws/converter/converters/ProjectActivityConverter.java
+++ b/src/main/java/com/epam/ta/reportportal/ws/converter/converters/ProjectActivityConverter.java
@@ -18,7 +18,7 @@
 
 import com.epam.ta.reportportal.entity.project.Project;
 import com.epam.ta.reportportal.entity.project.ProjectUtils;
-import com.epam.ta.reportportal.ws.model.activity.ProjectAttributesActivityResource;
+import com.epam.ta.reportportal.model.activity.ProjectAttributesActivityResource;
 import java.util.function.Function;
 
 /**
@@ -30,12 +30,13 @@ private ProjectActivityConverter() {
     //static only
   }
 
-  public static final Function<Project, ProjectAttributesActivityResource> TO_ACTIVITY_RESOURCE = project -> {
-    ProjectAttributesActivityResource resource = new ProjectAttributesActivityResource();
-    resource.setProjectId(project.getId());
-    resource.setProjectName(project.getName());
-    resource.setConfig(ProjectUtils.getConfigParameters(project.getProjectAttributes()));
-    return resource;
-  };
+  public static final Function<Project, ProjectAttributesActivityResource> TO_ACTIVITY_RESOURCE =
+      project -> {
+        ProjectAttributesActivityResource resource = new ProjectAttributesActivityResource();
+        resource.setProjectId(project.getId());
+        resource.setProjectName(project.getName());
+        resource.setConfig(ProjectUtils.getConfigParameters(project.getProjectAttributes()));
+        return resource;
+      };
 
 }
diff --git a/src/main/java/com/epam/ta/reportportal/ws/converter/converters/ProjectConverter.java b/src/main/java/com/epam/ta/reportportal/ws/converter/converters/ProjectConverter.java
index e54485239b..b03929c96c 100644
--- a/src/main/java/com/epam/ta/reportportal/ws/converter/converters/ProjectConverter.java
+++ b/src/main/java/com/epam/ta/reportportal/ws/converter/converters/ProjectConverter.java
@@ -16,26 +16,25 @@
 
 package com.epam.ta.reportportal.ws.converter.converters;
 
+import static com.epam.ta.reportportal.ws.converter.converters.ProjectSettingsConverter.TO_SUBTYPE_RESOURCE;
+import static java.util.Optional.ofNullable;
+
 import com.epam.ta.reportportal.core.analyzer.auto.indexer.IndexerStatusCache;
 import com.epam.ta.reportportal.entity.enums.ProjectAttributeEnum;
 import com.epam.ta.reportportal.entity.project.Project;
 import com.epam.ta.reportportal.entity.project.ProjectIssueType;
 import com.epam.ta.reportportal.entity.project.ProjectUtils;
-import com.epam.ta.reportportal.ws.model.project.ProjectConfiguration;
-import com.epam.ta.reportportal.ws.model.project.ProjectResource;
-import com.epam.ta.reportportal.ws.model.project.config.IssueSubTypeResource;
-import com.epam.ta.reportportal.ws.model.project.email.ProjectNotificationConfigDTO;
-import org.apache.commons.lang3.BooleanUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
+import com.epam.ta.reportportal.model.project.ProjectConfiguration;
+import com.epam.ta.reportportal.model.project.ProjectResource;
+import com.epam.ta.reportportal.model.project.config.IssueSubTypeResource;
+import com.epam.ta.reportportal.model.project.email.ProjectNotificationConfigDTO;
 import java.util.List;
 import java.util.Map;
 import java.util.function.Function;
 import java.util.stream.Collectors;
-
-import static com.epam.ta.reportportal.ws.converter.converters.ProjectSettingsConverter.TO_SUBTYPE_RESOURCE;
-import static java.util.Optional.ofNullable;
+import org.apache.commons.lang3.BooleanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
 
 /**
  * @author Pavel Bortnik
@@ -43,69 +42,68 @@
 @Service
 public final class ProjectConverter {
 
-	private final static String INDEXING_RUN = "analyzer.indexingRunning";
-
-	@Autowired
-	private IndexerStatusCache indexerStatusCache;
-
-	public Function<Project, ProjectResource> TO_PROJECT_RESOURCE = project -> {
-		if (project == null) {
-			return null;
-		}
-
-		ProjectResource projectResource = new ProjectResource();
-		projectResource.setProjectId(project.getId());
-		projectResource.setProjectName(project.getName());
-		projectResource.setEntryType(project.getProjectType().name());
-		projectResource.setCreationDate(project.getCreationDate());
-		projectResource.setAllocatedStorage(project.getAllocatedStorage());
-		projectResource.setUsers(project.getUsers().stream().map(user -> {
-			ProjectResource.ProjectUser projectUser = new ProjectResource.ProjectUser();
-			projectUser.setLogin(user.getUser().getLogin());
-			projectUser.setProjectRole(user.getProjectRole().toString());
-			return projectUser;
-		}).collect(Collectors.toList()));
-
-		Map<String, List<IssueSubTypeResource>> subTypes = project.getProjectIssueTypes()
-				.stream()
-				.map(ProjectIssueType::getIssueType)
-				.collect(Collectors.groupingBy(
-						it -> it.getIssueGroup().getTestItemIssueGroup().getValue(),
-						Collectors.mapping(TO_SUBTYPE_RESOURCE, Collectors.toList())
-				));
-
-		ProjectConfiguration projectConfiguration = new ProjectConfiguration();
-
-		Map<String, String> attributes = ProjectUtils.getConfigParameters(project.getProjectAttributes());
-
-		attributes.put(
-				INDEXING_RUN,
-				String.valueOf(ofNullable(indexerStatusCache.getIndexingStatus().getIfPresent(project.getId())).orElse(false))
-		);
-
-		projectConfiguration.setProjectAttributes(attributes);
-
-		projectConfiguration.setPatterns(project.getPatternTemplates()
-				.stream()
-				.map(PatternTemplateConverter.TO_RESOURCE)
-				.collect(Collectors.toList()));
-
-		projectResource.setIntegrations(project.getIntegrations()
-				.stream()
-				.map(IntegrationConverter.TO_INTEGRATION_RESOURCE)
-				.collect(Collectors.toList()));
-
-		ProjectNotificationConfigDTO notificationConfig = new ProjectNotificationConfigDTO();
-		notificationConfig.setEnabled(BooleanUtils.toBoolean(attributes.get(ProjectAttributeEnum.NOTIFICATIONS_ENABLED.getAttribute())));
-
-		ofNullable(project.getSenderCases()).ifPresent(senderCases -> notificationConfig.setSenderCases(NotificationConfigConverter.TO_RESOURCE
-				.apply(senderCases)));
-		projectConfiguration.setProjectConfig(notificationConfig);
-
-		projectConfiguration.setSubTypes(subTypes);
-
-		projectResource.setConfiguration(projectConfiguration);
-		return projectResource;
-	};
+  private final static String INDEXING_RUN = "analyzer.indexingRunning";
+
+  @Autowired
+  private IndexerStatusCache indexerStatusCache;
+
+  public Function<Project, ProjectResource> TO_PROJECT_RESOURCE = project -> {
+    if (project == null) {
+      return null;
+    }
+
+    ProjectResource projectResource = new ProjectResource();
+    projectResource.setProjectId(project.getId());
+    projectResource.setProjectName(project.getName());
+    projectResource.setEntryType(project.getProjectType().name());
+    projectResource.setCreationDate(project.getCreationDate());
+    projectResource.setAllocatedStorage(project.getAllocatedStorage());
+    projectResource.setUsers(project.getUsers().stream().map(user -> {
+      ProjectResource.ProjectUser projectUser = new ProjectResource.ProjectUser();
+      projectUser.setLogin(user.getUser().getLogin());
+      projectUser.setProjectRole(user.getProjectRole().toString());
+      return projectUser;
+    }).collect(Collectors.toList()));
+
+    Map<String, List<IssueSubTypeResource>> subTypes =
+        project.getProjectIssueTypes().stream().map(ProjectIssueType::getIssueType)
+            .collect(Collectors.groupingBy(
+                it -> it.getIssueGroup().getTestItemIssueGroup().getValue(),
+                Collectors.mapping(TO_SUBTYPE_RESOURCE, Collectors.toList())
+            ));
+
+    ProjectConfiguration projectConfiguration = new ProjectConfiguration();
+
+    Map<String, String> attributes =
+        ProjectUtils.getConfigParameters(project.getProjectAttributes());
+
+    attributes.put(
+        INDEXING_RUN, String.valueOf(
+            ofNullable(indexerStatusCache.getIndexingStatus().getIfPresent(project.getId())).orElse(
+                false)));
+
+    projectConfiguration.setProjectAttributes(attributes);
+
+    projectConfiguration.setPatterns(
+        project.getPatternTemplates().stream().map(PatternTemplateConverter.TO_RESOURCE)
+            .collect(Collectors.toList()));
+
+    projectResource.setIntegrations(
+        project.getIntegrations().stream().map(IntegrationConverter.TO_INTEGRATION_RESOURCE)
+            .collect(Collectors.toList()));
+
+    ProjectNotificationConfigDTO notificationConfig = new ProjectNotificationConfigDTO();
+    notificationConfig.setEnabled(BooleanUtils.toBoolean(
+        attributes.get(ProjectAttributeEnum.NOTIFICATIONS_ENABLED.getAttribute())));
+
+    ofNullable(project.getSenderCases()).ifPresent(senderCases -> notificationConfig.setSenderCases(
+        NotificationConfigConverter.TO_RESOURCE.apply(senderCases)));
+    projectConfiguration.setProjectConfig(notificationConfig);
+
+    projectConfiguration.setSubTypes(subTypes);
+
+    projectResource.setConfiguration(projectConfiguration);
+    return projectResource;
+  };
 
 }
diff --git a/src/main/java/com/epam/ta/reportportal/ws/converter/converters/ProjectSettingsConverter.java b/src/main/java/com/epam/ta/reportportal/ws/converter/converters/ProjectSettingsConverter.java
index 66deb60f28..b3e80010bb 100644
--- a/src/main/java/com/epam/ta/reportportal/ws/converter/converters/ProjectSettingsConverter.java
+++ b/src/main/java/com/epam/ta/reportportal/ws/converter/converters/ProjectSettingsConverter.java
@@ -23,9 +23,9 @@
 import com.epam.ta.reportportal.entity.project.Project;
 import com.epam.ta.reportportal.entity.project.ProjectInfo;
 import com.epam.ta.reportportal.entity.project.ProjectIssueType;
-import com.epam.ta.reportportal.ws.model.project.ProjectInfoResource;
-import com.epam.ta.reportportal.ws.model.project.config.IssueSubTypeResource;
-import com.epam.ta.reportportal.ws.model.project.config.ProjectSettingsResource;
+import com.epam.ta.reportportal.model.project.ProjectInfoResource;
+import com.epam.ta.reportportal.model.project.config.IssueSubTypeResource;
+import com.epam.ta.reportportal.model.project.config.ProjectSettingsResource;
 import com.google.common.base.Preconditions;
 import java.util.List;
 import java.util.Map;
@@ -41,19 +41,20 @@ private ProjectSettingsConverter() {
     //static only
   }
 
-  public static final Function<ProjectInfo, ProjectInfoResource> TO_PROJECT_INFO_RESOURCE = project -> {
-    Preconditions.checkNotNull(project);
-    ProjectInfoResource resource = new ProjectInfoResource();
-    resource.setUsersQuantity(project.getUsersQuantity());
-    resource.setLaunchesQuantity(project.getLaunchesQuantity());
-    resource.setProjectId(project.getId());
-    resource.setProjectName(project.getName());
-    resource.setCreationDate(EntityUtils.TO_DATE.apply(project.getCreationDate()));
-    resource.setLastRun(ofNullable(project.getLastRun()).map(EntityUtils.TO_DATE).orElse(null));
-    resource.setEntryType(project.getProjectType());
-    resource.setOrganization(project.getOrganization());
-    return resource;
-  };
+  public static final Function<ProjectInfo, ProjectInfoResource> TO_PROJECT_INFO_RESOURCE =
+      project -> {
+        Preconditions.checkNotNull(project);
+        ProjectInfoResource resource = new ProjectInfoResource();
+        resource.setUsersQuantity(project.getUsersQuantity());
+        resource.setLaunchesQuantity(project.getLaunchesQuantity());
+        resource.setProjectId(project.getId());
+        resource.setProjectName(project.getName());
+        resource.setCreationDate(EntityUtils.TO_DATE.apply(project.getCreationDate()));
+        resource.setLastRun(ofNullable(project.getLastRun()).map(EntityUtils.TO_DATE).orElse(null));
+        resource.setEntryType(project.getProjectType());
+        resource.setOrganization(project.getOrganization());
+        return resource;
+      };
 
   public static final Function<IssueType, IssueSubTypeResource> TO_SUBTYPE_RESOURCE = issueType -> {
     IssueSubTypeResource issueSubTypeResource = new IssueSubTypeResource();
@@ -66,21 +67,21 @@ private ProjectSettingsConverter() {
     return issueSubTypeResource;
   };
 
-  public static final Function<List<IssueType>, Map<String, List<IssueSubTypeResource>>> TO_PROJECT_SUB_TYPES_RESOURCE = issueTypes -> issueTypes
-      .stream()
-      .collect(Collectors.groupingBy(
+  public static final Function<List<IssueType>, Map<String, List<IssueSubTypeResource>>>
+      TO_PROJECT_SUB_TYPES_RESOURCE =
+      issueTypes -> issueTypes.stream().collect(Collectors.groupingBy(
           it -> it.getIssueGroup().getTestItemIssueGroup().getValue(),
           Collectors.mapping(TO_SUBTYPE_RESOURCE, Collectors.toList())
       ));
 
-  public static final Function<Project, ProjectSettingsResource> TO_PROJECT_SETTINGS_RESOURCE = project -> {
-    ProjectSettingsResource resource = new ProjectSettingsResource();
-    resource.setProjectId(project.getId());
-    resource.setSubTypes(TO_PROJECT_SUB_TYPES_RESOURCE.apply(project.getProjectIssueTypes()
-        .stream()
-        .map(ProjectIssueType::getIssueType)
-        .collect(Collectors.toList())));
-    return resource;
-  };
+  public static final Function<Project, ProjectSettingsResource> TO_PROJECT_SETTINGS_RESOURCE =
+      project -> {
+        ProjectSettingsResource resource = new ProjectSettingsResource();
+        resource.setProjectId(project.getId());
+        resource.setSubTypes(TO_PROJECT_SUB_TYPES_RESOURCE.apply(
+            project.getProjectIssueTypes().stream().map(ProjectIssueType::getIssueType)
+                .collect(Collectors.toList())));
+        return resource;
+      };
 
 }
diff --git a/src/main/java/com/epam/ta/reportportal/ws/converter/converters/RestorePasswordBidConverter.java b/src/main/java/com/epam/ta/reportportal/ws/converter/converters/RestorePasswordBidConverter.java
index ab08b88c3e..9bba77cdfb 100644
--- a/src/main/java/com/epam/ta/reportportal/ws/converter/converters/RestorePasswordBidConverter.java
+++ b/src/main/java/com/epam/ta/reportportal/ws/converter/converters/RestorePasswordBidConverter.java
@@ -17,7 +17,7 @@
 package com.epam.ta.reportportal.ws.converter.converters;
 
 import com.epam.ta.reportportal.entity.user.RestorePasswordBid;
-import com.epam.ta.reportportal.ws.model.user.RestorePasswordRQ;
+import com.epam.ta.reportportal.model.user.RestorePasswordRQ;
 import com.google.common.base.Preconditions;
 import java.util.UUID;
 import java.util.function.Function;
diff --git a/src/main/java/com/epam/ta/reportportal/ws/converter/converters/TestItemConverter.java b/src/main/java/com/epam/ta/reportportal/ws/converter/converters/TestItemConverter.java
index 19ec0aaabf..df72c218bf 100644
--- a/src/main/java/com/epam/ta/reportportal/ws/converter/converters/TestItemConverter.java
+++ b/src/main/java/com/epam/ta/reportportal/ws/converter/converters/TestItemConverter.java
@@ -24,9 +24,9 @@
 import com.epam.ta.reportportal.entity.item.PathName;
 import com.epam.ta.reportportal.entity.item.TestItem;
 import com.epam.ta.reportportal.entity.item.issue.IssueEntity;
-import com.epam.ta.reportportal.ws.model.NestedStepResource;
-import com.epam.ta.reportportal.ws.model.TestItemResource;
-import com.epam.ta.reportportal.ws.model.activity.TestItemActivityResource;
+import com.epam.ta.reportportal.model.NestedStepResource;
+import com.epam.ta.reportportal.model.TestItemResource;
+import com.epam.ta.reportportal.model.activity.TestItemActivityResource;
 import com.epam.ta.reportportal.ws.model.attribute.ItemAttributeResource;
 import com.epam.ta.reportportal.ws.model.item.ItemPathName;
 import com.epam.ta.reportportal.ws.model.item.LaunchPathName;
diff --git a/src/main/java/com/epam/ta/reportportal/ws/converter/converters/UserConverter.java b/src/main/java/com/epam/ta/reportportal/ws/converter/converters/UserConverter.java
index bbae034468..155a42d2fa 100644
--- a/src/main/java/com/epam/ta/reportportal/ws/converter/converters/UserConverter.java
+++ b/src/main/java/com/epam/ta/reportportal/ws/converter/converters/UserConverter.java
@@ -20,9 +20,9 @@
 import com.epam.ta.reportportal.entity.user.ProjectUser;
 import com.epam.ta.reportportal.entity.user.User;
 import com.epam.ta.reportportal.entity.user.UserType;
-import com.epam.ta.reportportal.ws.model.activity.UserActivityResource;
-import com.epam.ta.reportportal.ws.model.user.SearchUserResource;
-import com.epam.ta.reportportal.ws.model.user.UserResource;
+import com.epam.ta.reportportal.model.activity.UserActivityResource;
+import com.epam.ta.reportportal.model.user.SearchUserResource;
+import com.epam.ta.reportportal.model.user.UserResource;
 import com.google.common.collect.Lists;
 import java.util.Comparator;
 import java.util.List;
@@ -37,53 +37,53 @@
  */
 public final class UserConverter {
 
-	private UserConverter() {
-		//static only
-	}
+  private UserConverter() {
+    //static only
+  }
 
-	public static final Function<User, UserResource> TO_RESOURCE = user -> {
-		UserResource resource = new UserResource();
-		resource.setId(user.getId());
-		resource.setUserId(user.getLogin());
-		resource.setEmail(user.getEmail());
-		resource.setPhotoId(user.getAttachment());
-		resource.setFullName(user.getFullName());
-		resource.setAccountType(user.getUserType().toString());
-		resource.setUserRole(user.getRole().toString());
-		resource.setIsLoaded(UserType.UPSA != user.getUserType());
-		resource.setMetadata(user.getMetadata().getMetadata());
+  public static final Function<User, UserResource> TO_RESOURCE = user -> {
+    UserResource resource = new UserResource();
+    resource.setId(user.getId());
+    resource.setUserId(user.getLogin());
+    resource.setEmail(user.getEmail());
+    resource.setPhotoId(user.getAttachment());
+    resource.setFullName(user.getFullName());
+    resource.setAccountType(user.getUserType().toString());
+    resource.setUserRole(user.getRole().toString());
+    resource.setIsLoaded(UserType.UPSA != user.getUserType());
+    resource.setMetadata(user.getMetadata().getMetadata());
 
-		if (null != user.getProjects()) {
-			List<ProjectUser> projects = Lists.newArrayList(user.getProjects());
-			projects.sort(Comparator.comparing(compare -> compare.getProject().getName()));
-			Map<String, UserResource.AssignedProject> userProjects = user.getProjects()
-					.stream()
-					.collect(MoreCollectors.toLinkedMap(p -> p.getProject().getName(), p -> {
-						UserResource.AssignedProject assignedProject = new UserResource.AssignedProject();
-						assignedProject.setEntryType(p.getProject().getProjectType().name());
-						assignedProject.setProjectRole(p.getProjectRole().toString());
-						return assignedProject;
-					}));
-			resource.setAssignedProjects(userProjects);
-		}
-		return resource;
-	};
+    if (null != user.getProjects()) {
+      List<ProjectUser> projects = Lists.newArrayList(user.getProjects());
+      projects.sort(Comparator.comparing(compare -> compare.getProject().getName()));
+      Map<String, UserResource.AssignedProject> userProjects = user.getProjects().stream()
+          .collect(MoreCollectors.toLinkedMap(p -> p.getProject().getName(), p -> {
+            UserResource.AssignedProject assignedProject = new UserResource.AssignedProject();
+            assignedProject.setEntryType(p.getProject().getProjectType().name());
+            assignedProject.setProjectRole(p.getProjectRole().toString());
+            return assignedProject;
+          }));
+      resource.setAssignedProjects(userProjects);
+    }
+    return resource;
+  };
 
-	public static final Function<User, SearchUserResource> TO_SEARCH_RESOURCE = user -> {
-		final SearchUserResource resource = new SearchUserResource();
-		resource.setId(user.getId());
-		resource.setLogin(user.getLogin());
-		resource.setEmail(user.getEmail());
-		resource.setFullName(user.getFullName());
-		return resource;
-	};
+  public static final Function<User, SearchUserResource> TO_SEARCH_RESOURCE = user -> {
+    final SearchUserResource resource = new SearchUserResource();
+    resource.setId(user.getId());
+    resource.setLogin(user.getLogin());
+    resource.setEmail(user.getEmail());
+    resource.setFullName(user.getFullName());
+    return resource;
+  };
 
-	public static final BiFunction<User, Long, UserActivityResource> TO_ACTIVITY_RESOURCE = (user, projectId) -> {
-		UserActivityResource resource = new UserActivityResource();
-		resource.setId(user.getId());
-		resource.setDefaultProjectId(projectId);
-		resource.setFullName(user.getLogin());
-		return resource;
-	};
+  public static final BiFunction<User, Long, UserActivityResource> TO_ACTIVITY_RESOURCE =
+      (user, projectId) -> {
+        UserActivityResource resource = new UserActivityResource();
+        resource.setId(user.getId());
+        resource.setDefaultProjectId(projectId);
+        resource.setFullName(user.getLogin());
+        return resource;
+      };
 
 }
diff --git a/src/main/java/com/epam/ta/reportportal/ws/converter/converters/UserCreationBidConverter.java b/src/main/java/com/epam/ta/reportportal/ws/converter/converters/UserCreationBidConverter.java
index 137353c8a4..b217522e81 100644
--- a/src/main/java/com/epam/ta/reportportal/ws/converter/converters/UserCreationBidConverter.java
+++ b/src/main/java/com/epam/ta/reportportal/ws/converter/converters/UserCreationBidConverter.java
@@ -19,7 +19,7 @@
 import com.epam.ta.reportportal.commons.EntityUtils;
 import com.epam.ta.reportportal.entity.project.Project;
 import com.epam.ta.reportportal.entity.user.UserCreationBid;
-import com.epam.ta.reportportal.ws.model.user.CreateUserRQ;
+import com.epam.ta.reportportal.model.user.CreateUserRQ;
 import com.google.common.base.Preconditions;
 import java.util.UUID;
 import java.util.function.BiFunction;
@@ -35,13 +35,14 @@ private UserCreationBidConverter() {
     //static only
   }
 
-  public static final BiFunction<CreateUserRQ, Project, UserCreationBid> TO_USER = (request, project) -> {
-    Preconditions.checkNotNull(request);
-    UserCreationBid user = new UserCreationBid();
-    user.setUuid(UUID.randomUUID().toString());
-    user.setEmail(EntityUtils.normalizeId(request.getEmail().trim()));
-    user.setProjectName(project.getName());
-    user.setRole(request.getRole());
-    return user;
-  };
+  public static final BiFunction<CreateUserRQ, Project, UserCreationBid> TO_USER =
+      (request, project) -> {
+        Preconditions.checkNotNull(request);
+        UserCreationBid user = new UserCreationBid();
+        user.setUuid(UUID.randomUUID().toString());
+        user.setEmail(EntityUtils.normalizeId(request.getEmail().trim()));
+        user.setProjectName(project.getName());
+        user.setRole(request.getRole());
+        return user;
+      };
 }
diff --git a/src/main/java/com/epam/ta/reportportal/ws/converter/converters/UserFilterConverter.java b/src/main/java/com/epam/ta/reportportal/ws/converter/converters/UserFilterConverter.java
index 199729a60d..d253088e2f 100644
--- a/src/main/java/com/epam/ta/reportportal/ws/converter/converters/UserFilterConverter.java
+++ b/src/main/java/com/epam/ta/reportportal/ws/converter/converters/UserFilterConverter.java
@@ -16,91 +16,94 @@
 
 package com.epam.ta.reportportal.ws.converter.converters;
 
+import static java.util.Optional.ofNullable;
+import static java.util.stream.Collectors.toList;
+import static java.util.stream.Collectors.toSet;
+
 import com.epam.ta.reportportal.commons.querygen.FilterCondition;
 import com.epam.ta.reportportal.entity.filter.FilterSort;
 import com.epam.ta.reportportal.entity.filter.UserFilter;
-import com.epam.ta.reportportal.ws.model.OwnedEntityResource;
-import com.epam.ta.reportportal.ws.model.activity.UserFilterActivityResource;
-import com.epam.ta.reportportal.ws.model.filter.Order;
-import com.epam.ta.reportportal.ws.model.filter.UserFilterCondition;
-import com.epam.ta.reportportal.ws.model.filter.UserFilterResource;
-
+import com.epam.ta.reportportal.model.OwnedEntityResource;
+import com.epam.ta.reportportal.model.activity.UserFilterActivityResource;
+import com.epam.ta.reportportal.model.filter.Order;
+import com.epam.ta.reportportal.model.filter.UserFilterCondition;
+import com.epam.ta.reportportal.model.filter.UserFilterResource;
 import java.util.List;
 import java.util.Set;
 import java.util.function.Function;
 import java.util.stream.Collectors;
 
-import static java.util.Optional.ofNullable;
-import static java.util.stream.Collectors.toList;
-import static java.util.stream.Collectors.toSet;
-
 /**
  * @author Pavel Bortnik
  */
 public final class UserFilterConverter {
 
-	private UserFilterConverter() {
-		//static only
-	}
+  private UserFilterConverter() {
+    //static only
+  }
 
-	public static final Function<UserFilter, OwnedEntityResource> TO_OWNED_ENTITY_RESOURCE = filter -> {
-		OwnedEntityResource ownedEntity = BaseEntityConverter.TO_OWNED_ENTITY.apply(filter);
-		ownedEntity.setName(filter.getName());
-		ownedEntity.setDescription(filter.getDescription());
-		return ownedEntity;
-	};
+  public static final Function<UserFilter, OwnedEntityResource> TO_OWNED_ENTITY_RESOURCE =
+      filter -> {
+        OwnedEntityResource ownedEntity = BaseEntityConverter.TO_OWNED_ENTITY.apply(filter);
+        ownedEntity.setName(filter.getName());
+        ownedEntity.setDescription(filter.getDescription());
+        return ownedEntity;
+      };
 
-	public static final Function<Set<UserFilter>, List<UserFilterResource>> FILTER_SET_TO_FILTER_RESOURCE = filters -> filters.stream()
-			.map(UserFilterConverter::buildFilterResource)
-			.collect(Collectors.toList());
+  public static final Function<Set<UserFilter>, List<UserFilterResource>>
+      FILTER_SET_TO_FILTER_RESOURCE =
+      filters -> filters.stream().map(UserFilterConverter::buildFilterResource)
+          .collect(Collectors.toList());
 
-	public static final Function<UserFilter, UserFilterResource> TO_FILTER_RESOURCE = UserFilterConverter::buildFilterResource;
+  public static final Function<UserFilter, UserFilterResource> TO_FILTER_RESOURCE =
+      UserFilterConverter::buildFilterResource;
 
-	public static final Function<UserFilter, UserFilterActivityResource> TO_ACTIVITY_RESOURCE = filter -> {
-		UserFilterActivityResource resource = new UserFilterActivityResource();
-		resource.setId(filter.getId());
-		resource.setName(filter.getName());
-		resource.setDescription(filter.getDescription());
-		resource.setProjectId(filter.getProject().getId());
-		return resource;
-	};
+  public static final Function<UserFilter, UserFilterActivityResource> TO_ACTIVITY_RESOURCE =
+      filter -> {
+        UserFilterActivityResource resource = new UserFilterActivityResource();
+        resource.setId(filter.getId());
+        resource.setName(filter.getName());
+        resource.setDescription(filter.getDescription());
+        resource.setProjectId(filter.getProject().getId());
+        return resource;
+      };
 
-	private static final Function<FilterCondition, UserFilterCondition> TO_FILTER_CONDITION = filterCondition -> {
-		UserFilterCondition condition = new UserFilterCondition();
-		ofNullable(filterCondition.getCondition()).ifPresent(c -> {
-			if (filterCondition.isNegative()) {
-				condition.setCondition("!".concat(c.getMarker()));
-			} else {
-				condition.setCondition(c.getMarker());
-			}
-		});
-		condition.setFilteringField(filterCondition.getSearchCriteria());
-		condition.setValue(filterCondition.getValue());
+  private static final Function<FilterCondition, UserFilterCondition> TO_FILTER_CONDITION =
+      filterCondition -> {
+        UserFilterCondition condition = new UserFilterCondition();
+        ofNullable(filterCondition.getCondition()).ifPresent(c -> {
+          if (filterCondition.isNegative()) {
+            condition.setCondition("!".concat(c.getMarker()));
+          } else {
+            condition.setCondition(c.getMarker());
+          }
+        });
+        condition.setFilteringField(filterCondition.getSearchCriteria());
+        condition.setValue(filterCondition.getValue());
 
-		return condition;
-	};
+        return condition;
+      };
 
-	private static final Function<FilterSort, Order> TO_FILTER_ORDER = filterSort -> {
-		Order order = new Order();
-		order.setSortingColumnName(filterSort.getField());
-		order.setIsAsc(filterSort.getDirection().isAscending());
-		return order;
-	};
+  private static final Function<FilterSort, Order> TO_FILTER_ORDER = filterSort -> {
+    Order order = new Order();
+    order.setSortingColumnName(filterSort.getField());
+    order.setIsAsc(filterSort.getDirection().isAscending());
+    return order;
+  };
 
-	private static UserFilterResource buildFilterResource(UserFilter filter) {
-		UserFilterResource userFilterResource = new UserFilterResource();
-		userFilterResource.setFilterId(filter.getId());
-		userFilterResource.setName(filter.getName());
-		userFilterResource.setDescription(filter.getDescription());
-		userFilterResource.setOwner(filter.getOwner());
-		ofNullable(filter.getTargetClass()).ifPresent(tc -> userFilterResource.setObjectType(tc.getClassObject().getSimpleName()));
-		ofNullable(filter.getFilterCondition()).ifPresent(fcs -> userFilterResource.setConditions(fcs.stream()
-				.map(UserFilterConverter.TO_FILTER_CONDITION)
-				.collect(toSet())));
-		ofNullable(filter.getFilterSorts()).ifPresent(fs -> userFilterResource.setOrders(fs.stream()
-				.map(UserFilterConverter.TO_FILTER_ORDER)
-				.collect(toList())));
+  private static UserFilterResource buildFilterResource(UserFilter filter) {
+    UserFilterResource userFilterResource = new UserFilterResource();
+    userFilterResource.setFilterId(filter.getId());
+    userFilterResource.setName(filter.getName());
+    userFilterResource.setDescription(filter.getDescription());
+    userFilterResource.setOwner(filter.getOwner());
+    ofNullable(filter.getTargetClass()).ifPresent(
+        tc -> userFilterResource.setObjectType(tc.getClassObject().getSimpleName()));
+    ofNullable(filter.getFilterCondition()).ifPresent(fcs -> userFilterResource.setConditions(
+        fcs.stream().map(UserFilterConverter.TO_FILTER_CONDITION).collect(toSet())));
+    ofNullable(filter.getFilterSorts()).ifPresent(fs -> userFilterResource.setOrders(
+        fs.stream().map(UserFilterConverter.TO_FILTER_ORDER).collect(toList())));
 
-		return userFilterResource;
-	}
+    return userFilterResource;
+  }
 }
diff --git a/src/main/java/com/epam/ta/reportportal/ws/converter/converters/WidgetConverter.java b/src/main/java/com/epam/ta/reportportal/ws/converter/converters/WidgetConverter.java
index 87b95395e9..e96b9edab6 100644
--- a/src/main/java/com/epam/ta/reportportal/ws/converter/converters/WidgetConverter.java
+++ b/src/main/java/com/epam/ta/reportportal/ws/converter/converters/WidgetConverter.java
@@ -20,12 +20,12 @@
 import com.epam.ta.reportportal.entity.dashboard.DashboardWidget;
 import com.epam.ta.reportportal.entity.dashboard.DashboardWidgetId;
 import com.epam.ta.reportportal.entity.widget.Widget;
-import com.epam.ta.reportportal.ws.model.Position;
-import com.epam.ta.reportportal.ws.model.Size;
-import com.epam.ta.reportportal.ws.model.activity.WidgetActivityResource;
-import com.epam.ta.reportportal.ws.model.dashboard.DashboardResource;
-import com.epam.ta.reportportal.ws.model.widget.ContentParameters;
-import com.epam.ta.reportportal.ws.model.widget.WidgetResource;
+import com.epam.ta.reportportal.model.Position;
+import com.epam.ta.reportportal.model.Size;
+import com.epam.ta.reportportal.model.activity.WidgetActivityResource;
+import com.epam.ta.reportportal.model.dashboard.DashboardResource;
+import com.epam.ta.reportportal.model.widget.ContentParameters;
+import com.epam.ta.reportportal.model.widget.WidgetResource;
 import com.google.common.collect.Lists;
 import com.google.common.collect.Sets;
 
diff --git a/src/main/java/com/epam/ta/reportportal/ws/converter/utils/item/provider/PathNameUpdaterProvider.java b/src/main/java/com/epam/ta/reportportal/ws/converter/utils/item/provider/PathNameUpdaterProvider.java
index ed707962aa..ebe96a0bdc 100644
--- a/src/main/java/com/epam/ta/reportportal/ws/converter/utils/item/provider/PathNameUpdaterProvider.java
+++ b/src/main/java/com/epam/ta/reportportal/ws/converter/utils/item/provider/PathNameUpdaterProvider.java
@@ -18,11 +18,11 @@
 
 import com.epam.ta.reportportal.dao.TestItemRepository;
 import com.epam.ta.reportportal.entity.item.PathName;
+import com.epam.ta.reportportal.model.TestItemResource;
 import com.epam.ta.reportportal.ws.converter.utils.ResourceUpdater;
 import com.epam.ta.reportportal.ws.converter.utils.ResourceUpdaterProvider;
 import com.epam.ta.reportportal.ws.converter.utils.item.content.TestItemUpdaterContent;
 import com.epam.ta.reportportal.ws.converter.utils.item.updater.PathNameUpdater;
-import com.epam.ta.reportportal.ws.model.TestItemResource;
 import java.util.Map;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -31,8 +31,8 @@
  * @author <a href="mailto:ivan_budayeu@epam.com">Ivan Budayeu</a>
  */
 @Service
-public class PathNameUpdaterProvider implements
-    ResourceUpdaterProvider<TestItemUpdaterContent, TestItemResource> {
+public class PathNameUpdaterProvider
+    implements ResourceUpdaterProvider<TestItemUpdaterContent, TestItemResource> {
 
   private final TestItemRepository testItemRepository;
 
@@ -43,8 +43,8 @@ public PathNameUpdaterProvider(TestItemRepository testItemRepository) {
 
   @Override
   public ResourceUpdater<TestItemResource> retrieve(TestItemUpdaterContent updaterContent) {
-    Map<Long, PathName> pathNamesMapping = testItemRepository.selectPathNames(
-        updaterContent.getTestItems());
+    Map<Long, PathName> pathNamesMapping =
+        testItemRepository.selectPathNames(updaterContent.getTestItems());
 
     return PathNameUpdater.of(pathNamesMapping);
   }
diff --git a/src/main/java/com/epam/ta/reportportal/ws/converter/utils/item/provider/RetriesUpdaterProvider.java b/src/main/java/com/epam/ta/reportportal/ws/converter/utils/item/provider/RetriesUpdaterProvider.java
index 46b8d3e11e..8de0075225 100644
--- a/src/main/java/com/epam/ta/reportportal/ws/converter/utils/item/provider/RetriesUpdaterProvider.java
+++ b/src/main/java/com/epam/ta/reportportal/ws/converter/utils/item/provider/RetriesUpdaterProvider.java
@@ -20,11 +20,11 @@
 
 import com.epam.ta.reportportal.dao.TestItemRepository;
 import com.epam.ta.reportportal.entity.item.TestItem;
+import com.epam.ta.reportportal.model.TestItemResource;
 import com.epam.ta.reportportal.ws.converter.utils.ResourceUpdater;
 import com.epam.ta.reportportal.ws.converter.utils.ResourceUpdaterProvider;
 import com.epam.ta.reportportal.ws.converter.utils.item.content.TestItemUpdaterContent;
 import com.epam.ta.reportportal.ws.converter.utils.item.updater.RetriesUpdater;
-import com.epam.ta.reportportal.ws.model.TestItemResource;
 import java.util.List;
 import java.util.Map;
 import java.util.stream.Collectors;
@@ -35,8 +35,8 @@
  * @author <a href="mailto:ivan_budayeu@epam.com">Ivan Budayeu</a>
  */
 @Service
-public class RetriesUpdaterProvider implements
-    ResourceUpdaterProvider<TestItemUpdaterContent, TestItemResource> {
+public class RetriesUpdaterProvider
+    implements ResourceUpdaterProvider<TestItemUpdaterContent, TestItemResource> {
 
   private final TestItemRepository testItemRepository;
 
@@ -48,11 +48,9 @@ public RetriesUpdaterProvider(TestItemRepository testItemRepository) {
   @Override
   public ResourceUpdater<TestItemResource> retrieve(TestItemUpdaterContent updaterContent) {
     Map<Long, List<TestItem>> retriesMapping = testItemRepository.selectRetries(
-        updaterContent.getTestItems()
-            .stream()
-            .filter(TestItem::isHasRetries)
-            .map(TestItem::getItemId)
-            .collect(Collectors.toList())).stream().collect(groupingBy(TestItem::getRetryOf));
+            updaterContent.getTestItems().stream().filter(TestItem::isHasRetries)
+                .map(TestItem::getItemId).collect(Collectors.toList())).stream()
+        .collect(groupingBy(TestItem::getRetryOf));
     return RetriesUpdater.of(retriesMapping);
   }
 }
diff --git a/src/main/java/com/epam/ta/reportportal/ws/converter/utils/item/updater/PathNameUpdater.java b/src/main/java/com/epam/ta/reportportal/ws/converter/utils/item/updater/PathNameUpdater.java
index 5521cbb97c..d526f25dfa 100644
--- a/src/main/java/com/epam/ta/reportportal/ws/converter/utils/item/updater/PathNameUpdater.java
+++ b/src/main/java/com/epam/ta/reportportal/ws/converter/utils/item/updater/PathNameUpdater.java
@@ -19,9 +19,9 @@
 import static java.util.Optional.ofNullable;
 
 import com.epam.ta.reportportal.entity.item.PathName;
+import com.epam.ta.reportportal.model.TestItemResource;
 import com.epam.ta.reportportal.ws.converter.converters.TestItemConverter;
 import com.epam.ta.reportportal.ws.converter.utils.ResourceUpdater;
-import com.epam.ta.reportportal.ws.model.TestItemResource;
 import java.util.Map;
 
 /**
@@ -38,8 +38,7 @@ private PathNameUpdater(Map<Long, PathName> pathNamesMapping) {
   @Override
   public void updateResource(TestItemResource resource) {
     ofNullable(pathNamesMapping.get(resource.getItemId())).ifPresent(
-        pathName -> resource.setPathNames(TestItemConverter.PATH_NAME_TO_RESOURCE
-            .apply(pathName)));
+        pathName -> resource.setPathNames(TestItemConverter.PATH_NAME_TO_RESOURCE.apply(pathName)));
   }
 
   public static PathNameUpdater of(Map<Long, PathName> pathNameMapping) {
diff --git a/src/main/java/com/epam/ta/reportportal/ws/converter/utils/item/updater/RetriesUpdater.java b/src/main/java/com/epam/ta/reportportal/ws/converter/utils/item/updater/RetriesUpdater.java
index 5b2d2bc442..c7f201b8d0 100644
--- a/src/main/java/com/epam/ta/reportportal/ws/converter/utils/item/updater/RetriesUpdater.java
+++ b/src/main/java/com/epam/ta/reportportal/ws/converter/utils/item/updater/RetriesUpdater.java
@@ -19,9 +19,9 @@
 import static java.util.Optional.ofNullable;
 
 import com.epam.ta.reportportal.entity.item.TestItem;
+import com.epam.ta.reportportal.model.TestItemResource;
 import com.epam.ta.reportportal.ws.converter.converters.TestItemConverter;
 import com.epam.ta.reportportal.ws.converter.utils.ResourceUpdater;
-import com.epam.ta.reportportal.ws.model.TestItemResource;
 import java.util.List;
 import java.util.Map;
 import java.util.stream.Collectors;
@@ -39,10 +39,8 @@ private RetriesUpdater(Map<Long, List<TestItem>> retriesMapping) {
 
   @Override
   public void updateResource(TestItemResource resource) {
-    ofNullable(retriesMapping.get(resource.getItemId())).ifPresent(
-        retries -> resource.setRetries(retries.stream()
-            .map(TestItemConverter.TO_RESOURCE)
-            .collect(Collectors.toList())));
+    ofNullable(retriesMapping.get(resource.getItemId())).ifPresent(retries -> resource.setRetries(
+        retries.stream().map(TestItemConverter.TO_RESOURCE).collect(Collectors.toList())));
   }
 
   public static RetriesUpdater of(Map<Long, List<TestItem>> retriesMapping) {
diff --git a/src/main/java/com/epam/ta/reportportal/ws/rabbit/EmailNotificationConsumer.java b/src/main/java/com/epam/ta/reportportal/ws/rabbit/EmailNotificationConsumer.java
index abb21b6c85..8281ecc548 100644
--- a/src/main/java/com/epam/ta/reportportal/ws/rabbit/EmailNotificationConsumer.java
+++ b/src/main/java/com/epam/ta/reportportal/ws/rabbit/EmailNotificationConsumer.java
@@ -16,9 +16,9 @@
 
 package com.epam.ta.reportportal.ws.rabbit;
 
+import com.epam.ta.reportportal.model.notification.EmailNotificationRQ;
 import com.epam.ta.reportportal.util.email.strategy.EmailNotificationStrategy;
 import com.epam.ta.reportportal.util.email.strategy.EmailTemplate;
-import com.epam.ta.reportportal.ws.model.notification.EmailNotificationRQ;
 import java.util.Map;
 import org.springframework.amqp.rabbit.annotation.RabbitListener;
 import org.springframework.beans.factory.annotation.Autowired;
diff --git a/src/test/java/com/epam/ta/reportportal/core/activityevent/impl/ActivityEventHandlerTest.java b/src/test/java/com/epam/ta/reportportal/core/activityevent/impl/ActivityEventHandlerTest.java
index 3817f4c265..0f232f313b 100644
--- a/src/test/java/com/epam/ta/reportportal/core/activityevent/impl/ActivityEventHandlerTest.java
+++ b/src/test/java/com/epam/ta/reportportal/core/activityevent/impl/ActivityEventHandlerTest.java
@@ -28,8 +28,8 @@
 import com.epam.ta.reportportal.entity.activity.EventObject;
 import com.epam.ta.reportportal.entity.activity.EventPriority;
 import com.epam.ta.reportportal.entity.activity.EventSubject;
-import com.epam.ta.reportportal.ws.model.ActivityEventResource;
-import com.epam.ta.reportportal.ws.model.PagedResponse;
+import com.epam.ta.reportportal.model.ActivityEventResource;
+import com.epam.ta.reportportal.model.PagedResponse;
 import java.time.LocalDateTime;
 import java.util.List;
 import org.junit.jupiter.api.Test;
@@ -47,7 +47,6 @@
 @ExtendWith(MockitoExtension.class)
 class ActivityEventHandlerTest {
 
-
   @Mock
   private ActivityRepository activityRepository;
 
diff --git a/src/test/java/com/epam/ta/reportportal/core/analyzer/auto/impl/AnalyzerServiceServiceTest.java b/src/test/java/com/epam/ta/reportportal/core/analyzer/auto/impl/AnalyzerServiceServiceTest.java
index ac87b36b49..945064603f 100644
--- a/src/test/java/com/epam/ta/reportportal/core/analyzer/auto/impl/AnalyzerServiceServiceTest.java
+++ b/src/test/java/com/epam/ta/reportportal/core/analyzer/auto/impl/AnalyzerServiceServiceTest.java
@@ -42,7 +42,7 @@
 import com.epam.ta.reportportal.entity.item.issue.IssueType;
 import com.epam.ta.reportportal.entity.launch.Launch;
 import com.epam.ta.reportportal.entity.project.Project;
-import com.epam.ta.reportportal.ws.model.analyzer.AnalyzedItemRs;
+import com.epam.ta.reportportal.model.analyzer.AnalyzedItemRs;
 import com.epam.ta.reportportal.ws.model.analyzer.IndexLaunch;
 import com.epam.ta.reportportal.ws.model.analyzer.IndexLog;
 import com.epam.ta.reportportal.ws.model.analyzer.IndexTestItem;
@@ -76,14 +76,10 @@ class AnalyzerServiceServiceTest {
 
   private AnalyzerStatusCache analyzerStatusCache = mock(AnalyzerStatusCache.class);
 
-  private AnalyzerServiceImpl issuesAnalyzer = new AnalyzerServiceImpl(100, analyzerStatusCache,
-      launchPreparerService,
-      analyzerServiceClient,
-      issueTypeHandler,
-      testItemRepository,
-      messageBus,
-      launchRepository
-  );
+  private AnalyzerServiceImpl issuesAnalyzer =
+      new AnalyzerServiceImpl(100, analyzerStatusCache, launchPreparerService,
+          analyzerServiceClient, issueTypeHandler, testItemRepository, messageBus, launchRepository
+      );
 
   @Test
   void hasAnalyzers() {
@@ -106,14 +102,16 @@ void analyze() {
     indexLaunch.setLaunchId(launch.getId());
     indexLaunch.setAnalyzerConfig(analyzerConfig);
 
-    final List<IndexTestItem> indexTestItems = items.stream().map(AnalyzerUtils::fromTestItem)
-        .peek(item -> item.setLogs(errorLogs(2))).collect(Collectors.toList());
+    final List<IndexTestItem> indexTestItems =
+        items.stream().map(AnalyzerUtils::fromTestItem).peek(item -> item.setLogs(errorLogs(2)))
+            .collect(Collectors.toList());
     indexLaunch.setTestItems(indexTestItems);
 
     when(testItemRepository.findAllById(anyList())).thenReturn(items);
 
     when(launchPreparerService.prepare(any(Launch.class), anyList(),
-        any(AnalyzerConfig.class))).thenReturn(Optional.of(indexLaunch));
+        any(AnalyzerConfig.class)
+    )).thenReturn(Optional.of(indexLaunch));
 
     when(analyzerServiceClient.analyze(any())).thenReturn(analyzedItems(itemsCount));
 
@@ -121,7 +119,8 @@ void analyze() {
         issueProductBug().getIssueType());
 
     issuesAnalyzer.runAnalyzers(launch,
-        items.stream().map(TestItem::getItemId).collect(Collectors.toList()), analyzerConfig);
+        items.stream().map(TestItem::getItemId).collect(Collectors.toList()), analyzerConfig
+    );
 
     verify(analyzerServiceClient, times(1)).analyze(any());
     verify(testItemRepository, times(itemsCount)).save(any());
diff --git a/src/test/java/com/epam/ta/reportportal/core/analyzer/auto/impl/AnalyzerUtilsTest.java b/src/test/java/com/epam/ta/reportportal/core/analyzer/auto/impl/AnalyzerUtilsTest.java
index 79b91877e8..3d5353068a 100644
--- a/src/test/java/com/epam/ta/reportportal/core/analyzer/auto/impl/AnalyzerUtilsTest.java
+++ b/src/test/java/com/epam/ta/reportportal/core/analyzer/auto/impl/AnalyzerUtilsTest.java
@@ -31,11 +31,11 @@
 import com.epam.ta.reportportal.entity.log.LogFull;
 import com.epam.ta.reportportal.entity.project.Project;
 import com.epam.ta.reportportal.entity.project.ProjectUtils;
+import com.epam.ta.reportportal.model.analyzer.RelevantItemInfo;
+import com.epam.ta.reportportal.model.project.UniqueErrorConfig;
 import com.epam.ta.reportportal.ws.model.analyzer.IndexLog;
 import com.epam.ta.reportportal.ws.model.analyzer.IndexTestItem;
-import com.epam.ta.reportportal.ws.model.analyzer.RelevantItemInfo;
 import com.epam.ta.reportportal.ws.model.project.AnalyzerConfig;
-import com.epam.ta.reportportal.ws.model.project.UniqueErrorConfig;
 import java.time.LocalDateTime;
 import java.time.ZoneOffset;
 import java.util.Arrays;
@@ -61,7 +61,8 @@ void testConverting() {
     assertEquals(testItem.getUniqueId(), indexTestItem.getUniqueId());
     assertEquals(testItem.getStartTime(), indexTestItem.getStartTime());
     assertEquals(testItem.getItemResults().getIssue().getIssueType().getLocator(),
-        indexTestItem.getIssueTypeLocator());
+        indexTestItem.getIssueTypeLocator()
+    );
     assertEquals(1, indexTestItem.getLogs().size());
     assertFalse(indexTestItem.isAutoAnalyzed());
   }
@@ -79,30 +80,39 @@ void testConvertingAnalyzed() {
   void testAnalyzerConfig() {
     AnalyzerConfig config = AnalyzerUtils.getAnalyzerConfig(project());
     assertEquals(String.valueOf(config.getIsAutoAnalyzerEnabled()),
-        ProjectAttributeEnum.AUTO_ANALYZER_ENABLED.getDefaultValue());
+        ProjectAttributeEnum.AUTO_ANALYZER_ENABLED.getDefaultValue()
+    );
     assertEquals(String.valueOf(config.getNumberOfLogLines()),
-        ProjectAttributeEnum.NUMBER_OF_LOG_LINES.getDefaultValue());
+        ProjectAttributeEnum.NUMBER_OF_LOG_LINES.getDefaultValue()
+    );
     assertEquals(config.getAnalyzerMode(),
-        ProjectAttributeEnum.AUTO_ANALYZER_MODE.getDefaultValue());
+        ProjectAttributeEnum.AUTO_ANALYZER_MODE.getDefaultValue()
+    );
     assertEquals(String.valueOf(config.getMinShouldMatch()),
-        ProjectAttributeEnum.MIN_SHOULD_MATCH.getDefaultValue());
+        ProjectAttributeEnum.MIN_SHOULD_MATCH.getDefaultValue()
+    );
     assertEquals(String.valueOf(config.getSearchLogsMinShouldMatch()),
-        ProjectAttributeEnum.SEARCH_LOGS_MIN_SHOULD_MATCH.getDefaultValue());
+        ProjectAttributeEnum.SEARCH_LOGS_MIN_SHOULD_MATCH.getDefaultValue()
+    );
     assertEquals(String.valueOf(config.isIndexingRunning()),
-        ProjectAttributeEnum.INDEXING_RUNNING.getDefaultValue());
+        ProjectAttributeEnum.INDEXING_RUNNING.getDefaultValue()
+    );
     assertEquals(String.valueOf(config.isAllMessagesShouldMatch()),
-        ProjectAttributeEnum.ALL_MESSAGES_SHOULD_MATCH.getDefaultValue());
+        ProjectAttributeEnum.ALL_MESSAGES_SHOULD_MATCH.getDefaultValue()
+    );
   }
 
   @Test
   void testUniqueErrorConfig() {
-    final Map<String, String> configParameters = ProjectUtils.getConfigParameters(
-        project().getProjectAttributes());
+    final Map<String, String> configParameters =
+        ProjectUtils.getConfigParameters(project().getProjectAttributes());
     final UniqueErrorConfig config = AnalyzerUtils.getUniqueErrorConfig(configParameters);
     assertEquals(ProjectAttributeEnum.AUTO_UNIQUE_ERROR_ANALYZER_ENABLED.getDefaultValue(),
-        String.valueOf(config.isEnabled()));
+        String.valueOf(config.isEnabled())
+    );
     assertEquals(ProjectAttributeEnum.UNIQUE_ERROR_ANALYZER_REMOVE_NUMBERS.getDefaultValue(),
-        String.valueOf(config.isRemoveNumbers()));
+        String.valueOf(config.isRemoveNumbers())
+    );
   }
 
   @Test
@@ -171,7 +181,8 @@ public static Project project() {
           Attribute attribute = new Attribute();
           attribute.setName(it.getAttribute());
           return attribute;
-        }).collect(Collectors.toSet())));
+        }).collect(Collectors.toSet())
+    ));
     return project;
   }
 
diff --git a/src/test/java/com/epam/ta/reportportal/core/analyzer/auto/impl/LogIndexerServiceTest.java b/src/test/java/com/epam/ta/reportportal/core/analyzer/auto/impl/LogIndexerServiceTest.java
index 13439ad2e1..0e2df48050 100644
--- a/src/test/java/com/epam/ta/reportportal/core/analyzer/auto/impl/LogIndexerServiceTest.java
+++ b/src/test/java/com/epam/ta/reportportal/core/analyzer/auto/impl/LogIndexerServiceTest.java
@@ -42,10 +42,10 @@
 import com.epam.ta.reportportal.entity.item.issue.IssueType;
 import com.epam.ta.reportportal.entity.launch.Launch;
 import com.epam.ta.reportportal.entity.log.Log;
+import com.epam.ta.reportportal.model.analyzer.IndexRs;
+import com.epam.ta.reportportal.model.analyzer.IndexRsIndex;
+import com.epam.ta.reportportal.model.analyzer.IndexRsItem;
 import com.epam.ta.reportportal.ws.model.analyzer.IndexLaunch;
-import com.epam.ta.reportportal.ws.model.analyzer.IndexRs;
-import com.epam.ta.reportportal.ws.model.analyzer.IndexRsIndex;
-import com.epam.ta.reportportal.ws.model.analyzer.IndexRsItem;
 import com.epam.ta.reportportal.ws.model.project.AnalyzerConfig;
 import java.util.ArrayList;
 import java.util.Collections;
@@ -80,14 +80,10 @@ class LogIndexerServiceTest {
 
   private LaunchPreparerService launchPreparerService = mock(LaunchPreparerService.class);
 
-  private LogIndexerService logIndexerService = new LogIndexerService(batchLogIndexer,
-      taskExecutor,
-      launchRepository,
-      testItemRepository,
-      indexerServiceClient,
-      launchPreparerService,
-      indexerStatusCache
-  );
+  private LogIndexerService logIndexerService =
+      new LogIndexerService(batchLogIndexer, taskExecutor, launchRepository, testItemRepository,
+          indexerServiceClient, launchPreparerService, indexerStatusCache
+      );
 
   @Test
   void testIndexWithZeroCount() {
@@ -104,9 +100,7 @@ void testIndexWithZeroCount() {
   void testIndexDefectsUpdate() {
     final Map<Long, String> toUpdate = Maps.newHashMap(1L, "pb001");
     when(indexerServiceClient.indexDefectsUpdate(1L, toUpdate)).thenReturn(Collections.emptyList());
-    logIndexerService.indexDefectsUpdate(
-        1L,
-        new AnalyzerConfig(),
+    logIndexerService.indexDefectsUpdate(1L, new AnalyzerConfig(),
         Lists.newArrayList(createTestItem(1L, TestItemIssueGroup.PRODUCT_BUG))
     );
     verify(indexerServiceClient, times(1)).indexDefectsUpdate(1L, toUpdate);
diff --git a/src/test/java/com/epam/ta/reportportal/core/analyzer/auto/impl/SearchLogServiceImplTest.java b/src/test/java/com/epam/ta/reportportal/core/analyzer/auto/impl/SearchLogServiceImplTest.java
index 6472fb5151..a5499d564f 100644
--- a/src/test/java/com/epam/ta/reportportal/core/analyzer/auto/impl/SearchLogServiceImplTest.java
+++ b/src/test/java/com/epam/ta/reportportal/core/analyzer/auto/impl/SearchLogServiceImplTest.java
@@ -42,10 +42,10 @@
 import com.epam.ta.reportportal.entity.log.LogFull;
 import com.epam.ta.reportportal.entity.project.Project;
 import com.epam.ta.reportportal.entity.project.ProjectRole;
-import com.epam.ta.reportportal.ws.model.analyzer.SearchRq;
-import com.epam.ta.reportportal.ws.model.analyzer.SearchRs;
-import com.epam.ta.reportportal.ws.model.log.SearchLogRq;
-import com.epam.ta.reportportal.ws.model.log.SearchLogRs;
+import com.epam.ta.reportportal.model.analyzer.SearchRq;
+import com.epam.ta.reportportal.model.analyzer.SearchRs;
+import com.epam.ta.reportportal.model.log.SearchLogRq;
+import com.epam.ta.reportportal.model.log.SearchLogRs;
 import com.google.common.collect.Lists;
 import java.util.Collections;
 import java.util.Optional;
@@ -80,18 +80,16 @@ class SearchLogServiceImplTest {
 
   private CurrentLaunchCollector currentLaunchCollector = mock(CurrentLaunchCollector.class);
 
-  private final SearchLogServiceImpl searchLogService = new SearchLogServiceImpl(projectRepository,
-      launchRepository,
-      testItemRepository,
-      logService, analyzerServiceClient,
-      searchCollectorFactory
-  );
+  private final SearchLogServiceImpl searchLogService =
+      new SearchLogServiceImpl(projectRepository, launchRepository, testItemRepository, logService,
+          analyzerServiceClient, searchCollectorFactory
+      );
 
   @Test
   void searchTest() {
 
-    ReportPortalUser.ProjectDetails projectDetails = new ReportPortalUser.ProjectDetails(1L,
-        "project", ProjectRole.PROJECT_MANAGER);
+    ReportPortalUser.ProjectDetails projectDetails =
+        new ReportPortalUser.ProjectDetails(1L, "project", ProjectRole.PROJECT_MANAGER);
 
     when(projectRepository.findById(projectDetails.getProjectId())).thenReturn(
         Optional.of(project));
@@ -122,9 +120,7 @@ void searchTest() {
     when(userFilter.getFilterCondition()).thenReturn(Collections.emptySet());
 
     when(logService.findMessagesByLaunchIdAndItemIdAndPathAndLevelGte(launch.getId(),
-        testItem.getItemId(),
-        testItem.getPath(),
-        LogLevel.ERROR_INT
+        testItem.getItemId(), testItem.getPath(), LogLevel.ERROR_INT
     )).thenReturn(Lists.newArrayList("message"));
     SearchRs searchRs = new SearchRs();
     searchRs.setLogId(1L);
diff --git a/src/test/java/com/epam/ta/reportportal/core/analyzer/strategy/LaunchAutoAnalysisStrategyTest.java b/src/test/java/com/epam/ta/reportportal/core/analyzer/strategy/LaunchAutoAnalysisStrategyTest.java
index 1e7c6134e5..cd41b945f3 100644
--- a/src/test/java/com/epam/ta/reportportal/core/analyzer/strategy/LaunchAutoAnalysisStrategyTest.java
+++ b/src/test/java/com/epam/ta/reportportal/core/analyzer/strategy/LaunchAutoAnalysisStrategyTest.java
@@ -33,7 +33,7 @@
 import com.epam.ta.reportportal.entity.project.Project;
 import com.epam.ta.reportportal.entity.project.ProjectRole;
 import com.epam.ta.reportportal.entity.user.UserRole;
-import com.epam.ta.reportportal.ws.model.launch.AnalyzeLaunchRQ;
+import com.epam.ta.reportportal.model.launch.AnalyzeLaunchRQ;
 import com.google.common.collect.Lists;
 import com.google.common.collect.Sets;
 import java.util.Optional;
@@ -52,13 +52,10 @@ class LaunchAutoAnalysisStrategyTest {
 
   private final ProjectRepository projectRepository = mock(ProjectRepository.class);
   private final LaunchRepository launchRepository = mock(LaunchRepository.class);
-  private final LaunchAutoAnalysisStarter autoAnalysisStarter = mock(
-      LaunchAutoAnalysisStarter.class);
-  private final LaunchAutoAnalysisStrategy launchAutoAnalysisStrategy = new LaunchAutoAnalysisStrategy(
-      projectRepository,
-      launchRepository,
-      autoAnalysisStarter
-  );
+  private final LaunchAutoAnalysisStarter autoAnalysisStarter =
+      mock(LaunchAutoAnalysisStarter.class);
+  private final LaunchAutoAnalysisStrategy launchAutoAnalysisStrategy =
+      new LaunchAutoAnalysisStrategy(projectRepository, launchRepository, autoAnalysisStarter);
 
   @Test
   void analyzeTest() {
@@ -73,8 +70,8 @@ void analyzeTest() {
     when(project.getProjectAttributes()).thenReturn(Sets.newHashSet());
     ReportPortalUser user = getRpUser("user", UserRole.USER, ProjectRole.PROJECT_MANAGER, 1L);
 
-    ReportPortalUser.ProjectDetails projectDetails = new ReportPortalUser.ProjectDetails(1L, "name",
-        ProjectRole.PROJECT_MANAGER);
+    ReportPortalUser.ProjectDetails projectDetails =
+        new ReportPortalUser.ProjectDetails(1L, "name", ProjectRole.PROJECT_MANAGER);
     AnalyzeLaunchRQ analyzeLaunchRQ = new AnalyzeLaunchRQ();
     analyzeLaunchRQ.setLaunchId(1L);
     analyzeLaunchRQ.setAnalyzerHistoryMode("ALL");
@@ -82,8 +79,8 @@ void analyzeTest() {
     analyzeLaunchRQ.setAnalyzerTypeName("patternAnalyzer");
     launchAutoAnalysisStrategy.analyze(analyzeLaunchRQ, projectDetails, user);
 
-    final ArgumentCaptor<StartLaunchAutoAnalysisConfig> configArgumentCaptor = ArgumentCaptor.forClass(
-        StartLaunchAutoAnalysisConfig.class);
+    final ArgumentCaptor<StartLaunchAutoAnalysisConfig> configArgumentCaptor =
+        ArgumentCaptor.forClass(StartLaunchAutoAnalysisConfig.class);
     verify(autoAnalysisStarter, times(1)).start(configArgumentCaptor.capture());
 
     final StartLaunchAutoAnalysisConfig config = configArgumentCaptor.getValue();
diff --git a/src/test/java/com/epam/ta/reportportal/core/analyzer/strategy/LaunchPatternAnalysisStrategyTest.java b/src/test/java/com/epam/ta/reportportal/core/analyzer/strategy/LaunchPatternAnalysisStrategyTest.java
index 7f9b432aae..632cb83968 100644
--- a/src/test/java/com/epam/ta/reportportal/core/analyzer/strategy/LaunchPatternAnalysisStrategyTest.java
+++ b/src/test/java/com/epam/ta/reportportal/core/analyzer/strategy/LaunchPatternAnalysisStrategyTest.java
@@ -34,7 +34,7 @@
 import com.epam.ta.reportportal.entity.project.ProjectAttribute;
 import com.epam.ta.reportportal.entity.project.ProjectRole;
 import com.epam.ta.reportportal.entity.user.UserRole;
-import com.epam.ta.reportportal.ws.model.launch.AnalyzeLaunchRQ;
+import com.epam.ta.reportportal.model.launch.AnalyzeLaunchRQ;
 import com.google.common.collect.Lists;
 import com.google.common.collect.Sets;
 import java.util.Optional;
@@ -52,11 +52,8 @@ class LaunchPatternAnalysisStrategyTest {
   private final LaunchRepository launchRepository = mock(LaunchRepository.class);
   private final LaunchPatternAnalyzer launchPatternAnalyzer = mock(LaunchPatternAnalyzer.class);
 
-  private final LaunchPatternAnalysisStrategy launchPatternAnalysisStrategy = new LaunchPatternAnalysisStrategy(
-      projectRepository,
-      launchRepository,
-      launchPatternAnalyzer
-  );
+  private final LaunchPatternAnalysisStrategy launchPatternAnalysisStrategy =
+      new LaunchPatternAnalysisStrategy(projectRepository, launchRepository, launchPatternAnalyzer);
 
   @Test
   void analyzeTest() {
@@ -74,8 +71,8 @@ void analyzeTest() {
     when(project.getProjectAttributes()).thenReturn(Sets.newHashSet(projectAttribute));
 
     ReportPortalUser user = getRpUser("user", UserRole.USER, ProjectRole.PROJECT_MANAGER, 1L);
-    ReportPortalUser.ProjectDetails projectDetails = new ReportPortalUser.ProjectDetails(1L, "name",
-        ProjectRole.PROJECT_MANAGER);
+    ReportPortalUser.ProjectDetails projectDetails =
+        new ReportPortalUser.ProjectDetails(1L, "name", ProjectRole.PROJECT_MANAGER);
     AnalyzeLaunchRQ analyzeLaunchRQ = new AnalyzeLaunchRQ();
     analyzeLaunchRQ.setLaunchId(1L);
     analyzeLaunchRQ.setAnalyzeItemsModes(Lists.newArrayList("TO_INVESTIGATE"));
@@ -83,7 +80,8 @@ void analyzeTest() {
     launchPatternAnalysisStrategy.analyze(analyzeLaunchRQ, projectDetails, user);
 
     verify(launchPatternAnalyzer, times(1)).analyzeLaunch(launch,
-        Sets.newHashSet(AnalyzeItemsMode.TO_INVESTIGATE));
+        Sets.newHashSet(AnalyzeItemsMode.TO_INVESTIGATE)
+    );
 
   }
 }
\ No newline at end of file
diff --git a/src/test/java/com/epam/ta/reportportal/core/dashboard/impl/CreateDashboardHandlerImplTest.java b/src/test/java/com/epam/ta/reportportal/core/dashboard/impl/CreateDashboardHandlerImplTest.java
index 398175001f..f15009ac20 100644
--- a/src/test/java/com/epam/ta/reportportal/core/dashboard/impl/CreateDashboardHandlerImplTest.java
+++ b/src/test/java/com/epam/ta/reportportal/core/dashboard/impl/CreateDashboardHandlerImplTest.java
@@ -27,7 +27,7 @@
 import com.epam.ta.reportportal.entity.project.ProjectRole;
 import com.epam.ta.reportportal.entity.user.UserRole;
 import com.epam.ta.reportportal.exception.ReportPortalException;
-import com.epam.ta.reportportal.ws.model.dashboard.CreateDashboardRQ;
+import com.epam.ta.reportportal.model.dashboard.CreateDashboardRQ;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
 import org.mockito.InjectMocks;
@@ -55,12 +55,13 @@ void createAlreadyExistDashboard() {
 
     when(dashboardRepository.existsByNameAndOwnerAndProjectId("exist", "owner", 1L)).thenReturn(
         true);
-    final ReportPortalException exception = assertThrows(
-        ReportPortalException.class,
+    final ReportPortalException exception = assertThrows(ReportPortalException.class,
         () -> handler.createDashboard(extractProjectDetails(rpUser, "test_project"),
-            createDashboardRQ, rpUser)
+            createDashboardRQ, rpUser
+        )
     );
     assertEquals("Resource 'exist' already exists. You couldn't create the duplicate.",
-        exception.getMessage());
+        exception.getMessage()
+    );
   }
 }
\ No newline at end of file
diff --git a/src/test/java/com/epam/ta/reportportal/core/events/activity/DashboardEventsTest.java b/src/test/java/com/epam/ta/reportportal/core/events/activity/DashboardEventsTest.java
index 52283792b2..6aa148add8 100644
--- a/src/test/java/com/epam/ta/reportportal/core/events/activity/DashboardEventsTest.java
+++ b/src/test/java/com/epam/ta/reportportal/core/events/activity/DashboardEventsTest.java
@@ -27,7 +27,7 @@
 import com.epam.ta.reportportal.entity.activity.EventPriority;
 import com.epam.ta.reportportal.entity.activity.EventSubject;
 import com.epam.ta.reportportal.entity.activity.HistoryField;
-import com.epam.ta.reportportal.ws.model.activity.DashboardActivityResource;
+import com.epam.ta.reportportal.model.activity.DashboardActivityResource;
 import com.google.common.collect.Lists;
 import java.time.LocalDateTime;
 import java.util.List;
diff --git a/src/test/java/com/epam/ta/reportportal/core/events/activity/DefectTypeEventsTest.java b/src/test/java/com/epam/ta/reportportal/core/events/activity/DefectTypeEventsTest.java
index 5cd9fb18b5..c1d540e64c 100644
--- a/src/test/java/com/epam/ta/reportportal/core/events/activity/DefectTypeEventsTest.java
+++ b/src/test/java/com/epam/ta/reportportal/core/events/activity/DefectTypeEventsTest.java
@@ -24,7 +24,7 @@
 import com.epam.ta.reportportal.entity.activity.EventObject;
 import com.epam.ta.reportportal.entity.activity.EventPriority;
 import com.epam.ta.reportportal.entity.activity.EventSubject;
-import com.epam.ta.reportportal.ws.model.activity.IssueTypeActivityResource;
+import com.epam.ta.reportportal.model.activity.IssueTypeActivityResource;
 import java.time.LocalDateTime;
 import org.junit.jupiter.api.Test;
 
diff --git a/src/test/java/com/epam/ta/reportportal/core/events/activity/FilterEventsTest.java b/src/test/java/com/epam/ta/reportportal/core/events/activity/FilterEventsTest.java
index 493741d3e1..65f47e4de4 100644
--- a/src/test/java/com/epam/ta/reportportal/core/events/activity/FilterEventsTest.java
+++ b/src/test/java/com/epam/ta/reportportal/core/events/activity/FilterEventsTest.java
@@ -27,7 +27,7 @@
 import com.epam.ta.reportportal.entity.activity.EventPriority;
 import com.epam.ta.reportportal.entity.activity.EventSubject;
 import com.epam.ta.reportportal.entity.activity.HistoryField;
-import com.epam.ta.reportportal.ws.model.activity.UserFilterActivityResource;
+import com.epam.ta.reportportal.model.activity.UserFilterActivityResource;
 import com.google.common.collect.Lists;
 import java.time.LocalDateTime;
 import java.util.List;
@@ -59,8 +59,8 @@ private static Activity getExpectedActivity(EventAction action, String name) {
   @Test
   void created() {
     final String name = "name";
-    final Activity actual = new FilterCreatedEvent(getUserFilter(name, true, "description"), 1L,
-        "user").toActivity();
+    final Activity actual =
+        new FilterCreatedEvent(getUserFilter(name, true, "description"), 1L, "user").toActivity();
     final Activity expected = getExpectedActivity(EventAction.CREATE, name);
     checkActivity(expected, actual);
   }
@@ -68,8 +68,8 @@ void created() {
   @Test
   void deleted() {
     final String name = "name";
-    final Activity actual = new FilterDeletedEvent(getUserFilter(name, true, "description"), 1L,
-        "user").toActivity();
+    final Activity actual =
+        new FilterDeletedEvent(getUserFilter(name, true, "description"), 1L, "user").toActivity();
     final Activity expected = getExpectedActivity(EventAction.DELETE, name);
     checkActivity(expected, actual);
   }
@@ -92,24 +92,20 @@ void updated() {
     final String newName = "newName";
     final boolean newShared = true;
     final String newDescription = "newDescription";
-    final Activity actual = new FilterUpdatedEvent(
-        getUserFilter(oldName, oldShared, oldDescription),
-        getUserFilter(newName, newShared, newDescription),
-        1L,
-        "user"
-    ).toActivity();
+    final Activity actual =
+        new FilterUpdatedEvent(getUserFilter(oldName, oldShared, oldDescription),
+            getUserFilter(newName, newShared, newDescription), 1L, "user"
+        ).toActivity();
     final Activity expected = getExpectedActivity(EventAction.UPDATE, newName);
-    expected.getDetails()
-        .setHistory(getExpectedHistory(Pair.of(oldName, newName),
-            Pair.of(oldShared, newShared),
+    expected.getDetails().setHistory(
+        getExpectedHistory(Pair.of(oldName, newName), Pair.of(oldShared, newShared),
             Pair.of(oldDescription, newDescription)
         ));
     checkActivity(expected, actual);
   }
 
   private static List<HistoryField> getExpectedHistory(Pair<String, String> name,
-      Pair<Boolean, Boolean> shared,
-      Pair<String, String> description) {
+      Pair<Boolean, Boolean> shared, Pair<String, String> description) {
     return Lists.newArrayList(HistoryField.of(NAME, name.getLeft(), name.getRight()),
         HistoryField.of(DESCRIPTION, description.getLeft(), description.getRight())
     );
diff --git a/src/test/java/com/epam/ta/reportportal/core/events/activity/IntegrationEventsTest.java b/src/test/java/com/epam/ta/reportportal/core/events/activity/IntegrationEventsTest.java
index 046630effa..3204b433f1 100644
--- a/src/test/java/com/epam/ta/reportportal/core/events/activity/IntegrationEventsTest.java
+++ b/src/test/java/com/epam/ta/reportportal/core/events/activity/IntegrationEventsTest.java
@@ -26,7 +26,7 @@
 import com.epam.ta.reportportal.entity.activity.EventPriority;
 import com.epam.ta.reportportal.entity.activity.EventSubject;
 import com.epam.ta.reportportal.entity.activity.HistoryField;
-import com.epam.ta.reportportal.ws.model.activity.IntegrationActivityResource;
+import com.epam.ta.reportportal.model.activity.IntegrationActivityResource;
 import java.time.LocalDateTime;
 import org.junit.jupiter.api.Test;
 
diff --git a/src/test/java/com/epam/ta/reportportal/core/events/activity/ItemIssueTypeDefinedEventTest.java b/src/test/java/com/epam/ta/reportportal/core/events/activity/ItemIssueTypeDefinedEventTest.java
index ba8892aa28..db53da19ef 100644
--- a/src/test/java/com/epam/ta/reportportal/core/events/activity/ItemIssueTypeDefinedEventTest.java
+++ b/src/test/java/com/epam/ta/reportportal/core/events/activity/ItemIssueTypeDefinedEventTest.java
@@ -28,7 +28,7 @@
 import com.epam.ta.reportportal.entity.activity.EventPriority;
 import com.epam.ta.reportportal.entity.activity.EventSubject;
 import com.epam.ta.reportportal.entity.activity.HistoryField;
-import com.epam.ta.reportportal.ws.model.activity.TestItemActivityResource;
+import com.epam.ta.reportportal.model.activity.TestItemActivityResource;
 import com.google.common.collect.Lists;
 import java.time.LocalDateTime;
 import java.util.List;
@@ -49,16 +49,15 @@ void toActivity() {
     final String newDescription = "newDescription";
     final String newName = "newName";
 
-    final Activity actual = new ItemIssueTypeDefinedEvent(
-        getTestItem(oldName, oldDescription, oldIgnoreAnalyzer),
-        getTestItem(newName, newDescription, newIgnoreAnalyzer), 1L, "user"
-    ).toActivity();
+    final Activity actual =
+        new ItemIssueTypeDefinedEvent(getTestItem(oldName, oldDescription, oldIgnoreAnalyzer),
+            getTestItem(newName, newDescription, newIgnoreAnalyzer), 1L, "user"
+        ).toActivity();
     final Activity expected = getExpectedActivity();
-    expected.getDetails().setHistory(getExpectedHistory(
-        Pair.of(oldDescription, newDescription),
-        Pair.of(oldName, newName),
-        Pair.of(String.valueOf(oldIgnoreAnalyzer), String.valueOf(newIgnoreAnalyzer))
-    ));
+    expected.getDetails().setHistory(
+        getExpectedHistory(Pair.of(oldDescription, newDescription), Pair.of(oldName, newName),
+            Pair.of(String.valueOf(oldIgnoreAnalyzer), String.valueOf(newIgnoreAnalyzer))
+        ));
     checkActivity(expected, actual);
   }
 
@@ -95,8 +94,7 @@ private static Activity getExpectedActivity() {
   }
 
   private static List<HistoryField> getExpectedHistory(Pair<String, String> description,
-      Pair<String, String> issueType,
-      Pair<String, String> ignoreAnalyzer) {
+      Pair<String, String> issueType, Pair<String, String> ignoreAnalyzer) {
     return Lists.newArrayList(
         HistoryField.of(COMMENT, description.getLeft(), description.getRight()),
         HistoryField.of(ISSUE_TYPE, issueType.getLeft(), issueType.getRight()),
diff --git a/src/test/java/com/epam/ta/reportportal/core/events/activity/LaunchEventsTest.java b/src/test/java/com/epam/ta/reportportal/core/events/activity/LaunchEventsTest.java
index d64974813b..b30af4e455 100644
--- a/src/test/java/com/epam/ta/reportportal/core/events/activity/LaunchEventsTest.java
+++ b/src/test/java/com/epam/ta/reportportal/core/events/activity/LaunchEventsTest.java
@@ -26,7 +26,7 @@
 import com.epam.ta.reportportal.entity.activity.EventSubject;
 import com.epam.ta.reportportal.entity.enums.LaunchModeEnum;
 import com.epam.ta.reportportal.entity.launch.Launch;
-import com.epam.ta.reportportal.ws.model.activity.LaunchActivityResource;
+import com.epam.ta.reportportal.model.activity.LaunchActivityResource;
 import java.time.LocalDateTime;
 import org.junit.jupiter.api.Test;
 
diff --git a/src/test/java/com/epam/ta/reportportal/core/events/activity/LinkTicketEventTest.java b/src/test/java/com/epam/ta/reportportal/core/events/activity/LinkTicketEventTest.java
index de5182454e..a27197bbd6 100644
--- a/src/test/java/com/epam/ta/reportportal/core/events/activity/LinkTicketEventTest.java
+++ b/src/test/java/com/epam/ta/reportportal/core/events/activity/LinkTicketEventTest.java
@@ -26,7 +26,7 @@
 import com.epam.ta.reportportal.entity.activity.EventPriority;
 import com.epam.ta.reportportal.entity.activity.EventSubject;
 import com.epam.ta.reportportal.entity.activity.HistoryField;
-import com.epam.ta.reportportal.ws.model.activity.TestItemActivityResource;
+import com.epam.ta.reportportal.model.activity.TestItemActivityResource;
 import com.google.common.collect.Lists;
 import java.time.LocalDateTime;
 import org.junit.jupiter.api.Test;
@@ -36,7 +36,8 @@
  */
 class LinkTicketEventTest {
 
-  private static final String EXISTED_TICKETS = "1:http:/example.com/ticket/1,2:http:/example.com/ticket/2";
+  private static final String EXISTED_TICKETS =
+      "1:http:/example.com/ticket/1,2:http:/example.com/ticket/2";
   private static final String LINKED_TICKET = "125:http:/example.com/ticket/125";
 
   private static Activity getExpectedActivity() {
@@ -73,12 +74,8 @@ private static TestItemActivityResource getTestItem(String tickets) {
 
   @Test
   void toActivity() {
-    final Activity actual = new LinkTicketEvent(
-        getTestItem(EXISTED_TICKETS),
-        getTestItem(EXISTED_TICKETS + "," + LINKED_TICKET),
-        1L,
-        "user",
-        false
+    final Activity actual = new LinkTicketEvent(getTestItem(EXISTED_TICKETS),
+        getTestItem(EXISTED_TICKETS + "," + LINKED_TICKET), 1L, "user", false
     ).toActivity();
     final Activity expected = getExpectedActivity();
     checkActivity(expected, actual);
diff --git a/src/test/java/com/epam/ta/reportportal/core/events/activity/PatternTemplateEventsTest.java b/src/test/java/com/epam/ta/reportportal/core/events/activity/PatternTemplateEventsTest.java
index 2da851a021..d7c0464699 100644
--- a/src/test/java/com/epam/ta/reportportal/core/events/activity/PatternTemplateEventsTest.java
+++ b/src/test/java/com/epam/ta/reportportal/core/events/activity/PatternTemplateEventsTest.java
@@ -27,7 +27,7 @@
 import com.epam.ta.reportportal.entity.activity.EventPriority;
 import com.epam.ta.reportportal.entity.activity.EventSubject;
 import com.epam.ta.reportportal.entity.activity.HistoryField;
-import com.epam.ta.reportportal.ws.model.activity.PatternTemplateActivityResource;
+import com.epam.ta.reportportal.model.activity.PatternTemplateActivityResource;
 import com.google.common.collect.Lists;
 import java.time.LocalDateTime;
 import java.util.List;
diff --git a/src/test/java/com/epam/ta/reportportal/core/events/activity/ProjectConfigEventTest.java b/src/test/java/com/epam/ta/reportportal/core/events/activity/ProjectConfigEventTest.java
index 0cbb37c3f9..6afd0f1282 100644
--- a/src/test/java/com/epam/ta/reportportal/core/events/activity/ProjectConfigEventTest.java
+++ b/src/test/java/com/epam/ta/reportportal/core/events/activity/ProjectConfigEventTest.java
@@ -26,7 +26,7 @@
 import com.epam.ta.reportportal.entity.activity.EventSubject;
 import com.epam.ta.reportportal.entity.activity.HistoryField;
 import com.epam.ta.reportportal.entity.enums.ProjectAttributeEnum;
-import com.epam.ta.reportportal.ws.model.activity.ProjectAttributesActivityResource;
+import com.epam.ta.reportportal.model.activity.ProjectAttributesActivityResource;
 import com.google.common.collect.Lists;
 import java.time.LocalDateTime;
 import java.util.HashMap;
@@ -68,29 +68,19 @@ private static Activity getExpectedActivity(EventAction action) {
 
   @Test
   void analyzerConfigUpdate() {
-    final Activity actual = new ProjectAnalyzerConfigEvent(
-        getProjectAttributes(getAnalyzerConfig(ANALYZER_MODE.getLeft(),
-            MIN_SHOULD_MATCH.getLeft(),
-            NUMBER_OF_LOG_LINES.getLeft(),
-            AUTO_ANALYZED_ENABLED.getLeft(),
+    final Activity actual = new ProjectAnalyzerConfigEvent(getProjectAttributes(
+        getAnalyzerConfig(ANALYZER_MODE.getLeft(), MIN_SHOULD_MATCH.getLeft(),
+            NUMBER_OF_LOG_LINES.getLeft(), AUTO_ANALYZED_ENABLED.getLeft(),
             ALL_MESSAGES_SHOULD_MATCH.getLeft()
-        )),
-        getProjectAttributes(getAnalyzerConfig(ANALYZER_MODE.getRight(),
-            MIN_SHOULD_MATCH.getRight(),
-            NUMBER_OF_LOG_LINES.getRight(),
-            AUTO_ANALYZED_ENABLED.getRight(),
+        )), getProjectAttributes(
+        getAnalyzerConfig(ANALYZER_MODE.getRight(), MIN_SHOULD_MATCH.getRight(),
+            NUMBER_OF_LOG_LINES.getRight(), AUTO_ANALYZED_ENABLED.getRight(),
             ALL_MESSAGES_SHOULD_MATCH.getRight()
-        )),
-        1L,
-        "user"
-    ).toActivity();
+        )), 1L, "user").toActivity();
     final Activity expected = getExpectedActivity(EventAction.UPDATE);
-    expected.getDetails()
-        .setHistory(getAnalyzerConfigHistory(ANALYZER_MODE,
-            MIN_SHOULD_MATCH,
-            NUMBER_OF_LOG_LINES,
-            AUTO_ANALYZED_ENABLED,
-            ALL_MESSAGES_SHOULD_MATCH
+    expected.getDetails().setHistory(
+        getAnalyzerConfigHistory(ANALYZER_MODE, MIN_SHOULD_MATCH, NUMBER_OF_LOG_LINES,
+            AUTO_ANALYZED_ENABLED, ALL_MESSAGES_SHOULD_MATCH
         ));
     expected.setEventName("updateAnalyzer");
     checkActivity(expected, actual);
@@ -106,15 +96,15 @@ private static ProjectAttributesActivityResource getProjectAttributes(
   }
 
   private static Map<String, String> getAnalyzerConfig(String analyzerMode, String minShouldMatch,
-      String numberOfLogs,
-      String autoAnalyzerEnabled, String allMessagesShouldMatch) {
+      String numberOfLogs, String autoAnalyzerEnabled, String allMessagesShouldMatch) {
     HashMap<String, String> result = new HashMap<>();
     result.put(ProjectAttributeEnum.AUTO_ANALYZER_MODE.getAttribute(), analyzerMode);
     result.put(ProjectAttributeEnum.MIN_SHOULD_MATCH.getAttribute(), minShouldMatch);
     result.put(ProjectAttributeEnum.NUMBER_OF_LOG_LINES.getAttribute(), numberOfLogs);
     result.put(ProjectAttributeEnum.AUTO_ANALYZER_ENABLED.getAttribute(), autoAnalyzerEnabled);
     result.put(ProjectAttributeEnum.ALL_MESSAGES_SHOULD_MATCH.getAttribute(),
-        allMessagesShouldMatch);
+        allMessagesShouldMatch
+    );
     return result;
   }
 
@@ -129,16 +119,12 @@ private static Map<String, String> getProjectConfig(String keepLogs, String keep
 
   @Test
   void projectConfigUpdate() {
-    final Activity actual = new ProjectUpdatedEvent(
-        getProjectAttributes(getProjectConfig(KEEP_LOGS.getLeft(),
-            KEEP_SCREENSHOTS.getLeft(),
+    final Activity actual = new ProjectUpdatedEvent(getProjectAttributes(
+        getProjectConfig(KEEP_LOGS.getLeft(), KEEP_SCREENSHOTS.getLeft(),
             INTERRUPT_JOB_TIME.getLeft()
-        )),
-        getProjectAttributes(getProjectConfig(KEEP_LOGS.getRight(), KEEP_SCREENSHOTS.getRight(),
-            INTERRUPT_JOB_TIME.getRight())),
-        1L,
-        "user"
-    ).toActivity();
+        )), getProjectAttributes(getProjectConfig(KEEP_LOGS.getRight(), KEEP_SCREENSHOTS.getRight(),
+        INTERRUPT_JOB_TIME.getRight()
+    )), 1L, "user").toActivity();
     final Activity expected = getExpectedActivity(EventAction.UPDATE);
     expected.setPriority(EventPriority.HIGH);
     expected.getDetails()
@@ -149,44 +135,32 @@ void projectConfigUpdate() {
   }
 
   private static List<HistoryField> getAnalyzerConfigHistory(Pair<String, String> analyzerMode,
-      Pair<String, String> minShouldMatch,
-      Pair<String, String> numberOfLogsLines, Pair<String, String> autoAnalyzed,
-      Pair<String, String> allMessagesShouldMatch) {
+      Pair<String, String> minShouldMatch, Pair<String, String> numberOfLogsLines,
+      Pair<String, String> autoAnalyzed, Pair<String, String> allMessagesShouldMatch) {
     return Lists.newArrayList(
         HistoryField.of(ProjectAttributeEnum.AUTO_ANALYZER_MODE.getAttribute(),
-            analyzerMode.getLeft(),
-            analyzerMode.getRight()
-        ),
-        HistoryField.of(ProjectAttributeEnum.MIN_SHOULD_MATCH.getAttribute(),
-            minShouldMatch.getLeft(), minShouldMatch.getRight()),
-        HistoryField.of(ProjectAttributeEnum.NUMBER_OF_LOG_LINES.getAttribute(),
-            numberOfLogsLines.getLeft(),
-            numberOfLogsLines.getRight()
-        ),
-        HistoryField.of(ProjectAttributeEnum.AUTO_ANALYZER_ENABLED.getAttribute(),
-            autoAnalyzed.getLeft(), autoAnalyzed.getRight()),
-        HistoryField.of(ProjectAttributeEnum.ALL_MESSAGES_SHOULD_MATCH.getAttribute(),
-            allMessagesShouldMatch.getLeft(),
-            allMessagesShouldMatch.getRight()
-        )
-    );
+            analyzerMode.getLeft(), analyzerMode.getRight()
+        ), HistoryField.of(ProjectAttributeEnum.MIN_SHOULD_MATCH.getAttribute(),
+            minShouldMatch.getLeft(), minShouldMatch.getRight()
+        ), HistoryField.of(ProjectAttributeEnum.NUMBER_OF_LOG_LINES.getAttribute(),
+            numberOfLogsLines.getLeft(), numberOfLogsLines.getRight()
+        ), HistoryField.of(ProjectAttributeEnum.AUTO_ANALYZER_ENABLED.getAttribute(),
+            autoAnalyzed.getLeft(), autoAnalyzed.getRight()
+        ), HistoryField.of(ProjectAttributeEnum.ALL_MESSAGES_SHOULD_MATCH.getAttribute(),
+            allMessagesShouldMatch.getLeft(), allMessagesShouldMatch.getRight()
+        ));
   }
 
   private static List<HistoryField> getProjectConfigHistory(Pair<String, String> keepLogs,
-      Pair<String, String> keepScreenshots,
-      Pair<String, String> interruptJobTime) {
+      Pair<String, String> keepScreenshots, Pair<String, String> interruptJobTime) {
     return Lists.newArrayList(
         HistoryField.of(ProjectAttributeEnum.KEEP_LOGS.getAttribute(), keepLogs.getLeft(),
-            keepLogs.getRight()),
-        HistoryField.of(ProjectAttributeEnum.KEEP_SCREENSHOTS.getAttribute(),
-            keepScreenshots.getLeft(),
-            keepScreenshots.getRight()
-        ),
-        HistoryField.of(ProjectAttributeEnum.INTERRUPT_JOB_TIME.getAttribute(),
-            interruptJobTime.getLeft(),
-            interruptJobTime.getRight()
-        )
-    );
+            keepLogs.getRight()
+        ), HistoryField.of(ProjectAttributeEnum.KEEP_SCREENSHOTS.getAttribute(),
+            keepScreenshots.getLeft(), keepScreenshots.getRight()
+        ), HistoryField.of(ProjectAttributeEnum.INTERRUPT_JOB_TIME.getAttribute(),
+            interruptJobTime.getLeft(), interruptJobTime.getRight()
+        ));
   }
 
 }
diff --git a/src/test/java/com/epam/ta/reportportal/core/events/activity/TestItemStatusChangedEventTest.java b/src/test/java/com/epam/ta/reportportal/core/events/activity/TestItemStatusChangedEventTest.java
index ee9ce03d43..74f60652f3 100644
--- a/src/test/java/com/epam/ta/reportportal/core/events/activity/TestItemStatusChangedEventTest.java
+++ b/src/test/java/com/epam/ta/reportportal/core/events/activity/TestItemStatusChangedEventTest.java
@@ -27,7 +27,7 @@
 import com.epam.ta.reportportal.entity.activity.EventPriority;
 import com.epam.ta.reportportal.entity.activity.EventSubject;
 import com.epam.ta.reportportal.entity.activity.HistoryField;
-import com.epam.ta.reportportal.ws.model.activity.TestItemActivityResource;
+import com.epam.ta.reportportal.model.activity.TestItemActivityResource;
 import com.google.common.collect.Lists;
 import java.time.LocalDateTime;
 import java.util.List;
@@ -75,11 +75,10 @@ void toActivity() {
 
     final String beforeStatus = "PASSED";
     final String afterStatus = "FAILED";
-    final Activity actual = new TestItemStatusChangedEvent(getTestItem(beforeStatus),
-        getTestItem(afterStatus),
-        1L,
-        "user"
-    ).toActivity();
+    final Activity actual =
+        new TestItemStatusChangedEvent(getTestItem(beforeStatus), getTestItem(afterStatus), 1L,
+            "user"
+        ).toActivity();
     final Activity expected = getExpectedActivity();
     expected.getDetails().setHistory(getExpectedHistory(Pair.of(beforeStatus, afterStatus)));
     checkActivity(expected, actual);
diff --git a/src/test/java/com/epam/ta/reportportal/core/events/activity/TicketPostedEventTest.java b/src/test/java/com/epam/ta/reportportal/core/events/activity/TicketPostedEventTest.java
index fd8522f4c2..0aed1a8461 100644
--- a/src/test/java/com/epam/ta/reportportal/core/events/activity/TicketPostedEventTest.java
+++ b/src/test/java/com/epam/ta/reportportal/core/events/activity/TicketPostedEventTest.java
@@ -26,7 +26,7 @@
 import com.epam.ta.reportportal.entity.activity.EventPriority;
 import com.epam.ta.reportportal.entity.activity.EventSubject;
 import com.epam.ta.reportportal.entity.activity.HistoryField;
-import com.epam.ta.reportportal.ws.model.activity.TestItemActivityResource;
+import com.epam.ta.reportportal.model.activity.TestItemActivityResource;
 import com.epam.ta.reportportal.ws.model.externalsystem.Ticket;
 import com.google.common.collect.Lists;
 import java.time.LocalDateTime;
@@ -39,7 +39,8 @@
  */
 class TicketPostedEventTest {
 
-  private static final String EXISTED_TICKETS = "1:http:/example.com/ticket/1,2:http:/example.com/ticket/2";
+  private static final String EXISTED_TICKETS =
+      "1:http:/example.com/ticket/1,2:http:/example.com/ticket/2";
   private static final String NEW_TICKET_ID = "125";
   private static final String NEW_TICKET_URL = "http:/example.com/ticket/125";
 
@@ -57,9 +58,8 @@ private static Activity getExpectedActivity() {
     activity.setCreatedAt(LocalDateTime.now());
     activity.setObjectName("name");
     activity.setDetails(new ActivityDetails());
-    activity.getDetails()
-        .setHistory(getExpectedHistory(Pair.of(EXISTED_TICKETS,
-            EXISTED_TICKETS + "," + NEW_TICKET_ID + ":" + NEW_TICKET_URL)));
+    activity.getDetails().setHistory(getExpectedHistory(
+        Pair.of(EXISTED_TICKETS, EXISTED_TICKETS + "," + NEW_TICKET_ID + ":" + NEW_TICKET_URL)));
     return activity;
   }
 
@@ -88,8 +88,8 @@ private static TestItemActivityResource getTestItem() {
 
   @Test
   void toActivity() {
-    final Activity actual = new TicketPostedEvent(getTicket(), 1L, "user",
-        getTestItem()).toActivity();
+    final Activity actual =
+        new TicketPostedEvent(getTicket(), 1L, "user", getTestItem()).toActivity();
     final Activity expected = getExpectedActivity();
     checkActivity(expected, actual);
   }
diff --git a/src/test/java/com/epam/ta/reportportal/core/events/activity/UserCreatedEventTest.java b/src/test/java/com/epam/ta/reportportal/core/events/activity/UserCreatedEventTest.java
index 8467597593..0a684f841a 100644
--- a/src/test/java/com/epam/ta/reportportal/core/events/activity/UserCreatedEventTest.java
+++ b/src/test/java/com/epam/ta/reportportal/core/events/activity/UserCreatedEventTest.java
@@ -24,7 +24,7 @@
 import com.epam.ta.reportportal.entity.activity.EventObject;
 import com.epam.ta.reportportal.entity.activity.EventPriority;
 import com.epam.ta.reportportal.entity.activity.EventSubject;
-import com.epam.ta.reportportal.ws.model.activity.UserActivityResource;
+import com.epam.ta.reportportal.model.activity.UserActivityResource;
 import java.time.LocalDateTime;
 import org.junit.jupiter.api.Test;
 
diff --git a/src/test/java/com/epam/ta/reportportal/core/events/activity/WidgetEventsTest.java b/src/test/java/com/epam/ta/reportportal/core/events/activity/WidgetEventsTest.java
index d84f9d2bba..b5d117deb0 100644
--- a/src/test/java/com/epam/ta/reportportal/core/events/activity/WidgetEventsTest.java
+++ b/src/test/java/com/epam/ta/reportportal/core/events/activity/WidgetEventsTest.java
@@ -30,7 +30,7 @@
 import com.epam.ta.reportportal.entity.activity.EventPriority;
 import com.epam.ta.reportportal.entity.activity.EventSubject;
 import com.epam.ta.reportportal.entity.activity.HistoryField;
-import com.epam.ta.reportportal.ws.model.activity.WidgetActivityResource;
+import com.epam.ta.reportportal.model.activity.WidgetActivityResource;
 import com.google.common.collect.Lists;
 import com.google.common.collect.Sets;
 import java.time.LocalDateTime;
@@ -62,82 +62,80 @@ private static Activity getExpectedActivity(EventAction action, String name) {
   }
 
   private static List<HistoryField> getExpectedHistory(Pair<String, String> name,
-      Pair<Boolean, Boolean> shared,
-      Pair<String, String> description, Pair<Integer, Integer> itemsCount,
-      Pair<Set<String>, Set<String>> contentFields,
+      Pair<Boolean, Boolean> shared, Pair<String, String> description,
+      Pair<Integer, Integer> itemsCount, Pair<Set<String>, Set<String>> contentFields,
       Pair<String, String> options) {
     return Lists.newArrayList(HistoryField.of(NAME, name.getLeft(), name.getRight()),
         HistoryField.of(DESCRIPTION, description.getLeft(), description.getRight()),
         HistoryField.of(ITEMS_COUNT, itemsCount.getLeft().toString(),
-            itemsCount.getRight().toString()),
-        HistoryField.of(CONTENT_FIELDS, String.join(", ", contentFields.getLeft()),
-            String.join(", ", contentFields.getRight())),
-        HistoryField.of(WIDGET_OPTIONS, options.getLeft(), options.getRight())
+            itemsCount.getRight().toString()
+        ), HistoryField.of(CONTENT_FIELDS, String.join(", ", contentFields.getLeft()),
+            String.join(", ", contentFields.getRight())
+        ), HistoryField.of(WIDGET_OPTIONS, options.getLeft(), options.getRight())
     );
-	}
+  }
 
-	@Test
-	void created() {
+  @Test
+  void created() {
     final String name = "name";
     final boolean shared = true;
     final String description = "description";
 
-    final Activity actual = new WidgetCreatedEvent(
-        getWidget(name, shared, description, 2, getBeforeContentFields()),
-        1L,
-        "user"
-    ).toActivity();
+    final Activity actual =
+        new WidgetCreatedEvent(getWidget(name, shared, description, 2, getBeforeContentFields()),
+            1L, "user"
+        ).toActivity();
     final Activity expected = getExpectedActivity(EventAction.CREATE, name);
     expected.setEventName("createWidget");
     checkActivity(expected, actual);
   }
 
-	private static WidgetActivityResource getWidget(String name, boolean shared, String description, int itemsCount,
-			Set<String> contentFields) {
-		WidgetActivityResource widget = new WidgetActivityResource();
-		widget.setName(name);
-		widget.setId(2L);
-		widget.setDescription(description);
-		widget.setProjectId(3L);
-		widget.setItemsCount(itemsCount);
-		widget.setContentFields(contentFields);
-		return widget;
-	}
-
-	private static Set<String> getBeforeContentFields() {
-		return Sets.newHashSet("field1", "field2", "field3");
-	}
-
-	private static Set<String> getAfterContentFields() {
-		return Sets.newHashSet("field1", "field4", "field5", "field6");
-	}
-
-	private static String getBeforeOptions() {
-		return "{ \"option1\": \"content\", \"option2\": \"enabled\"}";
-	}
-
-	private static String getAfterOptions() {
-		return "{\n" + "  \"option1\": \"content\",\n" + "  \"option5\": \"disabled\",\n" + "  \"superOption\": \"superContent\"\n" + "}";
-	}
-
-	@Test
-	void deleted() {
+  private static WidgetActivityResource getWidget(String name, boolean shared, String description,
+      int itemsCount, Set<String> contentFields) {
+    WidgetActivityResource widget = new WidgetActivityResource();
+    widget.setName(name);
+    widget.setId(2L);
+    widget.setDescription(description);
+    widget.setProjectId(3L);
+    widget.setItemsCount(itemsCount);
+    widget.setContentFields(contentFields);
+    return widget;
+  }
+
+  private static Set<String> getBeforeContentFields() {
+    return Sets.newHashSet("field1", "field2", "field3");
+  }
+
+  private static Set<String> getAfterContentFields() {
+    return Sets.newHashSet("field1", "field4", "field5", "field6");
+  }
+
+  private static String getBeforeOptions() {
+    return "{ \"option1\": \"content\", \"option2\": \"enabled\"}";
+  }
+
+  private static String getAfterOptions() {
+    return "{\n" + "  \"option1\": \"content\",\n" + "  \"option5\": \"disabled\",\n"
+        + "  \"superOption\": \"superContent\"\n" + "}";
+  }
+
+  @Test
+  void deleted() {
     final String name = "name";
     final boolean shared = true;
     final String description = "description";
 
-    final Activity actual = new WidgetDeletedEvent(
-        getWidget(name, shared, description, 3, getBeforeContentFields()),
-        1L,
-        "user"
-    ).toActivity();
+    final Activity actual =
+        new WidgetDeletedEvent(getWidget(name, shared, description, 3, getBeforeContentFields()),
+            1L, "user"
+        ).toActivity();
     final Activity expected = getExpectedActivity(EventAction.DELETE, name);
     expected.setEventName("deleteWidget");
     checkActivity(expected, actual);
   }
 
-	@Test
-	void update() {
+  @Test
+  void update() {
     final String oldName = "oldName";
     final boolean oldShared = false;
     final String oldDescription = "oldDescription";
@@ -148,15 +146,12 @@ void update() {
     final Activity actual = new WidgetUpdatedEvent(
         getWidget(oldName, oldShared, oldDescription, 2, getBeforeContentFields()),
         getWidget(newName, newShared, newDescription, 4, getAfterContentFields()),
-        getBeforeOptions(),
-        getAfterOptions(), 1L, "user"
+        getBeforeOptions(), getAfterOptions(), 1L, "user"
     ).toActivity();
     final Activity expected = getExpectedActivity(EventAction.UPDATE, newName);
-    expected.getDetails()
-        .setHistory(getExpectedHistory(Pair.of(oldName, newName),
-            Pair.of(oldShared, newShared),
-            Pair.of(oldDescription, newDescription),
-            Pair.of(2, 4),
+    expected.getDetails().setHistory(
+        getExpectedHistory(Pair.of(oldName, newName), Pair.of(oldShared, newShared),
+            Pair.of(oldDescription, newDescription), Pair.of(2, 4),
             Pair.of(getBeforeContentFields(), getAfterContentFields()),
             Pair.of(getBeforeOptions(), getAfterOptions())
         ));
diff --git a/src/test/java/com/epam/ta/reportportal/core/events/handler/DefectTypeDeletedHandlerTest.java b/src/test/java/com/epam/ta/reportportal/core/events/handler/DefectTypeDeletedHandlerTest.java
index e8dbcf8f22..3b5e2832da 100644
--- a/src/test/java/com/epam/ta/reportportal/core/events/handler/DefectTypeDeletedHandlerTest.java
+++ b/src/test/java/com/epam/ta/reportportal/core/events/handler/DefectTypeDeletedHandlerTest.java
@@ -35,7 +35,7 @@
 import com.epam.ta.reportportal.entity.project.Project;
 import com.epam.ta.reportportal.entity.project.ProjectAttribute;
 import com.epam.ta.reportportal.exception.ReportPortalException;
-import com.epam.ta.reportportal.ws.model.activity.IssueTypeActivityResource;
+import com.epam.ta.reportportal.model.activity.IssueTypeActivityResource;
 import com.epam.ta.reportportal.ws.model.project.AnalyzerConfig;
 import com.google.common.cache.Cache;
 import com.google.common.cache.CacheBuilder;
@@ -79,14 +79,13 @@ void deleteSubTypeOnNotExistProject() {
 
     when(projectRepository.findById(projectId)).thenReturn(Optional.empty());
 
-    ReportPortalException exception = assertThrows(
-        ReportPortalException.class,
-        () -> handler.handleDefectTypeDeleted(
-            new DefectTypeDeletedEvent(new IssueTypeActivityResource(), 1L, "user", projectId))
-    );
+    ReportPortalException exception =
+        assertThrows(ReportPortalException.class, () -> handler.handleDefectTypeDeleted(
+            new DefectTypeDeletedEvent(new IssueTypeActivityResource(), 1L, "user", projectId)));
 
     assertEquals("Project '2' not found. Did you use correct project name?",
-        exception.getMessage());
+        exception.getMessage()
+    );
   }
 
   @Test
@@ -113,13 +112,12 @@ void analysisAlreadyRunningTest() {
     when(analyzerStatusCache.getAnalyzeStatus(AnalyzerStatusCache.AUTO_ANALYZER_KEY)).thenReturn(
         Optional.of(cache));
 
-    ReportPortalException exception = assertThrows(
-        ReportPortalException.class,
-        () -> handler.handleDefectTypeDeleted(
-            new DefectTypeDeletedEvent(new IssueTypeActivityResource(), 1L, "user", projectId))
-    );
+    ReportPortalException exception =
+        assertThrows(ReportPortalException.class, () -> handler.handleDefectTypeDeleted(
+            new DefectTypeDeletedEvent(new IssueTypeActivityResource(), 1L, "user", projectId)));
     assertEquals("Forbidden operation. Index can not be removed until auto-analysis proceeds.",
-        exception.getMessage());
+        exception.getMessage()
+    );
   }
 
   @Test
diff --git a/src/test/java/com/epam/ta/reportportal/core/filter/impl/SearchCriteriaServiceTest.java b/src/test/java/com/epam/ta/reportportal/core/filter/impl/SearchCriteriaServiceTest.java
index f9c68f6424..d3c10c44f1 100644
--- a/src/test/java/com/epam/ta/reportportal/core/filter/impl/SearchCriteriaServiceTest.java
+++ b/src/test/java/com/epam/ta/reportportal/core/filter/impl/SearchCriteriaServiceTest.java
@@ -29,9 +29,8 @@
 import com.epam.ta.reportportal.core.filter.predefined.PredefinedFilterType;
 import com.epam.ta.reportportal.entity.activity.Activity;
 import com.epam.ta.reportportal.exception.ReportPortalException;
-import com.epam.ta.reportportal.ws.model.SearchCriteria;
-import com.epam.ta.reportportal.ws.model.SearchCriteriaRQ;
-import java.util.List;
+import com.epam.ta.reportportal.model.SearchCriteria;
+import com.epam.ta.reportportal.model.SearchCriteriaRQ;
 import java.util.Set;
 import org.apache.commons.collections4.CollectionUtils;
 import org.junit.jupiter.api.Assertions;
@@ -54,7 +53,8 @@ void setUp() {
   @Test
   void testCreateFilterBySearchCriteria_noCriteria() {
     Queryable filter = searchCriteriaService.createFilterBySearchCriteria(searchCriteriaRQ, target,
-        PredefinedFilterType.ACTIVITIES);
+        PredefinedFilterType.ACTIVITIES
+    );
 
     assertTrue(filter instanceof Filter);
     assertTrue(CollectionUtils.isEmpty(filter.getFilterConditions()));
@@ -63,14 +63,15 @@ void testCreateFilterBySearchCriteria_noCriteria() {
 
   @Test
   void testCreateFilterBySearchCriteria_criteriaWithoutPredefinedFilter() {
-    Set<SearchCriteria> criteriaList = Set.of(
-        new SearchCriteria("sampleKey1", "EQ", "sampleValue1"),
-        new SearchCriteria("sampleKey2", "IN", "sampleValue2")
-    );
+    Set<SearchCriteria> criteriaList =
+        Set.of(new SearchCriteria("sampleKey1", "EQ", "sampleValue1"),
+            new SearchCriteria("sampleKey2", "IN", "sampleValue2")
+        );
     searchCriteriaRQ.setCriteriaList(criteriaList);
 
     Queryable filter = searchCriteriaService.createFilterBySearchCriteria(searchCriteriaRQ, target,
-        PredefinedFilterType.ACTIVITIES);
+        PredefinedFilterType.ACTIVITIES
+    );
 
     assertTrue(filter instanceof Filter);
     assertEquals(2, filter.getFilterConditions().size());
@@ -78,14 +79,15 @@ void testCreateFilterBySearchCriteria_criteriaWithoutPredefinedFilter() {
 
   @Test
   void testCreateFilterBySearchCriteria_criteriaWithPredefinedFilter() {
-    Set<SearchCriteria> criteriaList = Set.of(
-        new SearchCriteria("predefinedFilter", null, "predefinedValue"),
-        new SearchCriteria("sampleKey3", "EQ", "sampleValue3")
-    );
+    Set<SearchCriteria> criteriaList =
+        Set.of(new SearchCriteria("predefinedFilter", null, "predefinedValue"),
+            new SearchCriteria("sampleKey3", "EQ", "sampleValue3")
+        );
     searchCriteriaRQ.setCriteriaList(criteriaList);
 
     Queryable filter = searchCriteriaService.createFilterBySearchCriteria(searchCriteriaRQ, target,
-        PredefinedFilterType.ACTIVITIES);
+        PredefinedFilterType.ACTIVITIES
+    );
 
     assertTrue(filter instanceof CompositeFilter);
     assertEquals(6, filter.getFilterConditions().size());
@@ -93,26 +95,26 @@ void testCreateFilterBySearchCriteria_criteriaWithPredefinedFilter() {
 
   @Test
   void testCreateFilterBySearchCriteria_wrongOperation_throwException() {
-    Set<SearchCriteria> criteriaList = Set.of(
-        new SearchCriteria("sampleKey1", "WRONG", "sampleValue1")
-    );
+    Set<SearchCriteria> criteriaList =
+        Set.of(new SearchCriteria("sampleKey1", "WRONG", "sampleValue1"));
     searchCriteriaRQ.setCriteriaList(criteriaList);
 
     Assertions.assertThrows(ReportPortalException.class,
         () -> searchCriteriaService.createFilterBySearchCriteria(searchCriteriaRQ, target,
-            PredefinedFilterType.ACTIVITIES));
+            PredefinedFilterType.ACTIVITIES
+        )
+    );
 
   }
 
   @Test
   void testNormalizeValueSpaces() {
-    Set<SearchCriteria> criteriaList = Set.of(
-        new SearchCriteria("predefinedFilter", "CNT", "sample Value1")
-    );
+    Set<SearchCriteria> criteriaList =
+        Set.of(new SearchCriteria("predefinedFilter", "CNT", "sample Value1"));
     searchCriteriaRQ.setCriteriaList(criteriaList);
-    Queryable filter = searchCriteriaService.createFilterBySearchCriteria(
-        searchCriteriaRQ, target,
-        PredefinedFilterType.ACTIVITIES);
+    Queryable filter = searchCriteriaService.createFilterBySearchCriteria(searchCriteriaRQ, target,
+        PredefinedFilterType.ACTIVITIES
+    );
 
     filter.getFilterConditions().forEach(cnd -> {
       FilterCondition condition = (FilterCondition) cnd;
diff --git a/src/test/java/com/epam/ta/reportportal/core/filter/impl/UpdateUserFilterHandlerTest.java b/src/test/java/com/epam/ta/reportportal/core/filter/impl/UpdateUserFilterHandlerTest.java
index 5be7ec2523..16dabc47b5 100644
--- a/src/test/java/com/epam/ta/reportportal/core/filter/impl/UpdateUserFilterHandlerTest.java
+++ b/src/test/java/com/epam/ta/reportportal/core/filter/impl/UpdateUserFilterHandlerTest.java
@@ -16,12 +16,21 @@
 
 package com.epam.ta.reportportal.core.filter.impl;
 
+import static com.epam.ta.reportportal.ReportPortalUserUtil.getRpUser;
+import static com.epam.ta.reportportal.commons.querygen.constant.GeneralCriteriaConstant.CRITERIA_NAME;
+import static com.epam.ta.reportportal.util.TestProjectExtractor.extractProjectDetails;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.Mockito.doNothing;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+
 import com.epam.ta.reportportal.commons.ReportPortalUser;
 import com.epam.ta.reportportal.commons.validation.Suppliers;
 import com.epam.ta.reportportal.core.events.ActivityEvent;
 import com.epam.ta.reportportal.core.events.MessageBus;
 import com.epam.ta.reportportal.core.filter.UpdateUserFilterHandler;
-import com.epam.ta.reportportal.dao.ProjectRepository;
 import com.epam.ta.reportportal.dao.ProjectUserRepository;
 import com.epam.ta.reportportal.dao.UserFilterRepository;
 import com.epam.ta.reportportal.dao.WidgetRepository;
@@ -30,156 +39,152 @@
 import com.epam.ta.reportportal.entity.project.ProjectRole;
 import com.epam.ta.reportportal.entity.user.UserRole;
 import com.epam.ta.reportportal.exception.ReportPortalException;
+import com.epam.ta.reportportal.model.filter.Order;
+import com.epam.ta.reportportal.model.filter.UpdateUserFilterRQ;
+import com.epam.ta.reportportal.model.filter.UserFilterCondition;
 import com.epam.ta.reportportal.util.ProjectExtractor;
 import com.epam.ta.reportportal.ws.model.OperationCompletionRS;
-import com.epam.ta.reportportal.ws.model.filter.Order;
-import com.epam.ta.reportportal.ws.model.filter.UpdateUserFilterRQ;
-import com.epam.ta.reportportal.ws.model.filter.UserFilterCondition;
 import com.google.common.collect.Lists;
 import com.google.common.collect.Sets;
-import org.junit.jupiter.api.Test;
-
 import java.util.Optional;
-
-import static com.epam.ta.reportportal.ReportPortalUserUtil.getRpUser;
-import static com.epam.ta.reportportal.commons.querygen.constant.GeneralCriteriaConstant.CRITERIA_NAME;
-import static com.epam.ta.reportportal.util.TestProjectExtractor.extractProjectDetails;
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertThrows;
-import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.Mockito.*;
+import org.junit.jupiter.api.Test;
 
 /**
  * @author <a href="mailto:ivan_budayeu@epam.com">Ivan Budayeu</a>
  */
 class UpdateUserFilterHandlerTest {
 
-	public static final String SAME_NAME = "name";
-	public static final String ANOTHER_NAME = "another name";
+  public static final String SAME_NAME = "name";
+  public static final String ANOTHER_NAME = "another name";
 
-	private UserFilter userFilter = mock(UserFilter.class);
+  private UserFilter userFilter = mock(UserFilter.class);
 
-	private Project project = mock(Project.class);
+  private Project project = mock(Project.class);
 
-	private ProjectUserRepository projectUserRepository = mock(ProjectUserRepository.class);
+  private ProjectUserRepository projectUserRepository = mock(ProjectUserRepository.class);
 
-	private ProjectExtractor projectExtractor = new ProjectExtractor(projectUserRepository);
+  private ProjectExtractor projectExtractor = new ProjectExtractor(projectUserRepository);
 
-	private UserFilterRepository userFilterRepository = mock(UserFilterRepository.class);
+  private UserFilterRepository userFilterRepository = mock(UserFilterRepository.class);
 
-	private WidgetRepository widgetRepository = mock(WidgetRepository.class);
+  private WidgetRepository widgetRepository = mock(WidgetRepository.class);
 
-	private MessageBus messageBus = mock(MessageBus.class);
+  private MessageBus messageBus = mock(MessageBus.class);
 
-	private UpdateUserFilterHandler updateUserFilterHandler = new UpdateUserFilterHandlerImpl(projectExtractor,
-			userFilterRepository,
-			messageBus
-	);
+  private UpdateUserFilterHandler updateUserFilterHandler =
+      new UpdateUserFilterHandlerImpl(projectExtractor, userFilterRepository, messageBus);
 
-	@Test
-	void updateUserFilterWithTheSameName() {
+  @Test
+  void updateUserFilterWithTheSameName() {
 
-		final ReportPortalUser rpUser = getRpUser("user", UserRole.USER, ProjectRole.PROJECT_MANAGER, 1L);
+    final ReportPortalUser rpUser =
+        getRpUser("user", UserRole.USER, ProjectRole.PROJECT_MANAGER, 1L);
 
-		UpdateUserFilterRQ updateUserFilterRQ = getUpdateRequest(SAME_NAME);
+    UpdateUserFilterRQ updateUserFilterRQ = getUpdateRequest(SAME_NAME);
 
-		ReportPortalUser.ProjectDetails projectDetails = extractProjectDetails(rpUser, "test_project");
-		when(userFilterRepository.findByIdAndProjectId(1L, projectDetails.getProjectId())).thenReturn(Optional.of(userFilter));
+    ReportPortalUser.ProjectDetails projectDetails = extractProjectDetails(rpUser, "test_project");
+    when(userFilterRepository.findByIdAndProjectId(1L, projectDetails.getProjectId())).thenReturn(
+        Optional.of(userFilter));
 
-		when(userFilter.getId()).thenReturn(1L);
-		when(userFilter.getName()).thenReturn(SAME_NAME);
-		when(userFilter.getProject()).thenReturn(project);
-		when(project.getId()).thenReturn(1L);
+    when(userFilter.getId()).thenReturn(1L);
+    when(userFilter.getName()).thenReturn(SAME_NAME);
+    when(userFilter.getProject()).thenReturn(project);
+    when(project.getId()).thenReturn(1L);
 
-		doNothing().when(messageBus).publishActivity(any(ActivityEvent.class));
+    doNothing().when(messageBus).publishActivity(any(ActivityEvent.class));
 
-		OperationCompletionRS operationCompletionRS = updateUserFilterHandler.updateUserFilter(1L,
-				updateUserFilterRQ,
-				projectDetails,
-				rpUser
-		);
+    OperationCompletionRS operationCompletionRS =
+        updateUserFilterHandler.updateUserFilter(1L, updateUserFilterRQ, projectDetails, rpUser);
 
-		assertEquals("User filter with ID = '" + userFilter.getId() + "' successfully updated.", operationCompletionRS.getResultMessage());
-	}
+    assertEquals(
+        "User filter with ID = '" + userFilter.getId() + "' successfully updated.",
+        operationCompletionRS.getResultMessage()
+    );
+  }
 
-	@Test
-	void updateUserFilterWithAnotherNamePositive() {
+  @Test
+  void updateUserFilterWithAnotherNamePositive() {
 
-		final ReportPortalUser rpUser = getRpUser("user", UserRole.USER, ProjectRole.PROJECT_MANAGER, 1L);
+    final ReportPortalUser rpUser =
+        getRpUser("user", UserRole.USER, ProjectRole.PROJECT_MANAGER, 1L);
 
-		UpdateUserFilterRQ updateUserFilterRQ = getUpdateRequest(ANOTHER_NAME);
+    UpdateUserFilterRQ updateUserFilterRQ = getUpdateRequest(ANOTHER_NAME);
 
-		ReportPortalUser.ProjectDetails projectDetails = extractProjectDetails(rpUser, "test_project");
-		when(userFilterRepository.findByIdAndProjectId(1L, projectDetails.getProjectId())).thenReturn(Optional.of(userFilter));
+    ReportPortalUser.ProjectDetails projectDetails = extractProjectDetails(rpUser, "test_project");
+    when(userFilterRepository.findByIdAndProjectId(1L, projectDetails.getProjectId())).thenReturn(
+        Optional.of(userFilter));
 
-		when(userFilter.getId()).thenReturn(1L);
-		when(userFilter.getName()).thenReturn(SAME_NAME);
-		when(userFilter.getProject()).thenReturn(project);
-		when(project.getId()).thenReturn(1L);
+    when(userFilter.getId()).thenReturn(1L);
+    when(userFilter.getName()).thenReturn(SAME_NAME);
+    when(userFilter.getProject()).thenReturn(project);
+    when(project.getId()).thenReturn(1L);
 
-		when(userFilterRepository.existsByNameAndOwnerAndProjectId(updateUserFilterRQ.getName(), "user", 1L)).thenReturn(Boolean.FALSE);
+    when(userFilterRepository.existsByNameAndOwnerAndProjectId(updateUserFilterRQ.getName(), "user",
+        1L
+    )).thenReturn(Boolean.FALSE);
 
-		doNothing().when(messageBus).publishActivity(any(ActivityEvent.class));
+    doNothing().when(messageBus).publishActivity(any(ActivityEvent.class));
 
-		OperationCompletionRS operationCompletionRS = updateUserFilterHandler.updateUserFilter(1L,
-				updateUserFilterRQ,
-				projectDetails,
-				rpUser
-		);
+    OperationCompletionRS operationCompletionRS =
+        updateUserFilterHandler.updateUserFilter(1L, updateUserFilterRQ, projectDetails, rpUser);
 
-		assertEquals("User filter with ID = '" + userFilter.getId() + "' successfully updated.", operationCompletionRS.getResultMessage());
-	}
+    assertEquals(
+        "User filter with ID = '" + userFilter.getId() + "' successfully updated.",
+        operationCompletionRS.getResultMessage()
+    );
+  }
 
-	@Test
-	void updateUserFilterWithAnotherNameNegative() {
+  @Test
+  void updateUserFilterWithAnotherNameNegative() {
 
-		final ReportPortalUser rpUser = getRpUser("user", UserRole.USER, ProjectRole.PROJECT_MANAGER, 1L);
+    final ReportPortalUser rpUser =
+        getRpUser("user", UserRole.USER, ProjectRole.PROJECT_MANAGER, 1L);
 
-		UpdateUserFilterRQ updateUserFilterRQ = getUpdateRequest(ANOTHER_NAME);
+    UpdateUserFilterRQ updateUserFilterRQ = getUpdateRequest(ANOTHER_NAME);
 
-		ReportPortalUser.ProjectDetails projectDetails = extractProjectDetails(rpUser, "test_project");
-		when(userFilterRepository.findByIdAndProjectId(1L, projectDetails.getProjectId())).thenReturn(Optional.of(userFilter));
+    ReportPortalUser.ProjectDetails projectDetails = extractProjectDetails(rpUser, "test_project");
+    when(userFilterRepository.findByIdAndProjectId(1L, projectDetails.getProjectId())).thenReturn(
+        Optional.of(userFilter));
 
-		when(userFilter.getId()).thenReturn(1L);
-		when(userFilter.getName()).thenReturn(SAME_NAME);
-		when(userFilter.getProject()).thenReturn(project);
-		when(userFilter.getOwner()).thenReturn("user");
-		when(project.getId()).thenReturn(1L);
+    when(userFilter.getId()).thenReturn(1L);
+    when(userFilter.getName()).thenReturn(SAME_NAME);
+    when(userFilter.getProject()).thenReturn(project);
+    when(userFilter.getOwner()).thenReturn("user");
+    when(project.getId()).thenReturn(1L);
 
-		when(userFilterRepository.existsByNameAndOwnerAndProjectId(updateUserFilterRQ.getName(),
-				userFilter.getOwner(),
-				projectDetails.getProjectId()
-		)).thenReturn(Boolean.TRUE);
+    when(userFilterRepository.existsByNameAndOwnerAndProjectId(updateUserFilterRQ.getName(),
+        userFilter.getOwner(), projectDetails.getProjectId()
+    )).thenReturn(Boolean.TRUE);
 
-		doNothing().when(messageBus).publishActivity(any(ActivityEvent.class));
+    doNothing().when(messageBus).publishActivity(any(ActivityEvent.class));
 
-		final ReportPortalException exception = assertThrows(ReportPortalException.class,
-				() -> updateUserFilterHandler.updateUserFilter(1L, updateUserFilterRQ, projectDetails, rpUser)
-		);
-		assertEquals(Suppliers.formattedSupplier(
-				"User filter with name '{}' already exists for user '{}' under the project '{}'. You couldn't create the duplicate.",
-				ANOTHER_NAME,
-				"user",
-				projectDetails.getProjectName()
-		).get(), exception.getMessage());
-	}
+    final ReportPortalException exception = assertThrows(ReportPortalException.class,
+        () -> updateUserFilterHandler.updateUserFilter(1L, updateUserFilterRQ, projectDetails,
+            rpUser
+        )
+    );
+    assertEquals(Suppliers.formattedSupplier(
+        "User filter with name '{}' already exists for user '{}' under the project '{}'. You couldn't create the duplicate.",
+        ANOTHER_NAME, "user", projectDetails.getProjectName()
+    ).get(), exception.getMessage());
+  }
 
-	private UpdateUserFilterRQ getUpdateRequest(String name) {
+  private UpdateUserFilterRQ getUpdateRequest(String name) {
 
-		UpdateUserFilterRQ updateUserFilterRQ = new UpdateUserFilterRQ();
+    UpdateUserFilterRQ updateUserFilterRQ = new UpdateUserFilterRQ();
 
-		updateUserFilterRQ.setName(name);
-		updateUserFilterRQ.setObjectType("Launch");
+    updateUserFilterRQ.setName(name);
+    updateUserFilterRQ.setObjectType("Launch");
 
-		Order order = new Order();
-		order.setIsAsc(true);
-		order.setSortingColumnName(CRITERIA_NAME);
-		updateUserFilterRQ.setOrders(Lists.newArrayList(order));
+    Order order = new Order();
+    order.setIsAsc(true);
+    order.setSortingColumnName(CRITERIA_NAME);
+    updateUserFilterRQ.setOrders(Lists.newArrayList(order));
 
-		UserFilterCondition condition = new UserFilterCondition(CRITERIA_NAME, "cnt", "we");
-		updateUserFilterRQ.setConditions(Sets.newHashSet(condition));
+    UserFilterCondition condition = new UserFilterCondition(CRITERIA_NAME, "cnt", "we");
+    updateUserFilterRQ.setConditions(Sets.newHashSet(condition));
 
-		return updateUserFilterRQ;
-	}
+    return updateUserFilterRQ;
+  }
 
 }
\ No newline at end of file
diff --git a/src/test/java/com/epam/ta/reportportal/core/imprt/ImportLaunchHandlerImplTest.java b/src/test/java/com/epam/ta/reportportal/core/imprt/ImportLaunchHandlerImplTest.java
index d7a2014334..b827cc6834 100644
--- a/src/test/java/com/epam/ta/reportportal/core/imprt/ImportLaunchHandlerImplTest.java
+++ b/src/test/java/com/epam/ta/reportportal/core/imprt/ImportLaunchHandlerImplTest.java
@@ -16,10 +16,10 @@
 import com.epam.ta.reportportal.core.imprt.impl.XmlImportStrategy;
 import com.epam.ta.reportportal.dao.LaunchRepository;
 import com.epam.ta.reportportal.exception.ReportPortalException;
+import com.epam.ta.reportportal.model.LaunchImportCompletionRS;
+import com.epam.ta.reportportal.model.launch.LaunchImportRQ;
 import com.epam.ta.reportportal.util.sample.LaunchSampleUtil;
 import com.epam.ta.reportportal.ws.model.ErrorType;
-import com.epam.ta.reportportal.ws.model.LaunchImportCompletionRS;
-import com.epam.ta.reportportal.ws.model.launch.LaunchImportRQ;
 import java.io.File;
 import java.util.Optional;
 import org.apache.commons.io.FilenameUtils;
@@ -154,9 +154,7 @@ public void whenImportLaunch_AndFileIsValid_ThenCallImportLaunch() {
       when(launchRepository.findByUuid(LAUNCH_ID)).thenReturn(Optional.of(sampleLaunch));
 
       var response = (LaunchImportCompletionRS) importLaunchHandlerImpl.importLaunch(projectDetails,
-          reportPortalUser, FORMAT,
-          multipartFile,
-          BASE_URL, rq
+          reportPortalUser, FORMAT, multipartFile, BASE_URL, rq
       );
 
       assertEquals(sampleLaunch.getUuid(), response.getData().getId());
diff --git a/src/test/java/com/epam/ta/reportportal/core/imprt/XmlImportStrategyTest.java b/src/test/java/com/epam/ta/reportportal/core/imprt/XmlImportStrategyTest.java
index 8dc2699d08..3dd6cc92bc 100644
--- a/src/test/java/com/epam/ta/reportportal/core/imprt/XmlImportStrategyTest.java
+++ b/src/test/java/com/epam/ta/reportportal/core/imprt/XmlImportStrategyTest.java
@@ -16,8 +16,8 @@
 import com.epam.ta.reportportal.core.launch.StartLaunchHandler;
 import com.epam.ta.reportportal.dao.LaunchRepository;
 import com.epam.ta.reportportal.entity.launch.Launch;
+import com.epam.ta.reportportal.model.launch.LaunchImportRQ;
 import com.epam.ta.reportportal.ws.model.attribute.ItemAttributesRQ;
-import com.epam.ta.reportportal.ws.model.launch.LaunchImportRQ;
 import com.epam.ta.reportportal.ws.model.launch.StartLaunchRS;
 import java.io.BufferedWriter;
 import java.io.File;
@@ -26,6 +26,7 @@
 import java.nio.file.Path;
 import java.time.Instant;
 import java.util.Date;
+import java.util.HashSet;
 import java.util.Optional;
 import java.util.Set;
 import javax.inject.Provider;
@@ -106,7 +107,12 @@ void whenImportLaunch_thenProcessXmlFile(@TempDir Path tempDir) throws Exception
   void whenImportLaunch_andIsSkippedIssue_thenProcessXmlFileWithSkippedTrue(@TempDir Path tempDir)
       throws Exception {
     LaunchImportRQ rq = new LaunchImportRQ();
-    rq.setAttributes(Set.of(new ItemAttributesRQ(AbstractImportStrategy.SKIPPED_IS_NOT_ISSUE, "true")));
+    ItemAttributesRQ attributesRQ =
+        new ItemAttributesRQ(AbstractImportStrategy.SKIPPED_IS_NOT_ISSUE, "true");
+    attributesRQ.setSystem(true);
+    Set<ItemAttributesRQ> attributes = new HashSet<>();
+    attributes.add(attributesRQ);
+    rq.setAttributes(attributes);
 
     File xmlFile = createFile(tempDir);
 
@@ -136,7 +142,7 @@ void whenImportLaunch_andIsSkippedIssue_thenProcessXmlFileWithSkippedTrue(@TempD
     verify(xmlParseJobProvider, times(1)).get();
   }
 
-  private File createFile(Path tempDir) throws Exception{
+  private File createFile(Path tempDir) throws Exception {
     File xmlFile = tempDir.resolve("sample.xml").toFile();
     BufferedWriter writer = new BufferedWriter(new FileWriter(xmlFile));
     writer.write("<testsuite><testcase/></testsuite>");
diff --git a/src/test/java/com/epam/ta/reportportal/core/integration/impl/GetIntegrationHandlerTest.java b/src/test/java/com/epam/ta/reportportal/core/integration/impl/GetIntegrationHandlerTest.java
index 0f4dead3bf..0c7669068f 100644
--- a/src/test/java/com/epam/ta/reportportal/core/integration/impl/GetIntegrationHandlerTest.java
+++ b/src/test/java/com/epam/ta/reportportal/core/integration/impl/GetIntegrationHandlerTest.java
@@ -31,7 +31,7 @@
 import com.epam.ta.reportportal.dao.IntegrationTypeRepository;
 import com.epam.ta.reportportal.dao.ProjectRepository;
 import com.epam.ta.reportportal.entity.project.Project;
-import com.epam.ta.reportportal.ws.model.integration.IntegrationResource;
+import com.epam.ta.reportportal.model.integration.IntegrationResource;
 import java.util.Map;
 import java.util.Optional;
 import org.junit.jupiter.api.Test;
@@ -44,20 +44,17 @@ class GetIntegrationHandlerTest {
   private final Map integrationServiceMapming = mock(Map.class);
   private final IntegrationService basicIntegrationService = mock(IntegrationService.class);
   private final IntegrationRepository integrationRepository = mock(IntegrationRepository.class);
-  private final IntegrationTypeRepository integrationTypeRepository = mock(
-      IntegrationTypeRepository.class);
+  private final IntegrationTypeRepository integrationTypeRepository =
+      mock(IntegrationTypeRepository.class);
   private final ProjectRepository projectRepository = mock(ProjectRepository.class);
-  private final GetBugTrackingSystemHandler getBugTrackingSystemHandler = mock(
-      GetBugTrackingSystemHandler.class);
-
-  private final GetIntegrationHandler getIntegrationHandler = new GetIntegrationHandlerImpl(
-      integrationServiceMapming,
-      basicIntegrationService,
-      integrationRepository,
-      integrationTypeRepository,
-      projectRepository,
-      getBugTrackingSystemHandler
-  );
+  private final GetBugTrackingSystemHandler getBugTrackingSystemHandler =
+      mock(GetBugTrackingSystemHandler.class);
+
+  private final GetIntegrationHandler getIntegrationHandler =
+      new GetIntegrationHandlerImpl(integrationServiceMapming, basicIntegrationService,
+          integrationRepository, integrationTypeRepository, projectRepository,
+          getBugTrackingSystemHandler
+      );
 
   @Test
   void getProjectIntegrationById() {
@@ -71,15 +68,11 @@ void getProjectIntegrationById() {
 
     when(projectRepository.findByName(TEST_PROJECT_NAME)).thenReturn(Optional.of(project));
 
-    when(integrationRepository.findByIdAndProjectId(emailIntegrationId,
-        projectId
-    )).thenReturn(Optional.of(IntegrationTestUtil.getProjectEmailIntegration(
-        emailIntegrationId,
-        projectId
-    )));
+    when(integrationRepository.findByIdAndProjectId(emailIntegrationId, projectId)).thenReturn(
+        Optional.of(IntegrationTestUtil.getProjectEmailIntegration(emailIntegrationId, projectId)));
 
-    IntegrationResource integrationResource = getIntegrationHandler.getProjectIntegrationById(
-        emailIntegrationId, TEST_PROJECT_NAME);
+    IntegrationResource integrationResource =
+        getIntegrationHandler.getProjectIntegrationById(emailIntegrationId, TEST_PROJECT_NAME);
 
     assertNotNull(integrationResource);
     assertEquals(emailIntegrationId, (long) integrationResource.getId());
@@ -95,11 +88,10 @@ void getGlobalIntegrationById() {
 
     final long emailIntegrationId = 1L;
     when(integrationRepository.findGlobalById(emailIntegrationId)).thenReturn(
-        Optional.of(IntegrationTestUtil.getGlobalEmailIntegration(
-            emailIntegrationId)));
+        Optional.of(IntegrationTestUtil.getGlobalEmailIntegration(emailIntegrationId)));
 
-    IntegrationResource integrationResource = getIntegrationHandler.getGlobalIntegrationById(
-        emailIntegrationId);
+    IntegrationResource integrationResource =
+        getIntegrationHandler.getGlobalIntegrationById(emailIntegrationId);
 
     assertNotNull(integrationResource);
     assertEquals("superadmin", integrationResource.getCreator());
diff --git a/src/test/java/com/epam/ta/reportportal/core/integration/plugin/impl/CreatePluginHandlerTest.java b/src/test/java/com/epam/ta/reportportal/core/integration/plugin/impl/CreatePluginHandlerTest.java
index 90094643b9..1afa7baed9 100644
--- a/src/test/java/com/epam/ta/reportportal/core/integration/plugin/impl/CreatePluginHandlerTest.java
+++ b/src/test/java/com/epam/ta/reportportal/core/integration/plugin/impl/CreatePluginHandlerTest.java
@@ -32,7 +32,7 @@
 import com.epam.ta.reportportal.core.integration.plugin.CreatePluginHandler;
 import com.epam.ta.reportportal.core.plugin.Pf4jPluginBox;
 import com.epam.ta.reportportal.core.plugin.PluginInfo;
-import com.epam.ta.reportportal.ws.model.EntryCreatedRS;
+import com.epam.ta.reportportal.model.EntryCreatedRS;
 import java.io.IOException;
 import java.io.InputStream;
 import org.junit.jupiter.api.Test;
diff --git a/src/test/java/com/epam/ta/reportportal/core/integration/plugin/impl/UpdatePluginHandlerTest.java b/src/test/java/com/epam/ta/reportportal/core/integration/plugin/impl/UpdatePluginHandlerTest.java
index 40be242554..06f2d63f9e 100644
--- a/src/test/java/com/epam/ta/reportportal/core/integration/plugin/impl/UpdatePluginHandlerTest.java
+++ b/src/test/java/com/epam/ta/reportportal/core/integration/plugin/impl/UpdatePluginHandlerTest.java
@@ -38,8 +38,8 @@
 import com.epam.ta.reportportal.entity.integration.IntegrationType;
 import com.epam.ta.reportportal.exception.ReportPortalException;
 import com.epam.ta.reportportal.filesystem.DataStore;
+import com.epam.ta.reportportal.model.integration.UpdatePluginStateRQ;
 import com.epam.ta.reportportal.ws.model.OperationCompletionRS;
-import com.epam.ta.reportportal.ws.model.integration.UpdatePluginStateRQ;
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.IOException;
diff --git a/src/test/java/com/epam/ta/reportportal/core/item/impl/UpdateTestItemHandlerImplTest.java b/src/test/java/com/epam/ta/reportportal/core/item/impl/UpdateTestItemHandlerImplTest.java
index d7b4a69dba..1615ff7296 100644
--- a/src/test/java/com/epam/ta/reportportal/core/item/impl/UpdateTestItemHandlerImplTest.java
+++ b/src/test/java/com/epam/ta/reportportal/core/item/impl/UpdateTestItemHandlerImplTest.java
@@ -43,10 +43,10 @@
 import com.epam.ta.reportportal.entity.user.User;
 import com.epam.ta.reportportal.entity.user.UserRole;
 import com.epam.ta.reportportal.exception.ReportPortalException;
+import com.epam.ta.reportportal.model.issue.DefineIssueRQ;
+import com.epam.ta.reportportal.model.item.UpdateTestItemRQ;
 import com.epam.ta.reportportal.ws.model.ErrorType;
 import com.epam.ta.reportportal.ws.model.OperationCompletionRS;
-import com.epam.ta.reportportal.ws.model.issue.DefineIssueRQ;
-import com.epam.ta.reportportal.ws.model.item.UpdateTestItemRQ;
 import com.google.common.collect.Sets;
 import java.util.Map;
 import java.util.Optional;
diff --git a/src/test/java/com/epam/ta/reportportal/core/launch/impl/FinishLaunchHandlerImplTest.java b/src/test/java/com/epam/ta/reportportal/core/launch/impl/FinishLaunchHandlerImplTest.java
index bc93573082..a73235527f 100644
--- a/src/test/java/com/epam/ta/reportportal/core/launch/impl/FinishLaunchHandlerImplTest.java
+++ b/src/test/java/com/epam/ta/reportportal/core/launch/impl/FinishLaunchHandlerImplTest.java
@@ -38,10 +38,10 @@
 import com.epam.ta.reportportal.entity.project.ProjectRole;
 import com.epam.ta.reportportal.entity.user.UserRole;
 import com.epam.ta.reportportal.exception.ReportPortalException;
-import com.epam.ta.reportportal.ws.model.BulkRQ;
+import com.epam.ta.reportportal.model.BulkRQ;
+import com.epam.ta.reportportal.model.launch.FinishLaunchRS;
 import com.epam.ta.reportportal.ws.model.FinishExecutionRQ;
 import com.epam.ta.reportportal.ws.model.OperationCompletionRS;
-import com.epam.ta.reportportal.ws.model.launch.FinishLaunchRS;
 import java.time.LocalDateTime;
 import java.time.ZoneId;
 import java.util.Date;
@@ -88,14 +88,16 @@ void finishLaunch() {
     finishExecutionRQ.setEndTime(
         Date.from(LocalDateTime.now().atZone(ZoneId.of("UTC")).toInstant()));
 
-    ReportPortalUser rpUser = getRpUser("test", UserRole.ADMINISTRATOR, ProjectRole.PROJECT_MANAGER,
-        1L);
+    ReportPortalUser rpUser =
+        getRpUser("test", UserRole.ADMINISTRATOR, ProjectRole.PROJECT_MANAGER, 1L);
 
     when(launchRepository.findByUuid("1")).thenReturn(
         getLaunch(StatusEnum.IN_PROGRESS, LaunchModeEnum.DEFAULT));
 
-    FinishLaunchRS response = handler.finishLaunch("1", finishExecutionRQ,
-        extractProjectDetails(rpUser, "test_project"), rpUser, null);
+    FinishLaunchRS response =
+        handler.finishLaunch("1", finishExecutionRQ, extractProjectDetails(rpUser, "test_project"),
+            rpUser, null
+        );
 
     verify(finishHierarchyHandler, times(1)).finishDescendants(any(), any(), any(), any(), any());
 
@@ -108,18 +110,16 @@ void finishLaunchWithLink() {
     finishExecutionRQ.setEndTime(
         Date.from(LocalDateTime.now().atZone(ZoneId.of("UTC")).toInstant()));
 
-    ReportPortalUser rpUser = getRpUser("test", UserRole.ADMINISTRATOR, ProjectRole.PROJECT_MANAGER,
-        1L);
+    ReportPortalUser rpUser =
+        getRpUser("test", UserRole.ADMINISTRATOR, ProjectRole.PROJECT_MANAGER, 1L);
 
     when(launchRepository.findByUuid("1")).thenReturn(
         getLaunch(StatusEnum.IN_PROGRESS, LaunchModeEnum.DEFAULT));
 
-    final FinishLaunchRS finishLaunchRS = handler.finishLaunch("1",
-        finishExecutionRQ,
-        extractProjectDetails(rpUser, "test_project"),
-        rpUser,
-        "http://example.com"
-    );
+    final FinishLaunchRS finishLaunchRS =
+        handler.finishLaunch("1", finishExecutionRQ, extractProjectDetails(rpUser, "test_project"),
+            rpUser, "http://example.com"
+        );
 
     verify(finishHierarchyHandler, times(1)).finishDescendants(any(), any(), any(), any(), any());
 
@@ -133,16 +133,14 @@ void stopLaunch() {
     finishExecutionRQ.setEndTime(
         Date.from(LocalDateTime.now().atZone(ZoneId.of("UTC")).toInstant()));
 
-    ReportPortalUser rpUser = getRpUser("test", UserRole.ADMINISTRATOR, ProjectRole.PROJECT_MANAGER,
-        1L);
+    ReportPortalUser rpUser =
+        getRpUser("test", UserRole.ADMINISTRATOR, ProjectRole.PROJECT_MANAGER, 1L);
 
     when(launchRepository.findById(1L)).thenReturn(
         getLaunch(StatusEnum.IN_PROGRESS, LaunchModeEnum.DEFAULT));
 
-    final OperationCompletionRS response = stopLaunchHandler.stopLaunch(1L,
-        finishExecutionRQ,
-        extractProjectDetails(rpUser, "test_project"),
-        rpUser
+    final OperationCompletionRS response = stopLaunchHandler.stopLaunch(1L, finishExecutionRQ,
+        extractProjectDetails(rpUser, "test_project"), rpUser
     );
     assertNotNull(response);
     assertEquals("Launch with ID = '1' successfully stopped.", response.getResultMessage());
@@ -160,16 +158,14 @@ void bulkStopLaunch() {
     BulkRQ<Long, FinishExecutionRQ> bulkRq = new BulkRQ<>();
     bulkRq.setEntities(entities);
 
-    ReportPortalUser rpUser = getRpUser("test", UserRole.ADMINISTRATOR, ProjectRole.PROJECT_MANAGER,
-        1L);
+    ReportPortalUser rpUser =
+        getRpUser("test", UserRole.ADMINISTRATOR, ProjectRole.PROJECT_MANAGER, 1L);
 
     when(launchRepository.findById(1L)).thenReturn(
         getLaunch(StatusEnum.IN_PROGRESS, LaunchModeEnum.DEFAULT));
 
-    final List<OperationCompletionRS> response = stopLaunchHandler.stopLaunch(bulkRq,
-        extractProjectDetails(rpUser, "test_project"),
-        rpUser
-    );
+    final List<OperationCompletionRS> response =
+        stopLaunchHandler.stopLaunch(bulkRq, extractProjectDetails(rpUser, "test_project"), rpUser);
     assertNotNull(response);
     assertEquals(1, response.size());
   }
@@ -180,16 +176,15 @@ void finishWithIncorrectStatus() {
     finishExecutionRQ.setEndTime(
         Date.from(LocalDateTime.now().atZone(ZoneId.of("UTC")).toInstant()));
 
-    final ReportPortalUser rpUser = getRpUser("test", UserRole.ADMINISTRATOR,
-        ProjectRole.PROJECT_MANAGER, 1L);
+    final ReportPortalUser rpUser =
+        getRpUser("test", UserRole.ADMINISTRATOR, ProjectRole.PROJECT_MANAGER, 1L);
 
     when(launchRepository.findByUuid("1")).thenReturn(
         getLaunch(StatusEnum.PASSED, LaunchModeEnum.DEFAULT));
 
-    assertThrows(ReportPortalException.class,
-        () -> handler.finishLaunch("1", finishExecutionRQ,
-            extractProjectDetails(rpUser, "test_project"), rpUser, null)
-    );
+    assertThrows(ReportPortalException.class, () -> handler.finishLaunch("1", finishExecutionRQ,
+        extractProjectDetails(rpUser, "test_project"), rpUser, null
+    ));
   }
 
   @Test
@@ -198,16 +193,15 @@ void finishWithIncorrectEndTime() {
     finishExecutionRQ.setEndTime(
         Date.from(LocalDateTime.now().minusHours(5).atZone(ZoneId.of("UTC")).toInstant()));
 
-    final ReportPortalUser rpUser = getRpUser("test", UserRole.ADMINISTRATOR,
-        ProjectRole.PROJECT_MANAGER, 1L);
+    final ReportPortalUser rpUser =
+        getRpUser("test", UserRole.ADMINISTRATOR, ProjectRole.PROJECT_MANAGER, 1L);
 
     when(launchRepository.findByUuid("1")).thenReturn(
         getLaunch(StatusEnum.IN_PROGRESS, LaunchModeEnum.DEFAULT));
 
-    assertThrows(ReportPortalException.class,
-        () -> handler.finishLaunch("1", finishExecutionRQ,
-            extractProjectDetails(rpUser, "test_project"), rpUser, null)
-    );
+    assertThrows(ReportPortalException.class, () -> handler.finishLaunch("1", finishExecutionRQ,
+        extractProjectDetails(rpUser, "test_project"), rpUser, null
+    ));
   }
 
   @Test
@@ -224,9 +218,11 @@ void finishNotOwnLaunch() {
 
     final ReportPortalException exception = assertThrows(ReportPortalException.class,
         () -> handler.finishLaunch("1", finishExecutionRQ,
-            extractProjectDetails(rpUser, "test_project"), rpUser, null)
+            extractProjectDetails(rpUser, "test_project"), rpUser, null
+        )
     );
     assertEquals("You do not have enough permissions. You are not launch owner.",
-        exception.getMessage());
+        exception.getMessage()
+    );
   }
 }
\ No newline at end of file
diff --git a/src/test/java/com/epam/ta/reportportal/core/launch/impl/GetLaunchHandlerImplTest.java b/src/test/java/com/epam/ta/reportportal/core/launch/impl/GetLaunchHandlerImplTest.java
index ecb75b6190..858ae21ae9 100644
--- a/src/test/java/com/epam/ta/reportportal/core/launch/impl/GetLaunchHandlerImplTest.java
+++ b/src/test/java/com/epam/ta/reportportal/core/launch/impl/GetLaunchHandlerImplTest.java
@@ -44,8 +44,8 @@
 import com.epam.ta.reportportal.entity.project.ProjectRole;
 import com.epam.ta.reportportal.entity.user.UserRole;
 import com.epam.ta.reportportal.exception.ReportPortalException;
+import com.epam.ta.reportportal.model.Page;
 import com.epam.ta.reportportal.ws.converter.converters.LaunchConverter;
-import com.epam.ta.reportportal.ws.model.Page;
 import com.epam.ta.reportportal.ws.model.launch.cluster.ClusterInfoResource;
 import java.util.List;
 import java.util.Optional;
@@ -96,8 +96,8 @@ class GetLaunchHandlerImplTest {
 
   @Test
   void getLaunchFromOtherProject() {
-    final ReportPortalUser rpUser = getRpUser("test", UserRole.ADMINISTRATOR,
-        ProjectRole.PROJECT_MANAGER, 2L);
+    final ReportPortalUser rpUser =
+        getRpUser("test", UserRole.ADMINISTRATOR, ProjectRole.PROJECT_MANAGER, 2L);
     when(launchRepository.findById(1L)).thenReturn(
         getLaunch(StatusEnum.FAILED, LaunchModeEnum.DEFAULT));
 
@@ -125,7 +125,8 @@ void getLaunchNamesIncorrectInput() {
 
     assertThrows(ReportPortalException.class,
         () -> handler.getLaunchNames(extractProjectDetails(rpUser, "test_project"),
-            RandomStringUtils.random(257))
+            RandomStringUtils.random(257)
+        )
     );
   }
 
@@ -150,10 +151,12 @@ void getLaunchByNotExistProjectName() {
 
     ReportPortalException exception = assertThrows(ReportPortalException.class,
         () -> handler.getLaunchByProjectName(projectName, PageRequest.of(0, 10), getDefaultFilter(),
-            "user")
+            "user"
+        )
     );
     assertEquals("Project 'not_exist' not found. Did you use correct project name?",
-        exception.getMessage());
+        exception.getMessage()
+    );
   }
 
   @Test
@@ -165,7 +168,8 @@ void getLaunchByProjectNameNotFound() {
 
     ReportPortalException exception = assertThrows(ReportPortalException.class,
         () -> handler.getLaunchByProjectName(projectName, PageRequest.of(0, 10), getDefaultFilter(),
-            "user")
+            "user"
+        )
     );
     assertEquals("Launch '' not found. Did you use correct Launch ID?", exception.getMessage());
   }
@@ -173,64 +177,68 @@ void getLaunchByProjectNameNotFound() {
   @Test
   void getLaunchesByNotExistProject() {
     long projectId = 1L;
-    ReportPortalUser user = getRpUser("user", UserRole.USER, ProjectRole.PROJECT_MANAGER,
-        projectId);
+    ReportPortalUser user =
+        getRpUser("user", UserRole.USER, ProjectRole.PROJECT_MANAGER, projectId);
 
     when(projectRepository.findById(projectId)).thenReturn(Optional.empty());
 
     ReportPortalException exception = assertThrows(ReportPortalException.class,
         () -> handler.getProjectLaunches(extractProjectDetails(user, "test_project"),
-            getDefaultFilter(),
-            PageRequest.of(0, 10),
-            "user"
+            getDefaultFilter(), PageRequest.of(0, 10), "user"
         )
     );
     assertEquals("Project '1' not found. Did you use correct project name?",
-        exception.getMessage());
+        exception.getMessage()
+    );
   }
 
   @Test
   void getLatestLaunchesOnNotExistProject() {
     long projectId = 1L;
-    ReportPortalUser user = getRpUser("user", UserRole.USER, ProjectRole.PROJECT_MANAGER,
-        projectId);
+    ReportPortalUser user =
+        getRpUser("user", UserRole.USER, ProjectRole.PROJECT_MANAGER, projectId);
 
     when(projectRepository.findById(projectId)).thenReturn(Optional.empty());
 
     ReportPortalException exception = assertThrows(ReportPortalException.class,
         () -> handler.getLatestLaunches(extractProjectDetails(user, "test_project"),
-            getDefaultFilter(), PageRequest.of(0, 10))
+            getDefaultFilter(), PageRequest.of(0, 10)
+        )
     );
     assertEquals("Project '1' not found. Did you use correct project name?",
-        exception.getMessage());
+        exception.getMessage()
+    );
   }
 
   @Test
   void getOwnersWrongTerm() {
     long projectId = 1L;
-    ReportPortalUser user = getRpUser("user", UserRole.USER, ProjectRole.PROJECT_MANAGER,
-        projectId);
+    ReportPortalUser user =
+        getRpUser("user", UserRole.USER, ProjectRole.PROJECT_MANAGER, projectId);
 
     ReportPortalException exception = assertThrows(ReportPortalException.class,
         () -> handler.getOwners(extractProjectDetails(user, "test_project"), "qw",
-            LaunchModeEnum.DEFAULT.name())
+            LaunchModeEnum.DEFAULT.name()
+        )
     );
     assertEquals(
         "Incorrect filtering parameters. Length of the filtering string 'qw' is less than 3 symbols",
-        exception.getMessage());
+        exception.getMessage()
+    );
   }
 
   @Test
   void getOwnersWrongMode() {
     long projectId = 1L;
-    ReportPortalUser user = getRpUser("user", UserRole.USER, ProjectRole.PROJECT_MANAGER,
-        projectId);
+    ReportPortalUser user =
+        getRpUser("user", UserRole.USER, ProjectRole.PROJECT_MANAGER, projectId);
 
     ReportPortalException exception = assertThrows(ReportPortalException.class,
         () -> handler.getOwners(extractProjectDetails(user, "test_project"), "qwe", "incorrectMode")
     );
     assertEquals("Incorrect filtering parameters. Mode - incorrectMode doesn't exist.",
-        exception.getMessage());
+        exception.getMessage()
+    );
   }
 
   @Test
@@ -292,13 +300,13 @@ void getClusterInfo() {
 
     final Pageable pageable = PageRequest.of(1, 2);
 
-    final Page<ClusterInfoResource> expected = new Page<>(
-        List.of(new ClusterInfoResource(), new ClusterInfoResource()), 2, 1, 10);
+    final Page<ClusterInfoResource> expected =
+        new Page<>(List.of(new ClusterInfoResource(), new ClusterInfoResource()), 2, 1, 10);
 
     when(getClusterHandler.getResources(launch, pageable)).thenReturn(expected);
 
-    final Iterable<ClusterInfoResource> result = handler.getClusters(launchId,
-        extractProjectDetails(user, "test_project"), pageable);
+    final Iterable<ClusterInfoResource> result =
+        handler.getClusters(launchId, extractProjectDetails(user, "test_project"), pageable);
 
     final Page<ClusterInfoResource> castedResult = (Page<ClusterInfoResource>) result;
 
@@ -314,8 +322,7 @@ void getClusterInfo() {
   }
 
   private Filter getDefaultFilter() {
-    return Filter.builder()
-        .withTarget(Launch.class)
+    return Filter.builder().withTarget(Launch.class)
         .withCondition(FilterCondition.builder().eq(CRITERIA_LAUNCH_STATUS, "PASSED").build())
         .build();
   }
diff --git a/src/test/java/com/epam/ta/reportportal/core/launch/impl/UpdateLaunchHandlerImplTest.java b/src/test/java/com/epam/ta/reportportal/core/launch/impl/UpdateLaunchHandlerImplTest.java
index e6ee281289..2b0fe871d4 100644
--- a/src/test/java/com/epam/ta/reportportal/core/launch/impl/UpdateLaunchHandlerImplTest.java
+++ b/src/test/java/com/epam/ta/reportportal/core/launch/impl/UpdateLaunchHandlerImplTest.java
@@ -44,9 +44,9 @@
 import com.epam.ta.reportportal.entity.project.ProjectRole;
 import com.epam.ta.reportportal.entity.user.UserRole;
 import com.epam.ta.reportportal.exception.ReportPortalException;
+import com.epam.ta.reportportal.model.launch.UpdateLaunchRQ;
+import com.epam.ta.reportportal.model.launch.cluster.CreateClustersRQ;
 import com.epam.ta.reportportal.ws.model.launch.Mode;
-import com.epam.ta.reportportal.ws.model.launch.UpdateLaunchRQ;
-import com.epam.ta.reportportal.ws.model.launch.cluster.CreateClustersRQ;
 import java.util.Map;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
@@ -92,7 +92,8 @@ void updateNotOwnLaunch() {
         getLaunch(StatusEnum.PASSED, LaunchModeEnum.DEFAULT));
     final ReportPortalException exception = assertThrows(ReportPortalException.class,
         () -> handler.updateLaunch(1L, extractProjectDetails(rpUser, "test_project"), rpUser,
-            new UpdateLaunchRQ())
+            new UpdateLaunchRQ()
+        )
     );
     assertEquals("You do not have enough permissions.", exception.getMessage());
   }
@@ -110,7 +111,8 @@ void updateDebugLaunchByCustomer() {
 
     final ReportPortalException exception = assertThrows(ReportPortalException.class,
         () -> handler.updateLaunch(1L, extractProjectDetails(rpUser, "test_project"), rpUser,
-            updateLaunchRQ)
+            updateLaunchRQ
+        )
     );
     assertEquals("You do not have enough permissions.", exception.getMessage());
   }
@@ -128,11 +130,13 @@ void createClustersLaunchInProgress() {
 
     final ReportPortalException exception = assertThrows(ReportPortalException.class,
         () -> handler.createClusters(createClustersRQ,
-            extractProjectDetails(rpUser, "test_project"), rpUser)
+            extractProjectDetails(rpUser, "test_project"), rpUser
+        )
     );
     assertEquals("Incorrect Request. Cannot analyze launch in progress.", exception.getMessage());
     verify(launchAccessValidator, times(1)).validate(any(Launch.class),
-        any(ReportPortalUser.ProjectDetails.class), eq(rpUser));
+        any(ReportPortalUser.ProjectDetails.class), eq(rpUser)
+    );
   }
 
   @Test
@@ -156,10 +160,11 @@ void createClusters() {
     handler.createClusters(createClustersRQ, extractProjectDetails(rpUser, "test_project"), rpUser);
 
     verify(launchAccessValidator, times(1)).validate(any(Launch.class),
-        any(ReportPortalUser.ProjectDetails.class), eq(rpUser));
+        any(ReportPortalUser.ProjectDetails.class), eq(rpUser)
+    );
 
-    final ArgumentCaptor<ClusterEntityContext> contextCaptor = ArgumentCaptor.forClass(
-        ClusterEntityContext.class);
+    final ArgumentCaptor<ClusterEntityContext> contextCaptor =
+        ArgumentCaptor.forClass(ClusterEntityContext.class);
     final ArgumentCaptor<Map<String, String>> mapCaptor = ArgumentCaptor.forClass(Map.class);
     verify(starter, times(1)).start(contextCaptor.capture(), mapCaptor.capture());
 
diff --git a/src/test/java/com/epam/ta/reportportal/core/launch/util/MergeLaunchesSerializerTest.java b/src/test/java/com/epam/ta/reportportal/core/launch/util/MergeLaunchesSerializerTest.java
new file mode 100644
index 0000000000..05774d118a
--- /dev/null
+++ b/src/test/java/com/epam/ta/reportportal/core/launch/util/MergeLaunchesSerializerTest.java
@@ -0,0 +1,72 @@
+/*
+ * 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.ta.reportportal.core.launch.util;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+import com.epam.ta.reportportal.model.launch.MergeLaunchesRQ;
+import com.epam.ta.reportportal.ws.model.attribute.ItemAttributeResource;
+import com.epam.ta.reportportal.ws.model.launch.Mode;
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import java.io.IOException;
+import java.nio.charset.StandardCharsets;
+import java.util.Collections;
+import java.util.Date;
+import org.junit.jupiter.api.Test;
+
+/**
+ * @author Pavel Bortnik
+ */
+public class MergeLaunchesSerializerTest {
+
+  private static final String EXPECTED_JSON = "{\"name\":\"name\","
+      + "\"description\":\"description\",\"attributes\":[{\"key\":\"key\",\"value\":\"value\"}],\"startTime\":0,\"mode\":\"DEFAULT\","
+      + "\"launches\":[1],\"endTime\":1,\"mergeType\":\"BASIC\",\"extendSuitesDescription\":true}";
+
+  private ObjectMapper om = new ObjectMapper();
+
+  @Test
+  public void testSerializer() throws JsonProcessingException {
+    MergeLaunchesRQ rq = getMergeLaunches();
+    String json = om.writeValueAsString(rq);
+    assertEquals(json, EXPECTED_JSON, "Incorrect serialization result");
+  }
+
+  @Test
+  public void testDeserializer() throws IOException {
+    MergeLaunchesRQ rq =
+        om.readValue(EXPECTED_JSON.getBytes(StandardCharsets.UTF_8), MergeLaunchesRQ.class);
+    assertEquals(getMergeLaunches(), rq, "Incorrect deserialization result");
+  }
+
+  private MergeLaunchesRQ getMergeLaunches() {
+    MergeLaunchesRQ rq = new MergeLaunchesRQ();
+    rq.setName("name");
+    rq.setDescription("description");
+    rq.setMode(Mode.DEFAULT);
+    rq.setStartTime(new Date(0));
+    ItemAttributeResource itemAttributeResource = new ItemAttributeResource("key", "value");
+    rq.setAttributes(Collections.singleton(itemAttributeResource));
+    rq.setEndTime(new Date(1));
+    rq.setExtendSuitesDescription(true);
+    rq.setLaunches(Collections.singleton(1L));
+    rq.setMergeStrategyType("BASIC");
+    return rq;
+  }
+
+}
diff --git a/src/test/java/com/epam/ta/reportportal/core/project/impl/CreateProjectHandlerImplTest.java b/src/test/java/com/epam/ta/reportportal/core/project/impl/CreateProjectHandlerImplTest.java
index 2dd97504e0..097ad52f90 100644
--- a/src/test/java/com/epam/ta/reportportal/core/project/impl/CreateProjectHandlerImplTest.java
+++ b/src/test/java/com/epam/ta/reportportal/core/project/impl/CreateProjectHandlerImplTest.java
@@ -27,7 +27,7 @@
 import com.epam.ta.reportportal.entity.project.ProjectRole;
 import com.epam.ta.reportportal.entity.user.UserRole;
 import com.epam.ta.reportportal.exception.ReportPortalException;
-import com.epam.ta.reportportal.ws.model.project.CreateProjectRQ;
+import com.epam.ta.reportportal.model.project.CreateProjectRQ;
 import java.util.Optional;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
@@ -52,8 +52,8 @@ class CreateProjectHandlerImplTest {
 
   @Test
   void createProjectWithWrongType() {
-    ReportPortalUser rpUser = getRpUser("user", UserRole.ADMINISTRATOR, ProjectRole.PROJECT_MANAGER,
-        1L);
+    ReportPortalUser rpUser =
+        getRpUser("user", UserRole.ADMINISTRATOR, ProjectRole.PROJECT_MANAGER, 1L);
 
     CreateProjectRQ createProjectRQ = new CreateProjectRQ();
     String projectName = "projectName";
@@ -64,16 +64,18 @@ void createProjectWithWrongType() {
         Optional.empty());
 
     ReportPortalException exception = assertThrows(ReportPortalException.class,
-        () -> handler.createProject(createProjectRQ, rpUser));
+        () -> handler.createProject(createProjectRQ, rpUser)
+    );
 
     assertEquals("Error in handled Request. Please, check specified parameters: 'wrongType'",
-        exception.getMessage());
+        exception.getMessage()
+    );
   }
 
   @Test
   void createProjectByNotExistUser() {
-    ReportPortalUser rpUser = getRpUser("user", UserRole.ADMINISTRATOR, ProjectRole.PROJECT_MANAGER,
-        1L);
+    ReportPortalUser rpUser =
+        getRpUser("user", UserRole.ADMINISTRATOR, ProjectRole.PROJECT_MANAGER, 1L);
 
     CreateProjectRQ createProjectRQ = new CreateProjectRQ();
     String projectName = "projectName";
@@ -85,7 +87,8 @@ void createProjectByNotExistUser() {
     when(userRepository.findRawById(rpUser.getUserId())).thenReturn(Optional.empty());
 
     ReportPortalException exception = assertThrows(ReportPortalException.class,
-        () -> handler.createProject(createProjectRQ, rpUser));
+        () -> handler.createProject(createProjectRQ, rpUser)
+    );
 
     assertEquals("User 'user' not found.", exception.getMessage());
   }
diff --git a/src/test/java/com/epam/ta/reportportal/core/project/impl/GetProjectHandlerImplTest.java b/src/test/java/com/epam/ta/reportportal/core/project/impl/GetProjectHandlerImplTest.java
index 9b371960d5..254b719e85 100644
--- a/src/test/java/com/epam/ta/reportportal/core/project/impl/GetProjectHandlerImplTest.java
+++ b/src/test/java/com/epam/ta/reportportal/core/project/impl/GetProjectHandlerImplTest.java
@@ -16,6 +16,14 @@
 
 package com.epam.ta.reportportal.core.project.impl;
 
+import static com.epam.ta.reportportal.ReportPortalUserUtil.getRpUser;
+import static com.epam.ta.reportportal.commons.querygen.constant.UserCriteriaConstant.CRITERIA_ROLE;
+import static com.epam.ta.reportportal.util.TestProjectExtractor.extractProjectDetails;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.mockito.Mockito.when;
+
 import com.epam.ta.reportportal.commons.ReportPortalUser;
 import com.epam.ta.reportportal.commons.querygen.Filter;
 import com.epam.ta.reportportal.commons.querygen.FilterCondition;
@@ -25,7 +33,8 @@
 import com.epam.ta.reportportal.entity.user.User;
 import com.epam.ta.reportportal.entity.user.UserRole;
 import com.epam.ta.reportportal.exception.ReportPortalException;
-import com.epam.ta.reportportal.ws.model.user.UserResource;
+import com.epam.ta.reportportal.model.user.UserResource;
+import java.util.Optional;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
 import org.mockito.InjectMocks;
@@ -33,97 +42,99 @@
 import org.mockito.junit.jupiter.MockitoExtension;
 import org.springframework.data.domain.PageRequest;
 
-import java.util.Optional;
-
-import static com.epam.ta.reportportal.ReportPortalUserUtil.getRpUser;
-import static com.epam.ta.reportportal.commons.querygen.constant.UserCriteriaConstant.CRITERIA_ROLE;
-import static com.epam.ta.reportportal.util.TestProjectExtractor.extractProjectDetails;
-import static org.junit.jupiter.api.Assertions.*;
-import static org.mockito.Mockito.when;
-
 /**
  * @author <a href="mailto:ihar_kahadouski@epam.com">Ihar Kahadouski</a>
  */
 @ExtendWith(MockitoExtension.class)
 class GetProjectHandlerImplTest {
 
-	@Mock
-	private ProjectRepository projectRepository;
-
-	@InjectMocks
-	private GetProjectHandlerImpl handler;
-
-	@Test
-	void getUsersOnNotExistProject() {
-		long projectId = 1L;
-
-		String projectName = "test_project";
-		when(projectRepository.findByName(projectName)).thenReturn(Optional.empty());
-
-		ReportPortalException exception = assertThrows(ReportPortalException.class, () -> {
-					handler.getProjectUsers(projectName,
-							Filter.builder()
-									.withTarget(User.class)
-									.withCondition(FilterCondition.builder().eq(CRITERIA_ROLE, UserRole.USER.name()).build())
-									.build(),
-							PageRequest.of(0, 10)
-					);
-				}
-		);
-
-		assertEquals("Project 'test_project' not found. Did you use correct project name?", exception.getMessage());
-	}
-
-	@Test
-	void getEmptyUserList() {
-		long projectId = 1L;
-
-		String projectName = "test_project";
-		when(projectRepository.findByName(projectName)).thenReturn(Optional.of(new Project()));
-
-		Iterable<UserResource> users = handler.getProjectUsers(projectName,
-				Filter.builder()
-						.withTarget(User.class)
-						.withCondition(FilterCondition.builder().eq(CRITERIA_ROLE, UserRole.USER.name()).build())
-						.build(),
-				PageRequest.of(0, 10)
-		);
-
-		assertFalse(users.iterator().hasNext());
-	}
-
-	@Test
-	void getNotExistProject() {
-		String projectName = "not_exist";
-		long projectId = 1L;
-		ReportPortalUser user = getRpUser("user", UserRole.USER, ProjectRole.PROJECT_MANAGER, projectId);
-
-		when(projectRepository.findByName(projectName)).thenReturn(Optional.empty());
-
-		ReportPortalException exception = assertThrows(ReportPortalException.class, () -> handler.getResource(projectName, user));
-
-		assertEquals("Project '" + projectName + "' not found. Did you use correct project name?", exception.getMessage());
-	}
-
-	@Test
-	void getUserNamesByIncorrectTerm() {
-		long projectId = 1L;
-		ReportPortalUser user = getRpUser("user", UserRole.USER, ProjectRole.PROJECT_MANAGER, projectId);
-
-		ReportPortalException exception = assertThrows(ReportPortalException.class,
-				() -> handler.getUserNames(extractProjectDetails(user, "test_project"), "")
-		);
-
-		assertEquals(
-				"Incorrect filtering parameters. Length of the filtering string '' is less than 1 symbol",
-				exception.getMessage());
-	}
-
-	@Test
-	void getUserNamesNegative() {
-		ReportPortalException exception = assertThrows(ReportPortalException.class, () -> handler.getUserNames("",
-				new ReportPortalUser.ProjectDetails(1L, "superadmin_personal", ProjectRole.PROJECT_MANAGER),
-				PageRequest.of(0, 10)));
-		assertEquals("Incorrect filtering parameters. Length of the filtering string '' is less than 1 symbol", exception.getMessage());
-	}
+  @Mock
+  private ProjectRepository projectRepository;
+
+  @InjectMocks
+  private GetProjectHandlerImpl handler;
+
+  @Test
+  void getUsersOnNotExistProject() {
+    long projectId = 1L;
+
+    String projectName = "test_project";
+    when(projectRepository.findByName(projectName)).thenReturn(Optional.empty());
+
+    ReportPortalException exception = assertThrows(ReportPortalException.class, () -> {
+      handler.getProjectUsers(projectName, Filter.builder().withTarget(User.class).withCondition(
+              FilterCondition.builder().eq(CRITERIA_ROLE, UserRole.USER.name()).build()).build(),
+          PageRequest.of(0, 10)
+      );
+    });
+
+    assertEquals(
+        "Project 'test_project' not found. Did you use correct project name?",
+        exception.getMessage()
+    );
+  }
+
+  @Test
+  void getEmptyUserList() {
+    long projectId = 1L;
+
+    String projectName = "test_project";
+    when(projectRepository.findByName(projectName)).thenReturn(Optional.of(new Project()));
+
+    Iterable<UserResource> users =
+        handler.getProjectUsers(projectName, Filter.builder().withTarget(User.class).withCondition(
+                FilterCondition.builder().eq(CRITERIA_ROLE, UserRole.USER.name()).build()).build(),
+            PageRequest.of(0, 10)
+        );
+
+    assertFalse(users.iterator().hasNext());
+  }
+
+  @Test
+  void getNotExistProject() {
+    String projectName = "not_exist";
+    long projectId = 1L;
+    ReportPortalUser user =
+        getRpUser("user", UserRole.USER, ProjectRole.PROJECT_MANAGER, projectId);
+
+    when(projectRepository.findByName(projectName)).thenReturn(Optional.empty());
+
+    ReportPortalException exception =
+        assertThrows(ReportPortalException.class, () -> handler.getResource(projectName, user));
+
+    assertEquals(
+        "Project '" + projectName + "' not found. Did you use correct project name?",
+        exception.getMessage()
+    );
+  }
+
+  @Test
+  void getUserNamesByIncorrectTerm() {
+    long projectId = 1L;
+    ReportPortalUser user =
+        getRpUser("user", UserRole.USER, ProjectRole.PROJECT_MANAGER, projectId);
+
+    ReportPortalException exception = assertThrows(ReportPortalException.class,
+        () -> handler.getUserNames(extractProjectDetails(user, "test_project"), "")
+    );
+
+    assertEquals(
+        "Incorrect filtering parameters. Length of the filtering string '' is less than 1 symbol",
+        exception.getMessage()
+    );
+  }
+
+  @Test
+  void getUserNamesNegative() {
+    ReportPortalException exception = assertThrows(
+        ReportPortalException.class, () -> handler.getUserNames("",
+            new ReportPortalUser.ProjectDetails(1L, "superadmin_personal",
+                ProjectRole.PROJECT_MANAGER
+            ), PageRequest.of(0, 10)
+        ));
+    assertEquals(
+        "Incorrect filtering parameters. Length of the filtering string '' is less than 1 symbol",
+        exception.getMessage()
+    );
+  }
 }
\ No newline at end of file
diff --git a/src/test/java/com/epam/ta/reportportal/core/project/impl/ProjectInfoWidgetDataConverterTest.java b/src/test/java/com/epam/ta/reportportal/core/project/impl/ProjectInfoWidgetDataConverterTest.java
index 71e7b91f3b..0d0a96ca88 100644
--- a/src/test/java/com/epam/ta/reportportal/core/project/impl/ProjectInfoWidgetDataConverterTest.java
+++ b/src/test/java/com/epam/ta/reportportal/core/project/impl/ProjectInfoWidgetDataConverterTest.java
@@ -30,7 +30,7 @@
 import com.epam.ta.reportportal.entity.launch.Launch;
 import com.epam.ta.reportportal.entity.statistics.Statistics;
 import com.epam.ta.reportportal.entity.statistics.StatisticsField;
-import com.epam.ta.reportportal.ws.model.widget.ChartObject;
+import com.epam.ta.reportportal.model.widget.ChartObject;
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.Sets;
 import java.time.DayOfWeek;
@@ -72,11 +72,9 @@ void setUp() {
             .put(InfoInterval.SIX_MONTHS, ProjectInfoWidgetDataConverter.ProjectInfoGroup.BY_WEEK)
             .build());
 
-    thisWeekFormattedDate = LocalDate.now(ZoneOffset.UTC)
-        .format(new DateTimeFormatterBuilder().appendValue(IsoFields.WEEK_BASED_YEAR, 4)
-            .appendLiteral("-W")
-            .appendValue(IsoFields.WEEK_OF_WEEK_BASED_YEAR, 2)
-            .toFormatter());
+    thisWeekFormattedDate = LocalDate.now(ZoneOffset.UTC).format(
+        new DateTimeFormatterBuilder().appendValue(IsoFields.WEEK_BASED_YEAR, 4).appendLiteral("-W")
+            .appendValue(IsoFields.WEEK_OF_WEEK_BASED_YEAR, 2).toFormatter());
 
     DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd");
 
@@ -90,20 +88,22 @@ void setUp() {
 
   @Test
   void getInvestigatedProjectInfo() {
-    Map<String, List<ChartObject>> investigatedProjectInfo = converter.getInvestigatedProjectInfo(
-        getTestData(),
-        InfoInterval.ONE_MONTH
-    );
+    Map<String, List<ChartObject>> investigatedProjectInfo =
+        converter.getInvestigatedProjectInfo(getTestData(), InfoInterval.ONE_MONTH);
 
     assertEquals("33.33",
-        investigatedProjectInfo.get(yesterdayString).get(0).getValues().get("toInvestigate"));
+        investigatedProjectInfo.get(yesterdayString).get(0).getValues().get("toInvestigate")
+    );
     assertEquals("66.67",
-        investigatedProjectInfo.get(yesterdayString).get(0).getValues().get("investigated"));
+        investigatedProjectInfo.get(yesterdayString).get(0).getValues().get("investigated")
+    );
 
     assertEquals("38.46",
-        investigatedProjectInfo.get(todayString).get(0).getValues().get("toInvestigate"));
+        investigatedProjectInfo.get(todayString).get(0).getValues().get("toInvestigate")
+    );
     assertEquals("61.54",
-        investigatedProjectInfo.get(todayString).get(0).getValues().get("investigated"));
+        investigatedProjectInfo.get(todayString).get(0).getValues().get("investigated")
+    );
   }
 
   @Test
@@ -116,34 +116,39 @@ void getInvestigatedProjectInfoWithoutDefectsStatistics() {
     launch.setStatistics(
         Sets.newHashSet(getStatistics(EXECUTIONS_TOTAL, 5), getStatistics(EXECUTIONS_PASSED, 5)));
 
-    Map<String, List<ChartObject>> investigatedProjectInfo = converter.getInvestigatedProjectInfo(
-        Collections.singletonList(launch),
-        InfoInterval.THREE_MONTHS
-    );
+    Map<String, List<ChartObject>> investigatedProjectInfo =
+        converter.getInvestigatedProjectInfo(Collections.singletonList(launch),
+            InfoInterval.THREE_MONTHS
+        );
 
     assertEquals("0",
-        investigatedProjectInfo.get(thisWeekFormattedDate).get(0).getValues().get("toInvestigate"));
+        investigatedProjectInfo.get(thisWeekFormattedDate).get(0).getValues().get("toInvestigate")
+    );
     assertEquals("0",
-        investigatedProjectInfo.get(thisWeekFormattedDate).get(0).getValues().get("investigated"));
+        investigatedProjectInfo.get(thisWeekFormattedDate).get(0).getValues().get("investigated")
+    );
   }
 
   @Test
   void getTestCasesStatisticsProjectInfo() {
-    Map<String, List<ChartObject>> testCasesStatisticsProjectInfo = converter.getTestCasesStatisticsProjectInfo(
-        getTestData());
+    Map<String, List<ChartObject>> testCasesStatisticsProjectInfo =
+        converter.getTestCasesStatisticsProjectInfo(getTestData());
 
     assertEquals("18.0",
-        testCasesStatisticsProjectInfo.get("test_launch").get(0).getValues().get("min"));
+        testCasesStatisticsProjectInfo.get("test_launch").get(0).getValues().get("min")
+    );
     assertEquals("19.5",
-        testCasesStatisticsProjectInfo.get("test_launch").get(0).getValues().get("avg"));
+        testCasesStatisticsProjectInfo.get("test_launch").get(0).getValues().get("avg")
+    );
     assertEquals("21.0",
-        testCasesStatisticsProjectInfo.get("test_launch").get(0).getValues().get("max"));
+        testCasesStatisticsProjectInfo.get("test_launch").get(0).getValues().get("max")
+    );
   }
 
   @Test
   void getLaunchesQuantity() {
-    Map<String, List<ChartObject>> launchesQuantity = converter.getLaunchesQuantity(getTestData(),
-        InfoInterval.ONE_MONTH);
+    Map<String, List<ChartObject>> launchesQuantity =
+        converter.getLaunchesQuantity(getTestData(), InfoInterval.ONE_MONTH);
 
     assertEquals("1", launchesQuantity.get(yesterdayString).get(0).getValues().get("count"));
     assertEquals("1", launchesQuantity.get(todayString).get(0).getValues().get("count"));
@@ -151,16 +156,16 @@ void getLaunchesQuantity() {
 
   @Test
   void getLaunchesQuantityByWeek() {
-    Map<String, List<ChartObject>> launchesQuantity = converter.getLaunchesQuantity(getTestData(),
-        InfoInterval.THREE_MONTHS);
+    Map<String, List<ChartObject>> launchesQuantity =
+        converter.getLaunchesQuantity(getTestData(), InfoInterval.THREE_MONTHS);
 
     assertEquals("2", launchesQuantity.get(thisWeekFormattedDate).get(0).getValues().get("count"));
   }
 
   @Test
   void getLaunchesIssues() {
-    Map<String, List<ChartObject>> launchesIssues = converter.getLaunchesIssues(getTestData(),
-        InfoInterval.ONE_MONTH);
+    Map<String, List<ChartObject>> launchesIssues =
+        converter.getLaunchesIssues(getTestData(), InfoInterval.ONE_MONTH);
 
     assertEquals("3", launchesIssues.get(yesterdayString).get(0).getValues().get("systemIssue"));
     assertEquals("4", launchesIssues.get(yesterdayString).get(0).getValues().get("toInvestigate"));
@@ -175,17 +180,21 @@ void getLaunchesIssues() {
 
   @Test
   void getLaunchesIssuesByWeek() {
-    Map<String, List<ChartObject>> launchesIssues = converter.getLaunchesIssues(getTestData(),
-        InfoInterval.THREE_MONTHS);
+    Map<String, List<ChartObject>> launchesIssues =
+        converter.getLaunchesIssues(getTestData(), InfoInterval.THREE_MONTHS);
 
     assertEquals("6",
-        launchesIssues.get(thisWeekFormattedDate).get(0).getValues().get("systemIssue"));
+        launchesIssues.get(thisWeekFormattedDate).get(0).getValues().get("systemIssue")
+    );
     assertEquals("9",
-        launchesIssues.get(thisWeekFormattedDate).get(0).getValues().get("toInvestigate"));
+        launchesIssues.get(thisWeekFormattedDate).get(0).getValues().get("toInvestigate")
+    );
     assertEquals("3",
-        launchesIssues.get(thisWeekFormattedDate).get(0).getValues().get("productBug"));
+        launchesIssues.get(thisWeekFormattedDate).get(0).getValues().get("productBug")
+    );
     assertEquals("7",
-        launchesIssues.get(thisWeekFormattedDate).get(0).getValues().get("automationBug"));
+        launchesIssues.get(thisWeekFormattedDate).get(0).getValues().get("automationBug")
+    );
   }
 
   private List<Launch> getTestData() {
@@ -194,29 +203,27 @@ private List<Launch> getTestData() {
     launch1.setId(1L);
     launch1.setNumber(1L);
     launch1.setStartTime(LocalDateTime.of(yesterday, LocalTime.now(ZoneOffset.UTC)));
-    launch1.setStatistics(Sets.newHashSet(getStatistics(EXECUTIONS_TOTAL, 18),
-        getStatistics(EXECUTIONS_PASSED, 5),
-        getStatistics(EXECUTIONS_SKIPPED, 1),
-        getStatistics(EXECUTIONS_FAILED, 12),
-        getStatistics(DEFECTS_AUTOMATION_BUG_TOTAL, 3),
-        getStatistics(DEFECTS_PRODUCT_BUG_TOTAL, 2),
-        getStatistics(DEFECTS_SYSTEM_ISSUE_TOTAL, 3),
-        getStatistics(DEFECTS_TO_INVESTIGATE_TOTAL, 4)
-    ));
+    launch1.setStatistics(
+        Sets.newHashSet(getStatistics(EXECUTIONS_TOTAL, 18), getStatistics(EXECUTIONS_PASSED, 5),
+            getStatistics(EXECUTIONS_SKIPPED, 1), getStatistics(EXECUTIONS_FAILED, 12),
+            getStatistics(DEFECTS_AUTOMATION_BUG_TOTAL, 3),
+            getStatistics(DEFECTS_PRODUCT_BUG_TOTAL, 2),
+            getStatistics(DEFECTS_SYSTEM_ISSUE_TOTAL, 3),
+            getStatistics(DEFECTS_TO_INVESTIGATE_TOTAL, 4)
+        ));
     Launch launch2 = new Launch();
     launch2.setName("test_launch");
     launch2.setId(2L);
     launch2.setNumber(2L);
     launch2.setStartTime(LocalDateTime.of(today, LocalTime.now(ZoneOffset.UTC)));
-    launch2.setStatistics(Sets.newHashSet(getStatistics(EXECUTIONS_TOTAL, 21),
-        getStatistics(EXECUTIONS_PASSED, 6),
-        getStatistics(EXECUTIONS_SKIPPED, 2),
-        getStatistics(EXECUTIONS_FAILED, 13),
-        getStatistics(DEFECTS_AUTOMATION_BUG_TOTAL, 4),
-        getStatistics(DEFECTS_PRODUCT_BUG_TOTAL, 1),
-        getStatistics(DEFECTS_SYSTEM_ISSUE_TOTAL, 3),
-        getStatistics(DEFECTS_TO_INVESTIGATE_TOTAL, 5)
-    ));
+    launch2.setStatistics(
+        Sets.newHashSet(getStatistics(EXECUTIONS_TOTAL, 21), getStatistics(EXECUTIONS_PASSED, 6),
+            getStatistics(EXECUTIONS_SKIPPED, 2), getStatistics(EXECUTIONS_FAILED, 13),
+            getStatistics(DEFECTS_AUTOMATION_BUG_TOTAL, 4),
+            getStatistics(DEFECTS_PRODUCT_BUG_TOTAL, 1),
+            getStatistics(DEFECTS_SYSTEM_ISSUE_TOTAL, 3),
+            getStatistics(DEFECTS_TO_INVESTIGATE_TOTAL, 5)
+        ));
     return Arrays.asList(launch1, launch2);
   }
 
diff --git a/src/test/java/com/epam/ta/reportportal/core/project/settings/impl/CreateProjectSettingsHandlerImplTest.java b/src/test/java/com/epam/ta/reportportal/core/project/settings/impl/CreateProjectSettingsHandlerImplTest.java
index efa9b5b70c..3cd1ed4db7 100644
--- a/src/test/java/com/epam/ta/reportportal/core/project/settings/impl/CreateProjectSettingsHandlerImplTest.java
+++ b/src/test/java/com/epam/ta/reportportal/core/project/settings/impl/CreateProjectSettingsHandlerImplTest.java
@@ -32,8 +32,8 @@
 import com.epam.ta.reportportal.entity.project.ProjectRole;
 import com.epam.ta.reportportal.entity.user.UserRole;
 import com.epam.ta.reportportal.exception.ReportPortalException;
+import com.epam.ta.reportportal.model.project.config.CreateIssueSubTypeRQ;
 import com.epam.ta.reportportal.ws.model.ValidationConstraints;
-import com.epam.ta.reportportal.ws.model.project.config.CreateIssueSubTypeRQ;
 import java.util.HashSet;
 import java.util.Optional;
 import java.util.Set;
@@ -58,8 +58,8 @@ class CreateProjectSettingsHandlerImplTest {
   @Test
   void createSubtypeOnNotExistProject() {
     long projectId = 1L;
-    ReportPortalUser user = getRpUser("user", UserRole.USER, ProjectRole.PROJECT_MANAGER,
-        projectId);
+    ReportPortalUser user =
+        getRpUser("user", UserRole.USER, ProjectRole.PROJECT_MANAGER, projectId);
 
     when(projectRepository.findByName(TEST_PROJECT_NAME)).thenReturn(Optional.empty());
 
@@ -68,14 +68,15 @@ void createSubtypeOnNotExistProject() {
     );
 
     assertEquals("Project 'test_project' not found. Did you use correct project name?",
-        exception.getMessage());
+        exception.getMessage()
+    );
   }
 
   @Test
   void createSubtypeWithWrongGroup() {
     long projectId = 1L;
-    ReportPortalUser user = getRpUser("user", UserRole.USER, ProjectRole.PROJECT_MANAGER,
-        projectId);
+    ReportPortalUser user =
+        getRpUser("user", UserRole.USER, ProjectRole.PROJECT_MANAGER, projectId);
 
     when(projectRepository.findByName(TEST_PROJECT_NAME)).thenReturn(Optional.of(new Project()));
 
@@ -87,7 +88,8 @@ void createSubtypeWithWrongGroup() {
     );
 
     assertEquals("Error in handled Request. Please, check specified parameters: 'wrongType'",
-        exception.getMessage());
+        exception.getMessage()
+    );
   }
 
   @Test
@@ -96,8 +98,8 @@ void maxSubtypesCount() {
     project.setProjectIssueTypes(getSubTypes());
 
     long projectId = 1L;
-    ReportPortalUser user = getRpUser("user", UserRole.USER, ProjectRole.PROJECT_MANAGER,
-        projectId);
+    ReportPortalUser user =
+        getRpUser("user", UserRole.USER, ProjectRole.PROJECT_MANAGER, projectId);
 
     when(projectRepository.findByName(TEST_PROJECT_NAME)).thenReturn(Optional.of(project));
 
@@ -109,7 +111,8 @@ void maxSubtypesCount() {
     );
 
     assertEquals("Incorrect Request. Sub Issues count is bound of size limit",
-        exception.getMessage());
+        exception.getMessage()
+    );
   }
 
   private Set<ProjectIssueType> getSubTypes() {
diff --git a/src/test/java/com/epam/ta/reportportal/core/project/settings/impl/UpdateProjectSettingsHandlerImplTest.java b/src/test/java/com/epam/ta/reportportal/core/project/settings/impl/UpdateProjectSettingsHandlerImplTest.java
index 1fc6cc5d61..08588f7001 100644
--- a/src/test/java/com/epam/ta/reportportal/core/project/settings/impl/UpdateProjectSettingsHandlerImplTest.java
+++ b/src/test/java/com/epam/ta/reportportal/core/project/settings/impl/UpdateProjectSettingsHandlerImplTest.java
@@ -28,8 +28,8 @@
 import com.epam.ta.reportportal.entity.project.ProjectRole;
 import com.epam.ta.reportportal.entity.user.UserRole;
 import com.epam.ta.reportportal.exception.ReportPortalException;
-import com.epam.ta.reportportal.ws.model.project.config.UpdateIssueSubTypeRQ;
-import com.epam.ta.reportportal.ws.model.project.config.UpdateOneIssueSubTypeRQ;
+import com.epam.ta.reportportal.model.project.config.UpdateIssueSubTypeRQ;
+import com.epam.ta.reportportal.model.project.config.UpdateOneIssueSubTypeRQ;
 import java.util.Collections;
 import java.util.Optional;
 import org.junit.jupiter.api.Test;
@@ -61,14 +61,15 @@ void emptyRequest() {
         () -> handler.updateProjectIssueSubType("test_project", user, updateIssueSubTypeRQ)
     );
     assertEquals("Forbidden operation. Please specify at least one item data for update.",
-        exception.getMessage());
+        exception.getMessage()
+    );
   }
 
   @Test
   void updateSubtypeOnNotExistProject() {
     long projectId = 1L;
-    ReportPortalUser user = getRpUser("user", UserRole.USER, ProjectRole.PROJECT_MANAGER,
-        projectId);
+    ReportPortalUser user =
+        getRpUser("user", UserRole.USER, ProjectRole.PROJECT_MANAGER, projectId);
 
     UpdateIssueSubTypeRQ updateIssueSubTypeRQ = new UpdateIssueSubTypeRQ();
     updateIssueSubTypeRQ.setIds(Collections.singletonList(new UpdateOneIssueSubTypeRQ()));
@@ -79,14 +80,15 @@ void updateSubtypeOnNotExistProject() {
         () -> handler.updateProjectIssueSubType(TEST_PROJECT_NAME, user, updateIssueSubTypeRQ)
     );
     assertEquals("Project 'test_project' not found. Did you use correct project name?",
-        exception.getMessage());
+        exception.getMessage()
+    );
   }
 
   @Test
   void updateSubtypeWithIncorrectGroup() {
     long projectId = 1L;
-    ReportPortalUser user = getRpUser("user", UserRole.USER, ProjectRole.PROJECT_MANAGER,
-        projectId);
+    ReportPortalUser user =
+        getRpUser("user", UserRole.USER, ProjectRole.PROJECT_MANAGER, projectId);
 
     UpdateIssueSubTypeRQ updateIssueSubTypeRQ = new UpdateIssueSubTypeRQ();
     UpdateOneIssueSubTypeRQ oneIssueSubTypeRQ = new UpdateOneIssueSubTypeRQ();
@@ -104,8 +106,8 @@ void updateSubtypeWithIncorrectGroup() {
   @Test
   void updateNotExistSubtype() {
     long projectId = 1L;
-    ReportPortalUser user = getRpUser("user", UserRole.USER, ProjectRole.PROJECT_MANAGER,
-        projectId);
+    ReportPortalUser user =
+        getRpUser("user", UserRole.USER, ProjectRole.PROJECT_MANAGER, projectId);
 
     UpdateIssueSubTypeRQ updateIssueSubTypeRQ = new UpdateIssueSubTypeRQ();
     UpdateOneIssueSubTypeRQ oneIssueSubTypeRQ = new UpdateOneIssueSubTypeRQ();
diff --git a/src/test/java/com/epam/ta/reportportal/core/project/settings/notification/CreateProjectNotificationHandlerImplTest.java b/src/test/java/com/epam/ta/reportportal/core/project/settings/notification/CreateProjectNotificationHandlerImplTest.java
index d9ef4bc959..83f33c3d33 100644
--- a/src/test/java/com/epam/ta/reportportal/core/project/settings/notification/CreateProjectNotificationHandlerImplTest.java
+++ b/src/test/java/com/epam/ta/reportportal/core/project/settings/notification/CreateProjectNotificationHandlerImplTest.java
@@ -35,9 +35,9 @@
 import com.epam.ta.reportportal.entity.project.email.LaunchAttributeRule;
 import com.epam.ta.reportportal.entity.project.email.SenderCase;
 import com.epam.ta.reportportal.exception.ReportPortalException;
+import com.epam.ta.reportportal.model.project.email.SenderCaseDTO;
 import com.epam.ta.reportportal.ws.converter.converters.ProjectConverter;
 import com.epam.ta.reportportal.ws.model.attribute.ItemAttributeResource;
-import com.epam.ta.reportportal.ws.model.project.email.SenderCaseDTO;
 import com.google.common.collect.Sets;
 import java.util.Collections;
 import java.util.Optional;
@@ -55,12 +55,13 @@ class CreateProjectNotificationHandlerImplTest {
   private final SenderCaseRepository senderCaseRepository = mock(SenderCaseRepository.class);
   private final MessageBus messageBus = mock(MessageBus.class);
   private final ProjectConverter projectConverter = mock(ProjectConverter.class);
-  private final ProjectNotificationValidator projectNotificationValidator = new ProjectNotificationValidator(
-      senderCaseRepository);
+  private final ProjectNotificationValidator projectNotificationValidator =
+      new ProjectNotificationValidator(senderCaseRepository);
 
-  private final CreateProjectNotificationHandlerImpl service = new CreateProjectNotificationHandlerImpl(
-      senderCaseRepository, messageBus,
-      projectConverter, projectNotificationValidator);
+  private final CreateProjectNotificationHandlerImpl service =
+      new CreateProjectNotificationHandlerImpl(senderCaseRepository, messageBus, projectConverter,
+          projectNotificationValidator
+      );
 
   private SenderCaseDTO createNotificationRQ;
   private Project project;
@@ -91,48 +92,40 @@ public void createNotificationWithExistingRuleNameTest() {
     SenderCase existingSenderCase = mock(SenderCase.class);
 
     when(senderCaseRepository.findByProjectIdAndRuleNameIgnoreCase(DEFAULT_PROJECT_ID,
-        DEFAULT_RULE_NAME))
-        .thenReturn(Optional.of(existingSenderCase));
-
-    assertEquals(
-        assertThrows(ReportPortalException.class,
-            () -> service.createNotification(project, createNotificationRQ, rpUser)
-        ).getMessage(),
-        formattedSupplier(RESOURCE_ALREADY_EXISTS.getDescription(),
-            createNotificationRQ.getRuleName()).get()
-    );
+        DEFAULT_RULE_NAME
+    )).thenReturn(Optional.of(existingSenderCase));
+
+    assertEquals(assertThrows(ReportPortalException.class,
+        () -> service.createNotification(project, createNotificationRQ, rpUser)
+    ).getMessage(), formattedSupplier(RESOURCE_ALREADY_EXISTS.getDescription(),
+        createNotificationRQ.getRuleName()
+    ).get());
   }
 
   @Test
   public void createNotificationWithNonExistingSendCaseTest() {
     createNotificationRQ.setSendCase("NonExistingSendCase");
 
-    assertEquals(
-        assertThrows(ReportPortalException.class,
-            () -> service.createNotification(project, createNotificationRQ, rpUser)
-        ).getMessage(),
-        formattedSupplier(BAD_REQUEST_ERROR.getDescription(),
-            createNotificationRQ.getSendCase()).get()
-    );
+    assertEquals(assertThrows(ReportPortalException.class,
+        () -> service.createNotification(project, createNotificationRQ, rpUser)
+    ).getMessage(), formattedSupplier(BAD_REQUEST_ERROR.getDescription(),
+        createNotificationRQ.getSendCase()
+    ).get());
   }
 
   @Test
   public void createNotificationWithNullOrEmptyRecipientsTest() {
     createNotificationRQ.setRecipients(null);
 
-    assertTrue(
-        assertThrows(ReportPortalException.class,
-            () -> service.createNotification(project, createNotificationRQ, rpUser))
-            .getMessage().contains("Recipients list should not be null")
-    );
+    assertTrue(assertThrows(ReportPortalException.class,
+        () -> service.createNotification(project, createNotificationRQ, rpUser)
+    ).getMessage().contains("Recipients list should not be null"));
 
     createNotificationRQ.setRecipients(Collections.emptyList());
 
-    assertTrue(
-        assertThrows(ReportPortalException.class,
-            () -> service.createNotification(project, createNotificationRQ, rpUser))
-            .getMessage().contains("Empty recipients list for email case")
-    );
+    assertTrue(assertThrows(ReportPortalException.class,
+        () -> service.createNotification(project, createNotificationRQ, rpUser)
+    ).getMessage().contains("Empty recipients list for email case"));
   }
 
   @Test
@@ -156,11 +149,9 @@ public void createNotificationWithDuplicateContentButWithDifferentRuleNameTest()
     when(senderCaseRepository.findAllByProjectId(DEFAULT_PROJECT_ID)).thenReturn(
         Collections.singletonList(dupeCreateNotificationRQ));
 
-    assertTrue(
-        assertThrows(ReportPortalException.class,
-            () -> service.createNotification(project, createNotificationRQ, rpUser))
-            .getMessage().contains("Project email settings contain duplicate cases")
-    );
+    assertTrue(assertThrows(ReportPortalException.class,
+        () -> service.createNotification(project, createNotificationRQ, rpUser)
+    ).getMessage().contains("Project email settings contain duplicate cases"));
   }
 
 }
diff --git a/src/test/java/com/epam/ta/reportportal/core/project/settings/notification/GetProjectNotificationsHandlerImplTest.java b/src/test/java/com/epam/ta/reportportal/core/project/settings/notification/GetProjectNotificationsHandlerImplTest.java
index 053a78687a..c9587ae914 100644
--- a/src/test/java/com/epam/ta/reportportal/core/project/settings/notification/GetProjectNotificationsHandlerImplTest.java
+++ b/src/test/java/com/epam/ta/reportportal/core/project/settings/notification/GetProjectNotificationsHandlerImplTest.java
@@ -24,7 +24,7 @@
 import com.epam.ta.reportportal.dao.SenderCaseRepository;
 import com.epam.ta.reportportal.entity.enums.LogicalOperator;
 import com.epam.ta.reportportal.entity.project.email.SenderCase;
-import com.epam.ta.reportportal.ws.model.project.email.SenderCaseDTO;
+import com.epam.ta.reportportal.model.project.email.SenderCaseDTO;
 import java.util.List;
 import org.junit.jupiter.api.Test;
 
@@ -60,8 +60,8 @@ public void getProjectNotificationsTest() {
     when(senderCaseRepository.findAllByProjectId(DEFAULT_PROJECT_ID)).thenReturn(
         List.of(senderCase1, senderCase2));
 
-    List<SenderCaseDTO> result = getProjectNotificationsHandler.getProjectNotifications(
-        DEFAULT_PROJECT_ID);
+    List<SenderCaseDTO> result =
+        getProjectNotificationsHandler.getProjectNotifications(DEFAULT_PROJECT_ID);
     assertEquals(2, result.size());
   }
 }
diff --git a/src/test/java/com/epam/ta/reportportal/core/project/settings/notification/UpdateProjectNotificationHandlerImplTest.java b/src/test/java/com/epam/ta/reportportal/core/project/settings/notification/UpdateProjectNotificationHandlerImplTest.java
index 6dc76d2921..977d65c053 100644
--- a/src/test/java/com/epam/ta/reportportal/core/project/settings/notification/UpdateProjectNotificationHandlerImplTest.java
+++ b/src/test/java/com/epam/ta/reportportal/core/project/settings/notification/UpdateProjectNotificationHandlerImplTest.java
@@ -34,9 +34,9 @@
 import com.epam.ta.reportportal.entity.project.email.LaunchAttributeRule;
 import com.epam.ta.reportportal.entity.project.email.SenderCase;
 import com.epam.ta.reportportal.exception.ReportPortalException;
+import com.epam.ta.reportportal.model.project.email.SenderCaseDTO;
 import com.epam.ta.reportportal.ws.converter.converters.ProjectConverter;
 import com.epam.ta.reportportal.ws.model.attribute.ItemAttributeResource;
-import com.epam.ta.reportportal.ws.model.project.email.SenderCaseDTO;
 import com.google.common.collect.Sets;
 import java.util.Collections;
 import java.util.List;
@@ -56,12 +56,13 @@ class UpdateProjectNotificationHandlerImplTest {
   private final SenderCaseRepository senderCaseRepository = mock(SenderCaseRepository.class);
   private final MessageBus messageBus = mock(MessageBus.class);
   private final ProjectConverter projectConverter = mock(ProjectConverter.class);
-  private final ProjectNotificationValidator projectNotificationValidator = new ProjectNotificationValidator(
-      senderCaseRepository);
+  private final ProjectNotificationValidator projectNotificationValidator =
+      new ProjectNotificationValidator(senderCaseRepository);
 
-  private final UpdateProjectNotificationHandlerImpl service = new UpdateProjectNotificationHandlerImpl(
-      senderCaseRepository, messageBus,
-      projectConverter, projectNotificationValidator);
+  private final UpdateProjectNotificationHandlerImpl service =
+      new UpdateProjectNotificationHandlerImpl(senderCaseRepository, messageBus, projectConverter,
+          projectNotificationValidator
+      );
 
   private SenderCaseDTO updateNotificationRQ;
   private Project project;
@@ -90,11 +91,9 @@ public void beforeEach() {
 
   @Test
   public void updateNonExistingNotificationTest() {
-    Assertions.assertTrue(
-        assertThrows(ReportPortalException.class,
-            () -> service.updateNotification(project, updateNotificationRQ, rpUser))
-            .getMessage().contains("Did you use correct Notification ID?")
-    );
+    Assertions.assertTrue(assertThrows(ReportPortalException.class,
+        () -> service.updateNotification(project, updateNotificationRQ, rpUser)
+    ).getMessage().contains("Did you use correct Notification ID?"));
   }
 
   @Test
@@ -106,11 +105,9 @@ public void updateNotificationButWithDifferentProjectTest() {
     when(sc.getProject()).thenReturn(scProject);
     when(senderCaseRepository.findById(any())).thenReturn(Optional.of(sc));
 
-    Assertions.assertTrue(
-        assertThrows(ReportPortalException.class,
-            () -> service.updateNotification(project, updateNotificationRQ, rpUser))
-            .getMessage().contains("Did you use correct Notification ID?")
-    );
+    Assertions.assertTrue(assertThrows(ReportPortalException.class,
+        () -> service.updateNotification(project, updateNotificationRQ, rpUser)
+    ).getMessage().contains("Did you use correct Notification ID?"));
   }
 
   @Test
@@ -123,11 +120,9 @@ public void updateNotificationWithNonExistingSendCaseTest() {
     when(senderCaseRepository.findById(any())).thenReturn(Optional.of(sc));
 
     updateNotificationRQ.setSendCase("NonExistingSendCase");
-    Assertions.assertTrue(
-        assertThrows(ReportPortalException.class,
-            () -> service.updateNotification(project, updateNotificationRQ, rpUser))
-            .getMessage().contains(updateNotificationRQ.getSendCase())
-    );
+    Assertions.assertTrue(assertThrows(ReportPortalException.class,
+        () -> service.updateNotification(project, updateNotificationRQ, rpUser)
+    ).getMessage().contains(updateNotificationRQ.getSendCase()));
   }
 
   @Test
@@ -141,17 +136,15 @@ public void updateNotificationWithNullOrEmptyRecipientsTest() {
 
     updateNotificationRQ.setRecipients(null);
     String s = assertThrows(ReportPortalException.class,
-        () -> service.updateNotification(project, updateNotificationRQ, rpUser))
-        .getMessage();
+        () -> service.updateNotification(project, updateNotificationRQ, rpUser)
+    ).getMessage();
     Assertions.assertTrue(s.contains("Recipients list should not be null"));
 
     updateNotificationRQ.setRecipients(Collections.emptyList());
 
-    Assertions.assertTrue(
-        assertThrows(ReportPortalException.class,
-            () -> service.updateNotification(project, updateNotificationRQ, rpUser))
-            .getMessage().contains("Empty recipients list for email case")
-    );
+    Assertions.assertTrue(assertThrows(ReportPortalException.class,
+        () -> service.updateNotification(project, updateNotificationRQ, rpUser)
+    ).getMessage().contains("Empty recipients list for email case"));
   }
 
   @Test
@@ -192,11 +185,9 @@ public void updateNotificationWithDuplicateContentButWithDifferentRuleNameTest()
     when(senderCaseRepository.findAllByProjectId(DEFAULT_PROJECT_ID)).thenReturn(
         List.of(modelForUpdate, dupeUpdateNotification));
 
-    assertTrue(
-        assertThrows(ReportPortalException.class,
-            () -> service.updateNotification(project, updateNotificationRQ, rpUser))
-            .getMessage().contains("Project email settings contain duplicate cases")
-    );
+    assertTrue(assertThrows(ReportPortalException.class,
+        () -> service.updateNotification(project, updateNotificationRQ, rpUser)
+    ).getMessage().contains("Project email settings contain duplicate cases"));
   }
 
 }
diff --git a/src/test/java/com/epam/ta/reportportal/core/user/impl/CreateUserHandlerImplTest.java b/src/test/java/com/epam/ta/reportportal/core/user/impl/CreateUserHandlerImplTest.java
index 0029766b77..848fa55dca 100644
--- a/src/test/java/com/epam/ta/reportportal/core/user/impl/CreateUserHandlerImplTest.java
+++ b/src/test/java/com/epam/ta/reportportal/core/user/impl/CreateUserHandlerImplTest.java
@@ -31,7 +31,6 @@
 import static org.mockito.Mockito.when;
 
 import com.epam.ta.reportportal.commons.ReportPortalUser;
-import com.epam.ta.reportportal.core.events.activity.ChangeUserTypeEvent;
 import com.epam.ta.reportportal.core.events.activity.CreateInvitationLinkEvent;
 import com.epam.ta.reportportal.core.integration.GetIntegrationHandler;
 import com.epam.ta.reportportal.core.project.GetProjectHandler;
@@ -45,10 +44,10 @@
 import com.epam.ta.reportportal.entity.user.UserCreationBid;
 import com.epam.ta.reportportal.entity.user.UserRole;
 import com.epam.ta.reportportal.exception.ReportPortalException;
+import com.epam.ta.reportportal.model.user.CreateUserRQ;
+import com.epam.ta.reportportal.model.user.CreateUserRQConfirm;
+import com.epam.ta.reportportal.model.user.CreateUserRQFull;
 import com.epam.ta.reportportal.ws.model.ErrorType;
-import com.epam.ta.reportportal.ws.model.user.CreateUserRQ;
-import com.epam.ta.reportportal.ws.model.user.CreateUserRQConfirm;
-import com.epam.ta.reportportal.ws.model.user.CreateUserRQFull;
 import java.util.Optional;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
@@ -89,8 +88,8 @@ class CreateUserHandlerImplTest {
   @Test
   void createByNotExistedAdmin() {
 
-    final ReportPortalUser rpUser = getRpUser("admin", UserRole.ADMINISTRATOR,
-        ProjectRole.PROJECT_MANAGER, 1L);
+    final ReportPortalUser rpUser =
+        getRpUser("admin", UserRole.ADMINISTRATOR, ProjectRole.PROJECT_MANAGER, 1L);
     when(userRepository.findRawById(rpUser.getUserId())).thenReturn(Optional.empty());
 
     final ReportPortalException exception = assertThrows(ReportPortalException.class,
@@ -101,8 +100,8 @@ void createByNotExistedAdmin() {
 
   @Test
   void createByNotAdmin() {
-    final ReportPortalUser rpUser = getRpUser("admin", UserRole.ADMINISTRATOR,
-        ProjectRole.PROJECT_MANAGER, 1L);
+    final ReportPortalUser rpUser =
+        getRpUser("admin", UserRole.ADMINISTRATOR, ProjectRole.PROJECT_MANAGER, 1L);
     User user = new User();
     user.setRole(UserRole.USER);
     when(userRepository.findRawById(1L)).thenReturn(Optional.of(user));
@@ -118,8 +117,8 @@ void createByNotAdmin() {
 
   @Test
   void createByAdminUserAlreadyExists() {
-    final ReportPortalUser rpUser = getRpUser("admin", UserRole.ADMINISTRATOR,
-        ProjectRole.PROJECT_MANAGER, 1L);
+    final ReportPortalUser rpUser =
+        getRpUser("admin", UserRole.ADMINISTRATOR, ProjectRole.PROJECT_MANAGER, 1L);
     User creator = new User();
     creator.setRole(UserRole.ADMINISTRATOR);
 
@@ -132,13 +131,14 @@ void createByAdminUserAlreadyExists() {
         () -> handler.createUserByAdmin(request, rpUser, "url")
     );
     assertEquals("User with 'login='new_user'' already exists. You couldn't create the duplicate.",
-        exception.getMessage());
+        exception.getMessage()
+    );
   }
 
   @Test
   void createByAdminWithIncorrectName() {
-    final ReportPortalUser rpUser = getRpUser("admin", UserRole.ADMINISTRATOR,
-        ProjectRole.PROJECT_MANAGER, 1L);
+    final ReportPortalUser rpUser =
+        getRpUser("admin", UserRole.ADMINISTRATOR, ProjectRole.PROJECT_MANAGER, 1L);
     User creator = new User();
     creator.setRole(UserRole.ADMINISTRATOR);
     doReturn(Optional.of(creator)).when(userRepository).findRawById(rpUser.getUserId());
@@ -150,13 +150,14 @@ void createByAdminWithIncorrectName() {
         () -> handler.createUserByAdmin(request, rpUser, "url")
     );
     assertEquals("Incorrect Request. Username '#$$/' consists only of special characters",
-        exception.getMessage());
+        exception.getMessage()
+    );
   }
 
   @Test
   void createByAdminWithIncorrectEmail() {
-    final ReportPortalUser rpUser = getRpUser("admin", UserRole.ADMINISTRATOR,
-        ProjectRole.PROJECT_MANAGER, 1L);
+    final ReportPortalUser rpUser =
+        getRpUser("admin", UserRole.ADMINISTRATOR, ProjectRole.PROJECT_MANAGER, 1L);
     User creator = new User();
     creator.setRole(UserRole.ADMINISTRATOR);
     doReturn(Optional.of(creator)).when(userRepository).findRawById(rpUser.getUserId());
@@ -170,13 +171,14 @@ void createByAdminWithIncorrectEmail() {
     );
     assertEquals(
         "Error in handled Request. Please, check specified parameters: 'email='incorrect@email''",
-        exception.getMessage());
+        exception.getMessage()
+    );
   }
 
   @Test
   void createByAdminWithExistedEmail() {
-    final ReportPortalUser rpUser = getRpUser("admin", UserRole.ADMINISTRATOR,
-        ProjectRole.PROJECT_MANAGER, 1L);
+    final ReportPortalUser rpUser =
+        getRpUser("admin", UserRole.ADMINISTRATOR, ProjectRole.PROJECT_MANAGER, 1L);
     User creator = new User();
     creator.setRole(UserRole.ADMINISTRATOR);
     doReturn(Optional.of(creator)).when(userRepository).findRawById(rpUser.getUserId());
@@ -191,13 +193,14 @@ void createByAdminWithExistedEmail() {
     );
     assertEquals(
         "User with 'email='correct@domain.com'' already exists. You couldn't create the duplicate.",
-        exception.getMessage());
+        exception.getMessage()
+    );
   }
 
   @Test
   void createByAdminWithExistedEmailUppercase() {
-    final ReportPortalUser rpUser = getRpUser("admin", UserRole.ADMINISTRATOR,
-        ProjectRole.PROJECT_MANAGER, 1L);
+    final ReportPortalUser rpUser =
+        getRpUser("admin", UserRole.ADMINISTRATOR, ProjectRole.PROJECT_MANAGER, 1L);
     User creator = new User();
     creator.setRole(UserRole.ADMINISTRATOR);
     doReturn(Optional.of(creator)).when(userRepository).findRawById(rpUser.getUserId());
@@ -212,13 +215,14 @@ void createByAdminWithExistedEmailUppercase() {
     );
     assertEquals(
         "User with 'email='CORRECT@domain.com'' already exists. You couldn't create the duplicate.",
-        exception.getMessage());
+        exception.getMessage()
+    );
   }
 
   @Test
   void createUserBid() {
-    final ReportPortalUser rpUser = getRpUser("admin", UserRole.ADMINISTRATOR, ProjectRole.MEMBER,
-        1L);
+    final ReportPortalUser rpUser =
+        getRpUser("admin", UserRole.ADMINISTRATOR, ProjectRole.MEMBER, 1L);
     final String projectName = "test_project";
     final String email = "email@mail.com";
     final String role = ProjectRole.MEMBER.name();
@@ -242,8 +246,8 @@ void createUserBid() {
 
     handler.createUserBid(request, rpUser, "emailUrl");
 
-    final ArgumentCaptor<UserCreationBid> bidCaptor = ArgumentCaptor.forClass(
-        UserCreationBid.class);
+    final ArgumentCaptor<UserCreationBid> bidCaptor =
+        ArgumentCaptor.forClass(UserCreationBid.class);
     verify(userCreationBidRepository, times(1)).save(bidCaptor.capture());
 
     final UserCreationBid bid = bidCaptor.getValue();
@@ -270,7 +274,8 @@ void CreateUserBidOnNotExistedProject() {
         () -> handler.createUserBid(request, rpUser, "emailUrl")
     );
     assertEquals("Project 'not_exists' not found. Did you use correct project name?",
-        exception.getMessage());
+        exception.getMessage()
+    );
   }
 
   @Test
@@ -283,7 +288,8 @@ void createUserWithoutBid() {
     );
     assertEquals(
         "Incorrect Request. Impossible to register user. UUID expired or already registered.",
-        exception.getMessage());
+        exception.getMessage()
+    );
   }
 
   @Test
@@ -296,10 +302,11 @@ void createAlreadyExistedUser() {
 
     final CreateUserRQConfirm request = new CreateUserRQConfirm();
     request.setLogin("test");
-    final ReportPortalException exception = assertThrows(ReportPortalException.class,
-        () -> handler.createUser(request, "uuid"));
+    final ReportPortalException exception =
+        assertThrows(ReportPortalException.class, () -> handler.createUser(request, "uuid"));
     assertEquals("User with 'login='test'' already exists. You couldn't create the duplicate.",
-        exception.getMessage());
+        exception.getMessage()
+    );
   }
 
   @Test
@@ -312,10 +319,11 @@ public void createUserWithIncorrectLogin() {
 
     final CreateUserRQConfirm request = new CreateUserRQConfirm();
     request.setLogin("##$%/");
-    final ReportPortalException exception = assertThrows(ReportPortalException.class,
-        () -> handler.createUser(request, "uuid"));
+    final ReportPortalException exception =
+        assertThrows(ReportPortalException.class, () -> handler.createUser(request, "uuid"));
     assertEquals("Incorrect Request. Username '##$%/' consists only of special characters",
-        exception.getMessage());
+        exception.getMessage()
+    );
   }
 
   @Test
@@ -329,11 +337,12 @@ void createUserWithIncorrectEmail() {
     final CreateUserRQConfirm request = new CreateUserRQConfirm();
     request.setLogin("test");
     request.setEmail("incorrect@domain");
-    final ReportPortalException exception = assertThrows(ReportPortalException.class,
-        () -> handler.createUser(request, "uuid"));
+    final ReportPortalException exception =
+        assertThrows(ReportPortalException.class, () -> handler.createUser(request, "uuid"));
     assertEquals(
         "Error in handled Request. Please, check specified parameters: 'email='incorrect@domain''",
-        exception.getMessage());
+        exception.getMessage()
+    );
   }
 
   @Test
@@ -348,10 +357,11 @@ void createUserWithExistedEmail() {
     final CreateUserRQConfirm request = new CreateUserRQConfirm();
     request.setLogin("test");
     request.setEmail("email@domain.com");
-    final ReportPortalException exception = assertThrows(ReportPortalException.class,
-        () -> handler.createUser(request, "uuid"));
+    final ReportPortalException exception =
+        assertThrows(ReportPortalException.class, () -> handler.createUser(request, "uuid"));
     assertEquals(
         "User with 'email='email@domain.com'' already exists. You couldn't create the duplicate.",
-        exception.getMessage());
+        exception.getMessage()
+    );
   }
 }
\ No newline at end of file
diff --git a/src/test/java/com/epam/ta/reportportal/core/user/impl/EditUserHandlerImplTest.java b/src/test/java/com/epam/ta/reportportal/core/user/impl/EditUserHandlerImplTest.java
index 06a66b36f1..a3302ad5b8 100644
--- a/src/test/java/com/epam/ta/reportportal/core/user/impl/EditUserHandlerImplTest.java
+++ b/src/test/java/com/epam/ta/reportportal/core/user/impl/EditUserHandlerImplTest.java
@@ -16,6 +16,15 @@
 
 package com.epam.ta.reportportal.core.user.impl;
 
+import static com.epam.ta.reportportal.ReportPortalUserUtil.getRpUser;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.mockito.ArgumentMatchers.isA;
+import static org.mockito.Mockito.doNothing;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
 import com.epam.ta.reportportal.core.events.activity.ChangeUserTypeEvent;
 import com.epam.ta.reportportal.dao.ProjectRepository;
 import com.epam.ta.reportportal.dao.UserRepository;
@@ -24,8 +33,9 @@
 import com.epam.ta.reportportal.entity.user.UserRole;
 import com.epam.ta.reportportal.entity.user.UserType;
 import com.epam.ta.reportportal.exception.ReportPortalException;
-import com.epam.ta.reportportal.ws.model.user.ChangePasswordRQ;
-import com.epam.ta.reportportal.ws.model.user.EditUserRQ;
+import com.epam.ta.reportportal.model.user.ChangePasswordRQ;
+import com.epam.ta.reportportal.model.user.EditUserRQ;
+import java.util.Optional;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
 import org.mockito.InjectMocks;
@@ -35,18 +45,6 @@
 import org.springframework.mock.web.MockMultipartFile;
 import org.springframework.security.crypto.password.PasswordEncoder;
 
-import java.util.Optional;
-
-import static com.epam.ta.reportportal.ReportPortalUserUtil.getRpUser;
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertThrows;
-import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.ArgumentMatchers.isA;
-import static org.mockito.Mockito.doNothing;
-import static org.mockito.Mockito.times;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
 /**
  * @author <a href="mailto:ihar_kahadouski@epam.com">Ihar Kahadouski</a>
  */
@@ -84,18 +82,20 @@ void uploadOversizePhoto() {
 
     final ReportPortalException exception = assertThrows(ReportPortalException.class,
         () -> handler.uploadPhoto("test",
-            new MockMultipartFile("photo", new byte[1024 * 1024 + 10]))
+            new MockMultipartFile("photo", new byte[1024 * 1024 + 10])
+        )
     );
     assertEquals("Binary data cannot be saved. Image size should be less than 1 mb",
-        exception.getMessage());
+        exception.getMessage()
+    );
   }
 
   @Test
   void deleteNotExistUserPhoto() {
     when(userRepository.findByLogin("not_exist")).thenReturn(Optional.empty());
 
-    final ReportPortalException exception = assertThrows(ReportPortalException.class,
-        () -> handler.deletePhoto("not_exist"));
+    final ReportPortalException exception =
+        assertThrows(ReportPortalException.class, () -> handler.deletePhoto("not_exist"));
     assertEquals("User 'not_exist' not found.", exception.getMessage());
   }
 
@@ -106,10 +106,11 @@ void deleteExternalUserPhoto() {
     user.setUserType(UserType.UPSA);
     when(userRepository.findByLogin("test")).thenReturn(Optional.of(user));
 
-    final ReportPortalException exception = assertThrows(ReportPortalException.class,
-        () -> handler.deletePhoto("test"));
+    final ReportPortalException exception =
+        assertThrows(ReportPortalException.class, () -> handler.deletePhoto("test"));
     assertEquals("You do not have enough permissions. Unable to change photo for external user",
-        exception.getMessage());
+        exception.getMessage()
+    );
   }
 
   @Test
@@ -118,7 +119,8 @@ void changeNotExistUserPassword() {
 
     final ReportPortalException exception = assertThrows(ReportPortalException.class,
         () -> handler.changePassword(getRpUser("not_exist", UserRole.USER, ProjectRole.MEMBER, 1L),
-            new ChangePasswordRQ())
+            new ChangePasswordRQ()
+        )
     );
     assertEquals("User 'not_exist' not found.", exception.getMessage());
   }
@@ -132,10 +134,12 @@ void changeExternalUserPassword() {
 
     final ReportPortalException exception = assertThrows(ReportPortalException.class,
         () -> handler.changePassword(getRpUser("test", UserRole.USER, ProjectRole.MEMBER, 1L),
-            new ChangePasswordRQ())
+            new ChangePasswordRQ()
+        )
     );
     assertEquals("Forbidden operation. Impossible to change password for external users.",
-        exception.getMessage());
+        exception.getMessage()
+    );
   }
 
   @Test
@@ -151,10 +155,12 @@ void changePasswordWithIncorrectOldPassword() {
 
     final ReportPortalException exception = assertThrows(ReportPortalException.class,
         () -> handler.changePassword(getRpUser("test", UserRole.USER, ProjectRole.MEMBER, 1L),
-            changePasswordRQ)
+            changePasswordRQ
+        )
     );
     assertEquals("Forbidden operation. Old password not match with stored.",
-        exception.getMessage());
+        exception.getMessage()
+    );
   }
 
   @Test
@@ -163,7 +169,8 @@ void editNotExistUser() {
 
     final ReportPortalException exception = assertThrows(ReportPortalException.class,
         () -> handler.editUser("not_exist", new EditUserRQ(),
-            getRpUser("not_exist", UserRole.USER, ProjectRole.MEMBER, 1L))
+            getRpUser("not_exist", UserRole.USER, ProjectRole.MEMBER, 1L)
+        )
     );
     assertEquals("User 'not_exist' not found.", exception.getMessage());
   }
@@ -178,7 +185,8 @@ void editUserWithIncorrectRole() {
 
     final ReportPortalException exception = assertThrows(ReportPortalException.class,
         () -> handler.editUser("test", editUserRQ,
-            getRpUser("not_exist", UserRole.ADMINISTRATOR, ProjectRole.MEMBER, 1L))
+            getRpUser("not_exist", UserRole.ADMINISTRATOR, ProjectRole.MEMBER, 1L)
+        )
     );
     assertEquals(
         "Error in handled Request. Please, check specified parameters: 'Incorrect specified Account Role parameter.'",
@@ -198,7 +206,8 @@ void verifyChangeTypePublishOnEdit() {
 
     //when
     handler.editUser("test", editUserRQ,
-        getRpUser("admin", UserRole.ADMINISTRATOR, ProjectRole.MEMBER, 1L));
+        getRpUser("admin", UserRole.ADMINISTRATOR, ProjectRole.MEMBER, 1L)
+    );
 
     //then
     verify(eventPublisher, times(1)).publishEvent(isA(ChangeUserTypeEvent.class));
@@ -214,10 +223,12 @@ void changeExternalUserEmail() {
 
     final ReportPortalException exception = assertThrows(ReportPortalException.class,
         () -> handler.editUser("test", editUserRQ,
-            getRpUser("not_exist", UserRole.USER, ProjectRole.MEMBER, 1L))
+            getRpUser("not_exist", UserRole.USER, ProjectRole.MEMBER, 1L)
+        )
     );
     assertEquals("You do not have enough permissions. Unable to change email for external user",
-        exception.getMessage());
+        exception.getMessage()
+    );
   }
 
   @Test
@@ -230,7 +241,8 @@ void editUserWithIncorrectEmail() {
 
     final ReportPortalException exception = assertThrows(ReportPortalException.class,
         () -> handler.editUser("test", editUserRQ,
-            getRpUser("not_exist", UserRole.USER, ProjectRole.MEMBER, 1L))
+            getRpUser("not_exist", UserRole.USER, ProjectRole.MEMBER, 1L)
+        )
     );
     assertEquals(
         "Error in handled Request. Please, check specified parameters: ' wrong email: incorrect#domain.com'",
@@ -249,11 +261,13 @@ void editUserWithAlreadyExistedEmail() {
 
     final ReportPortalException exception = assertThrows(ReportPortalException.class,
         () -> handler.editUser("test", editUserRQ,
-            getRpUser("not_exist", UserRole.USER, ProjectRole.MEMBER, 1L))
+            getRpUser("not_exist", UserRole.USER, ProjectRole.MEMBER, 1L)
+        )
     );
     assertEquals(
         "User with 'existed@domain.com' already exists. You couldn't create the duplicate.",
-        exception.getMessage());
+        exception.getMessage()
+    );
   }
 
   @Test
@@ -266,9 +280,12 @@ void editExternalUserFullName() {
 
     final ReportPortalException exception = assertThrows(ReportPortalException.class,
         () -> handler.editUser("test", editUserRQ,
-            getRpUser("not_exist", UserRole.USER, ProjectRole.MEMBER, 1L))
+            getRpUser("not_exist", UserRole.USER, ProjectRole.MEMBER, 1L)
+        )
+    );
+    assertEquals(
+        "You do not have enough permissions. Unable to change full name for external user",
+        exception.getMessage()
     );
-    assertEquals("You do not have enough permissions. Unable to change full name for external user",
-        exception.getMessage());
   }
 }
\ No newline at end of file
diff --git a/src/test/java/com/epam/ta/reportportal/core/user/impl/GetUserHandlerImplTest.java b/src/test/java/com/epam/ta/reportportal/core/user/impl/GetUserHandlerImplTest.java
index ba43a833ee..b385f0c0c3 100644
--- a/src/test/java/com/epam/ta/reportportal/core/user/impl/GetUserHandlerImplTest.java
+++ b/src/test/java/com/epam/ta/reportportal/core/user/impl/GetUserHandlerImplTest.java
@@ -31,8 +31,8 @@
 import com.epam.ta.reportportal.entity.user.User;
 import com.epam.ta.reportportal.entity.user.UserRole;
 import com.epam.ta.reportportal.exception.ReportPortalException;
-import com.epam.ta.reportportal.ws.model.YesNoRS;
-import com.epam.ta.reportportal.ws.model.user.UserBidRS;
+import com.epam.ta.reportportal.model.YesNoRS;
+import com.epam.ta.reportportal.model.user.UserBidRS;
 import java.util.Optional;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
@@ -59,7 +59,8 @@ class GetUserHandlerImplTest {
   void getNotExistedUserByUsername() {
     when(userRepository.findByLogin("not_exist")).thenReturn(Optional.empty());
 
-    final ReportPortalException exception = assertThrows(ReportPortalException.class,
+    final ReportPortalException exception = assertThrows(
+        ReportPortalException.class,
         () -> handler.getUser("not_exist", getRpUser("test", UserRole.USER, ProjectRole.MEMBER, 1L))
     );
     assertEquals("User 'not_exist' not found.", exception.getMessage());
@@ -69,7 +70,8 @@ void getNotExistedUserByUsername() {
   void getNotExistedUserByLoggedInUser() {
     when(userRepository.findByLogin("not_exist")).thenReturn(Optional.empty());
 
-    final ReportPortalException exception = assertThrows(ReportPortalException.class,
+    final ReportPortalException exception = assertThrows(
+        ReportPortalException.class,
         () -> handler.getUser(getRpUser("not_exist", UserRole.USER, ProjectRole.MEMBER, 1L))
     );
     assertEquals("User 'not_exist' not found.", exception.getMessage());
diff --git a/src/test/java/com/epam/ta/reportportal/core/widget/content/loader/util/healthcheck/HealthCheckTableReadyContentResolverTest.java b/src/test/java/com/epam/ta/reportportal/core/widget/content/loader/util/healthcheck/HealthCheckTableReadyContentResolverTest.java
index 0eededc3c2..b1bbf43c7d 100644
--- a/src/test/java/com/epam/ta/reportportal/core/widget/content/loader/util/healthcheck/HealthCheckTableReadyContentResolverTest.java
+++ b/src/test/java/com/epam/ta/reportportal/core/widget/content/loader/util/healthcheck/HealthCheckTableReadyContentResolverTest.java
@@ -13,10 +13,10 @@
 import com.epam.ta.reportportal.dao.WidgetContentRepository;
 import com.epam.ta.reportportal.entity.widget.Widget;
 import com.epam.ta.reportportal.entity.widget.content.healthcheck.HealthCheckTableContent;
+import com.epam.ta.reportportal.model.widget.ContentParameters;
+import com.epam.ta.reportportal.model.widget.SortEntry;
+import com.epam.ta.reportportal.model.widget.WidgetRQ;
 import com.epam.ta.reportportal.ws.converter.builders.WidgetBuilder;
-import com.epam.ta.reportportal.ws.model.widget.ContentParameters;
-import com.epam.ta.reportportal.ws.model.widget.SortEntry;
-import com.epam.ta.reportportal.ws.model.widget.WidgetRQ;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.google.common.collect.Lists;
 import java.util.ArrayList;
@@ -33,14 +33,12 @@
  */
 public class HealthCheckTableReadyContentResolverTest {
 
-  private final WidgetContentRepository widgetContentRepository = mock(
-      WidgetContentRepository.class);
+  private final WidgetContentRepository widgetContentRepository =
+      mock(WidgetContentRepository.class);
   private final ObjectMapper objectMapper = new ObjectMapper();
 
-  private final HealthCheckTableReadyContentLoader contentResolver = new HealthCheckTableReadyContentLoader(
-      widgetContentRepository,
-      objectMapper
-  );
+  private final HealthCheckTableReadyContentLoader contentResolver =
+      new HealthCheckTableReadyContentLoader(widgetContentRepository, objectMapper);
 
   @Test
   void getContentTest() {
@@ -62,10 +60,8 @@ void getContentTest() {
 
     SortEntry sortEntry = new SortEntry();
     sortEntry.setSortingColumn("passingRate");
-    Widget widget = new WidgetBuilder().addWidgetRq(widgetRQ)
-        .addOption("viewName", "name")
-        .addOption("sort", sortEntry)
-        .addOption(ATTRIBUTE_KEYS, Lists.newArrayList("k1", "k2"))
+    Widget widget = new WidgetBuilder().addWidgetRq(widgetRQ).addOption("viewName", "name")
+        .addOption("sort", sortEntry).addOption(ATTRIBUTE_KEYS, Lists.newArrayList("k1", "k2"))
         .get();
 
     HealthCheckTableContent content = new HealthCheckTableContent();
diff --git a/src/test/java/com/epam/ta/reportportal/core/widget/content/updater/validator/ComponentHealthCheckContentValidatorTest.java b/src/test/java/com/epam/ta/reportportal/core/widget/content/updater/validator/ComponentHealthCheckContentValidatorTest.java
index 6de71ce07f..ed9db4b8b0 100644
--- a/src/test/java/com/epam/ta/reportportal/core/widget/content/updater/validator/ComponentHealthCheckContentValidatorTest.java
+++ b/src/test/java/com/epam/ta/reportportal/core/widget/content/updater/validator/ComponentHealthCheckContentValidatorTest.java
@@ -1,6 +1,7 @@
 package com.epam.ta.reportportal.core.widget.content.updater.validator;
 
 import static com.epam.ta.reportportal.core.widget.content.constant.ContentLoaderConstants.ATTRIBUTE_KEYS;
+import static com.epam.ta.reportportal.core.widget.content.constant.ContentLoaderConstants.EXCLUDE_SKIPPED;
 import static com.epam.ta.reportportal.core.widget.content.constant.ContentLoaderConstants.MIN_PASSING_RATE;
 import static org.junit.jupiter.api.Assertions.assertThrows;
 import static org.junit.jupiter.api.Assertions.assertTrue;
@@ -39,7 +40,7 @@ public void testValidateWithException() {
         )
     );
 
-    String expectedMessage = "Current level key should be not blank";
+    String expectedMessage = "Unable to load widget content. Widget properties contain errors: Exclude skipped tests option was not specified";
     String actualMessage = exception.getMessage();
     assertTrue(actualMessage.contains(expectedMessage));
 
@@ -58,6 +59,7 @@ private Map<String, Object> getWidgetOptionsContent() {
 
     content.put(ATTRIBUTE_KEYS, Lists.newArrayList("k1", "k2"));
     content.put(MIN_PASSING_RATE, 50);
+    content.put(EXCLUDE_SKIPPED, true);
 
     return content;
 
diff --git a/src/test/java/com/epam/ta/reportportal/ws/controller/BugTrackingSystemControllerTest.java b/src/test/java/com/epam/ta/reportportal/ws/controller/BugTrackingSystemControllerTest.java
index b10ae1db6c..87cef5b40a 100644
--- a/src/test/java/com/epam/ta/reportportal/ws/controller/BugTrackingSystemControllerTest.java
+++ b/src/test/java/com/epam/ta/reportportal/ws/controller/BugTrackingSystemControllerTest.java
@@ -31,11 +31,11 @@
 import com.epam.ta.reportportal.ws.BaseMvcTest;
 import com.epam.ta.reportportal.ws.model.ErrorRS;
 import com.epam.ta.reportportal.ws.model.externalsystem.AllowedValue;
-import com.epam.ta.reportportal.ws.model.externalsystem.BtsConnectionTestRQ;
+import com.epam.ta.reportportal.model.externalsystem.BtsConnectionTestRQ;
 import com.epam.ta.reportportal.ws.model.externalsystem.PostFormField;
 import com.epam.ta.reportportal.ws.model.externalsystem.PostTicketRQ;
 import com.epam.ta.reportportal.ws.model.externalsystem.Ticket;
-import com.epam.ta.reportportal.ws.model.integration.IntegrationRQ;
+import com.epam.ta.reportportal.model.integration.IntegrationRQ;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
diff --git a/src/test/java/com/epam/ta/reportportal/ws/controller/DashboardControllerTest.java b/src/test/java/com/epam/ta/reportportal/ws/controller/DashboardControllerTest.java
index ee6cf46e75..c6db107b8a 100644
--- a/src/test/java/com/epam/ta/reportportal/ws/controller/DashboardControllerTest.java
+++ b/src/test/java/com/epam/ta/reportportal/ws/controller/DashboardControllerTest.java
@@ -16,106 +16,117 @@
 
 package com.epam.ta.reportportal.ws.controller;
 
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.springframework.http.MediaType.APPLICATION_JSON;
+import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.delete;
+import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get;
+import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.post;
+import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.put;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
+
 import com.epam.ta.reportportal.dao.DashboardRepository;
 import com.epam.ta.reportportal.entity.dashboard.Dashboard;
+import com.epam.ta.reportportal.model.EntryCreatedRS;
+import com.epam.ta.reportportal.model.Position;
+import com.epam.ta.reportportal.model.Size;
+import com.epam.ta.reportportal.model.dashboard.AddWidgetRq;
+import com.epam.ta.reportportal.model.dashboard.CreateDashboardRQ;
+import com.epam.ta.reportportal.model.dashboard.DashboardResource;
+import com.epam.ta.reportportal.model.dashboard.UpdateDashboardRQ;
 import com.epam.ta.reportportal.ws.BaseMvcTest;
-import com.epam.ta.reportportal.ws.model.EntryCreatedRS;
-import com.epam.ta.reportportal.ws.model.Position;
-import com.epam.ta.reportportal.ws.model.Size;
-import com.epam.ta.reportportal.ws.model.dashboard.AddWidgetRq;
-import com.epam.ta.reportportal.ws.model.dashboard.CreateDashboardRQ;
-import com.epam.ta.reportportal.ws.model.dashboard.DashboardResource;
-import com.epam.ta.reportportal.ws.model.dashboard.UpdateDashboardRQ;
 import com.fasterxml.jackson.databind.ObjectMapper;
+import java.util.Optional;
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.test.context.jdbc.Sql;
 import org.springframework.test.web.servlet.MvcResult;
 
-import java.util.Optional;
-
-import static org.junit.jupiter.api.Assertions.*;
-import static org.springframework.http.MediaType.APPLICATION_JSON;
-import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.*;
-import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
-
 /**
  * @author <a href="mailto:ihar_kahadouski@epam.com">Ihar Kahadouski</a>
  */
 @Sql("/db/shareable/shareable-fill.sql")
 class DashboardControllerTest extends BaseMvcTest {
 
-	@Autowired
-	private ObjectMapper objectMapper;
-
-	@Autowired
-	private DashboardRepository dashboardRepository;
-
-	@Test
-	void createDashboardPositive() throws Exception {
-		CreateDashboardRQ createDashboardRQ = new CreateDashboardRQ();
-		createDashboardRQ.setName("dashboard");
-		createDashboardRQ.setDescription("description");
-		final MvcResult mvcResult = mockMvc.perform(post(DEFAULT_PROJECT_BASE_URL + "/dashboard").with(token(oAuthHelper.getDefaultToken()))
-				.content(objectMapper.writeValueAsBytes(createDashboardRQ))
-				.contentType(APPLICATION_JSON)).andExpect(status().isCreated()).andReturn();
-		final EntryCreatedRS entryCreatedRS = objectMapper.readValue(mvcResult.getResponse().getContentAsString(), EntryCreatedRS.class);
-		final Optional<Dashboard> dashboardOptional = dashboardRepository.findById(entryCreatedRS.getId());
-		assertTrue(dashboardOptional.isPresent());
-		assertEquals("dashboard", dashboardOptional.get().getName());
-		assertEquals("description", dashboardOptional.get().getDescription());
-	}
-
-	@Test
-	void getAllDashboardsPositive() throws Exception {
-		mockMvc.perform(get(DEFAULT_PROJECT_BASE_URL + "/dashboard").with(token(oAuthHelper.getDefaultToken()))).andExpect(status().isOk());
-	}
-
-	@Test
-	void getDashboardPositive() throws Exception {
-		mockMvc.perform(get(DEFAULT_PROJECT_BASE_URL + "/dashboard/17").with(token(oAuthHelper.getDefaultToken())))
-				.andExpect(status().isOk());
-	}
-
-	@Test
-	void updateDashboardPositive() throws Exception {
-		final UpdateDashboardRQ rq = new UpdateDashboardRQ();
-		rq.setName("updated");
-		rq.setDescription("updated");
-		mockMvc.perform(put(DEFAULT_PROJECT_BASE_URL + "/dashboard/17").with(token(oAuthHelper.getDefaultToken()))
-				.content(objectMapper.writeValueAsBytes(rq))
-				.contentType(APPLICATION_JSON)).andExpect(status().isOk());
-		final Optional<Dashboard> optionalDashboard = dashboardRepository.findById(17L);
-		assertTrue(optionalDashboard.isPresent());
-		assertEquals("updated", optionalDashboard.get().getName());
-		assertEquals("updated", optionalDashboard.get().getDescription());
-	}
-
-	@Test
-	void deleteDashboardPositive() throws Exception {
-		mockMvc.perform(delete(DEFAULT_PROJECT_BASE_URL + "/dashboard/17").with(token(oAuthHelper.getDefaultToken())))
-				.andExpect(status().isOk());
-	}
-
-	@Test
-	void getSharedDashboardsNamesPositive() throws Exception {
-		mockMvc.perform(get(DEFAULT_PROJECT_BASE_URL + "/dashboard/shared").with(token(oAuthHelper.getDefaultToken())))
-				.andExpect(status().isBadRequest());
-	}
-
-	@Test
-	void removeWidget() throws Exception {
-		mockMvc.perform(delete(DEFAULT_PROJECT_BASE_URL + "/dashboard/18/10").with(token(oAuthHelper.getDefaultToken())))
-				.andExpect(status().isOk());
-	}
-
-	@Test
-	void addWidget() throws Exception {
-		AddWidgetRq rq = new AddWidgetRq();
-		rq.setAddWidget(new DashboardResource.WidgetObjectModel("kek", 10L, new Size(5, 5), new Position(0, 0)));
-
-		mockMvc.perform(put(DEFAULT_PROJECT_BASE_URL + "/dashboard/17/add").with(token(oAuthHelper.getDefaultToken()))
-				.contentType(APPLICATION_JSON)
-				.content(objectMapper.writeValueAsBytes(rq))).andExpect(status().isOk());
-	}
+  @Autowired
+  private ObjectMapper objectMapper;
+
+  @Autowired
+  private DashboardRepository dashboardRepository;
+
+  @Test
+  void createDashboardPositive() throws Exception {
+    CreateDashboardRQ createDashboardRQ = new CreateDashboardRQ();
+    createDashboardRQ.setName("dashboard");
+    createDashboardRQ.setDescription("description");
+    final MvcResult mvcResult = mockMvc.perform(
+        post(DEFAULT_PROJECT_BASE_URL + "/dashboard").with(token(oAuthHelper.getDefaultToken()))
+            .content(objectMapper.writeValueAsBytes(createDashboardRQ))
+            .contentType(APPLICATION_JSON)).andExpect(status().isCreated()).andReturn();
+    final EntryCreatedRS entryCreatedRS =
+        objectMapper.readValue(mvcResult.getResponse().getContentAsString(), EntryCreatedRS.class);
+    final Optional<Dashboard> dashboardOptional =
+        dashboardRepository.findById(entryCreatedRS.getId());
+    assertTrue(dashboardOptional.isPresent());
+    assertEquals("dashboard", dashboardOptional.get().getName());
+    assertEquals("description", dashboardOptional.get().getDescription());
+  }
+
+  @Test
+  void getAllDashboardsPositive() throws Exception {
+    mockMvc.perform(
+            get(DEFAULT_PROJECT_BASE_URL + "/dashboard").with(token(oAuthHelper.getDefaultToken())))
+        .andExpect(status().isOk());
+  }
+
+  @Test
+  void getDashboardPositive() throws Exception {
+    mockMvc.perform(
+            get(DEFAULT_PROJECT_BASE_URL + "/dashboard/17").with(token(oAuthHelper.getDefaultToken())))
+        .andExpect(status().isOk());
+  }
+
+  @Test
+  void updateDashboardPositive() throws Exception {
+    final UpdateDashboardRQ rq = new UpdateDashboardRQ();
+    rq.setName("updated");
+    rq.setDescription("updated");
+    mockMvc.perform(
+            put(DEFAULT_PROJECT_BASE_URL + "/dashboard/17").with(token(oAuthHelper.getDefaultToken()))
+                .content(objectMapper.writeValueAsBytes(rq)).contentType(APPLICATION_JSON))
+        .andExpect(status().isOk());
+    final Optional<Dashboard> optionalDashboard = dashboardRepository.findById(17L);
+    assertTrue(optionalDashboard.isPresent());
+    assertEquals("updated", optionalDashboard.get().getName());
+    assertEquals("updated", optionalDashboard.get().getDescription());
+  }
+
+  @Test
+  void deleteDashboardPositive() throws Exception {
+    mockMvc.perform(delete(DEFAULT_PROJECT_BASE_URL + "/dashboard/17").with(
+        token(oAuthHelper.getDefaultToken()))).andExpect(status().isOk());
+  }
+
+  @Test
+  void getSharedDashboardsNamesPositive() throws Exception {
+    mockMvc.perform(get(DEFAULT_PROJECT_BASE_URL + "/dashboard/shared").with(
+        token(oAuthHelper.getDefaultToken()))).andExpect(status().isBadRequest());
+  }
+
+  @Test
+  void removeWidget() throws Exception {
+    mockMvc.perform(delete(DEFAULT_PROJECT_BASE_URL + "/dashboard/18/10").with(
+        token(oAuthHelper.getDefaultToken()))).andExpect(status().isOk());
+  }
+
+  @Test
+  void addWidget() throws Exception {
+    AddWidgetRq rq = new AddWidgetRq();
+    rq.setAddWidget(
+        new DashboardResource.WidgetObjectModel("kek", 10L, new Size(5, 5), new Position(0, 0)));
+
+    mockMvc.perform(put(DEFAULT_PROJECT_BASE_URL + "/dashboard/17/add").with(
+            token(oAuthHelper.getDefaultToken())).contentType(APPLICATION_JSON)
+        .content(objectMapper.writeValueAsBytes(rq))).andExpect(status().isOk());
+  }
 }
\ No newline at end of file
diff --git a/src/test/java/com/epam/ta/reportportal/ws/controller/DashboardControllerValidationTest.java b/src/test/java/com/epam/ta/reportportal/ws/controller/DashboardControllerValidationTest.java
index e156cc1915..632ec67aac 100644
--- a/src/test/java/com/epam/ta/reportportal/ws/controller/DashboardControllerValidationTest.java
+++ b/src/test/java/com/epam/ta/reportportal/ws/controller/DashboardControllerValidationTest.java
@@ -34,7 +34,7 @@
 
 import com.epam.ta.reportportal.ws.BaseMvcTest;
 import com.epam.ta.reportportal.ws.model.ErrorRS;
-import com.epam.ta.reportportal.ws.model.dashboard.CreateDashboardRQ;
+import com.epam.ta.reportportal.model.dashboard.CreateDashboardRQ;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
diff --git a/src/test/java/com/epam/ta/reportportal/ws/controller/IntegrationControllerTest.java b/src/test/java/com/epam/ta/reportportal/ws/controller/IntegrationControllerTest.java
index 29d87b1166..2227dfdf60 100644
--- a/src/test/java/com/epam/ta/reportportal/ws/controller/IntegrationControllerTest.java
+++ b/src/test/java/com/epam/ta/reportportal/ws/controller/IntegrationControllerTest.java
@@ -24,7 +24,7 @@
 import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
 
 import com.epam.ta.reportportal.ws.BaseMvcTest;
-import com.epam.ta.reportportal.ws.model.integration.IntegrationRQ;
+import com.epam.ta.reportportal.model.integration.IntegrationRQ;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import java.util.HashMap;
 import java.util.Map;
diff --git a/src/test/java/com/epam/ta/reportportal/ws/controller/LaunchAsyncControllerTest.java b/src/test/java/com/epam/ta/reportportal/ws/controller/LaunchAsyncControllerTest.java
index 2ef618bcbd..1f80859eec 100644
--- a/src/test/java/com/epam/ta/reportportal/ws/controller/LaunchAsyncControllerTest.java
+++ b/src/test/java/com/epam/ta/reportportal/ws/controller/LaunchAsyncControllerTest.java
@@ -29,9 +29,9 @@
 import com.epam.ta.reportportal.core.launch.StartLaunchHandler;
 import com.epam.ta.reportportal.entity.project.ProjectRole;
 import com.epam.ta.reportportal.entity.user.UserRole;
+import com.epam.ta.reportportal.model.launch.MergeLaunchesRQ;
 import com.epam.ta.reportportal.util.ProjectExtractor;
 import com.epam.ta.reportportal.ws.model.FinishExecutionRQ;
-import com.epam.ta.reportportal.ws.model.launch.MergeLaunchesRQ;
 import com.epam.ta.reportportal.ws.model.launch.StartLaunchRQ;
 import com.google.common.collect.Lists;
 import java.util.UUID;
@@ -70,93 +70,97 @@ class LaunchAsyncControllerTest {
 
   @Test
   void startLaunch() {
-    ReportPortalUser user = getRpUser("test", UserRole.ADMINISTRATOR, ProjectRole.PROJECT_MANAGER,
-        1L);
+    ReportPortalUser user =
+        getRpUser("test", UserRole.ADMINISTRATOR, ProjectRole.PROJECT_MANAGER, 1L);
 
     StartLaunchRQ startLaunchRQ = new StartLaunchRQ();
 
-    ArgumentCaptor<ReportPortalUser> userArgumentCaptor = ArgumentCaptor.forClass(
-        ReportPortalUser.class);
-    ArgumentCaptor<ReportPortalUser.ProjectDetails> projectDetailsArgumentCaptor = ArgumentCaptor.forClass(
-        ReportPortalUser.ProjectDetails.class);
-    ArgumentCaptor<StartLaunchRQ> requestArgumentCaptor = ArgumentCaptor.forClass(
-        StartLaunchRQ.class);
+    ArgumentCaptor<ReportPortalUser> userArgumentCaptor =
+        ArgumentCaptor.forClass(ReportPortalUser.class);
+    ArgumentCaptor<ReportPortalUser.ProjectDetails> projectDetailsArgumentCaptor =
+        ArgumentCaptor.forClass(ReportPortalUser.ProjectDetails.class);
+    ArgumentCaptor<StartLaunchRQ> requestArgumentCaptor =
+        ArgumentCaptor.forClass(StartLaunchRQ.class);
 
     when(projectExtractor.extractProjectDetails(any(ReportPortalUser.class),
-        anyString())).thenReturn(user.getProjectDetails()
-        .get("test_project"));
+        anyString()
+    )).thenReturn(user.getProjectDetails().get("test_project"));
 
     launchAsyncController.startLaunch("test_project", startLaunchRQ, user);
     verify(startLaunchHandler).startLaunch(userArgumentCaptor.capture(),
-        projectDetailsArgumentCaptor.capture(), requestArgumentCaptor.capture());
+        projectDetailsArgumentCaptor.capture(), requestArgumentCaptor.capture()
+    );
     assertEquals(user, userArgumentCaptor.getValue());
     assertEquals(user.getProjectDetails().get("test_project"),
-        projectDetailsArgumentCaptor.getValue());
+        projectDetailsArgumentCaptor.getValue()
+    );
     assertEquals(startLaunchRQ, requestArgumentCaptor.getValue());
   }
 
   @Test
   void finishLaunch() {
-    ReportPortalUser user = getRpUser("test", UserRole.ADMINISTRATOR, ProjectRole.PROJECT_MANAGER,
-        1L);
+    ReportPortalUser user =
+        getRpUser("test", UserRole.ADMINISTRATOR, ProjectRole.PROJECT_MANAGER, 1L);
 
     FinishExecutionRQ finishExecutionRQ = new FinishExecutionRQ();
 
     String launchId = UUID.randomUUID().toString();
 
     ArgumentCaptor<String> launchIdArgumentCaptor = ArgumentCaptor.forClass(String.class);
-    ArgumentCaptor<FinishExecutionRQ> requestArgumentCaptor = ArgumentCaptor.forClass(
-        FinishExecutionRQ.class);
-    ArgumentCaptor<ReportPortalUser.ProjectDetails> projectDetailsArgumentCaptor = ArgumentCaptor.forClass(
-        ReportPortalUser.ProjectDetails.class);
-    ArgumentCaptor<ReportPortalUser> userArgumentCaptor = ArgumentCaptor.forClass(
-        ReportPortalUser.class);
+    ArgumentCaptor<FinishExecutionRQ> requestArgumentCaptor =
+        ArgumentCaptor.forClass(FinishExecutionRQ.class);
+    ArgumentCaptor<ReportPortalUser.ProjectDetails> projectDetailsArgumentCaptor =
+        ArgumentCaptor.forClass(ReportPortalUser.ProjectDetails.class);
+    ArgumentCaptor<ReportPortalUser> userArgumentCaptor =
+        ArgumentCaptor.forClass(ReportPortalUser.class);
     ArgumentCaptor<String> urlArgumentCaptor = ArgumentCaptor.forClass(String.class);
 
     when(projectExtractor.extractProjectDetails(any(ReportPortalUser.class),
-        anyString())).thenReturn(user.getProjectDetails()
-        .get("test_project"));
+        anyString()
+    )).thenReturn(user.getProjectDetails().get("test_project"));
 
     when(httpServletRequest.getRequestURL()).thenReturn(new StringBuffer("http://localhost:8080"));
     when(httpServletRequest.getHeaderNames()).thenReturn(new Enumerator<>(Lists.newArrayList()));
     launchAsyncController.finishLaunch("test_project", launchId, finishExecutionRQ, user,
-        httpServletRequest);
-    verify(finishLaunchHandler).finishLaunch(
-        launchIdArgumentCaptor.capture(),
-        requestArgumentCaptor.capture(),
-        projectDetailsArgumentCaptor.capture(),
-        userArgumentCaptor.capture(),
-        urlArgumentCaptor.capture());
+        httpServletRequest
+    );
+    verify(finishLaunchHandler).finishLaunch(launchIdArgumentCaptor.capture(),
+        requestArgumentCaptor.capture(), projectDetailsArgumentCaptor.capture(),
+        userArgumentCaptor.capture(), urlArgumentCaptor.capture()
+    );
     assertEquals(user, userArgumentCaptor.getValue());
     assertEquals(user.getProjectDetails().get("test_project"),
-        projectDetailsArgumentCaptor.getValue());
+        projectDetailsArgumentCaptor.getValue()
+    );
     assertEquals(finishExecutionRQ, requestArgumentCaptor.getValue());
   }
 
   @Test
   void mergeLaunch() {
-    ReportPortalUser user = getRpUser("test", UserRole.ADMINISTRATOR, ProjectRole.PROJECT_MANAGER,
-        1L);
+    ReportPortalUser user =
+        getRpUser("test", UserRole.ADMINISTRATOR, ProjectRole.PROJECT_MANAGER, 1L);
 
     MergeLaunchesRQ mergeLaunchesRQ = new MergeLaunchesRQ();
 
-    ArgumentCaptor<ReportPortalUser.ProjectDetails> projectDetailsArgumentCaptor = ArgumentCaptor.forClass(
-        ReportPortalUser.ProjectDetails.class);
-    ArgumentCaptor<ReportPortalUser> userArgumentCaptor = ArgumentCaptor.forClass(
-        ReportPortalUser.class);
-    ArgumentCaptor<MergeLaunchesRQ> requestArgumentCaptor = ArgumentCaptor.forClass(
-        MergeLaunchesRQ.class);
+    ArgumentCaptor<ReportPortalUser.ProjectDetails> projectDetailsArgumentCaptor =
+        ArgumentCaptor.forClass(ReportPortalUser.ProjectDetails.class);
+    ArgumentCaptor<ReportPortalUser> userArgumentCaptor =
+        ArgumentCaptor.forClass(ReportPortalUser.class);
+    ArgumentCaptor<MergeLaunchesRQ> requestArgumentCaptor =
+        ArgumentCaptor.forClass(MergeLaunchesRQ.class);
 
     when(projectExtractor.extractProjectDetails(any(ReportPortalUser.class),
-        anyString())).thenReturn(user.getProjectDetails()
-        .get("test_project"));
+        anyString()
+    )).thenReturn(user.getProjectDetails().get("test_project"));
 
     launchAsyncController.mergeLaunches("test_project", mergeLaunchesRQ, user);
     verify(mergeLaunchHandler).mergeLaunches(projectDetailsArgumentCaptor.capture(),
-        userArgumentCaptor.capture(), requestArgumentCaptor.capture());
+        userArgumentCaptor.capture(), requestArgumentCaptor.capture()
+    );
     assertEquals(user, userArgumentCaptor.getValue());
     assertEquals(user.getProjectDetails().get("test_project"),
-        projectDetailsArgumentCaptor.getValue());
+        projectDetailsArgumentCaptor.getValue()
+    );
     assertEquals(mergeLaunchesRQ, requestArgumentCaptor.getValue());
   }
 }
\ No newline at end of file
diff --git a/src/test/java/com/epam/ta/reportportal/ws/controller/LaunchControllerTest.java b/src/test/java/com/epam/ta/reportportal/ws/controller/LaunchControllerTest.java
index 6b71d7fa7c..70a6d6ac8b 100644
--- a/src/test/java/com/epam/ta/reportportal/ws/controller/LaunchControllerTest.java
+++ b/src/test/java/com/epam/ta/reportportal/ws/controller/LaunchControllerTest.java
@@ -39,18 +39,18 @@
 import com.epam.ta.reportportal.entity.enums.StatusEnum;
 import com.epam.ta.reportportal.entity.launch.Launch;
 import com.epam.ta.reportportal.exception.ReportPortalException;
+import com.epam.ta.reportportal.model.BulkRQ;
+import com.epam.ta.reportportal.model.DeleteBulkRQ;
+import com.epam.ta.reportportal.model.launch.AnalyzeLaunchRQ;
+import com.epam.ta.reportportal.model.launch.MergeLaunchesRQ;
+import com.epam.ta.reportportal.model.launch.UpdateLaunchRQ;
 import com.epam.ta.reportportal.ws.BaseMvcTest;
 import com.epam.ta.reportportal.ws.model.BulkInfoUpdateRQ;
-import com.epam.ta.reportportal.ws.model.BulkRQ;
-import com.epam.ta.reportportal.ws.model.DeleteBulkRQ;
 import com.epam.ta.reportportal.ws.model.FinishExecutionRQ;
 import com.epam.ta.reportportal.ws.model.attribute.ItemAttributeResource;
 import com.epam.ta.reportportal.ws.model.attribute.ItemAttributesRQ;
 import com.epam.ta.reportportal.ws.model.attribute.UpdateItemAttributeRQ;
-import com.epam.ta.reportportal.ws.model.launch.AnalyzeLaunchRQ;
-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.UpdateLaunchRQ;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.google.common.collect.Lists;
 import com.google.common.collect.Sets;
@@ -91,9 +91,9 @@ void happyCreateLaunch() throws Exception {
     startLaunchRQ.setAttributes(Sets.newHashSet(new ItemAttributesRQ("key", "value")));
 
     mockMvc.perform(
-        post(DEFAULT_PROJECT_BASE_URL + "/launch/").with(token(oAuthHelper.getDefaultToken()))
-            .content(objectMapper.writeValueAsBytes(startLaunchRQ))
-            .contentType(APPLICATION_JSON)).andExpect(status().isCreated());
+            post(DEFAULT_PROJECT_BASE_URL + "/launch/").with(token(oAuthHelper.getDefaultToken()))
+                .content(objectMapper.writeValueAsBytes(startLaunchRQ)).contentType(APPLICATION_JSON))
+        .andExpect(status().isCreated());
   }
 
   @Test
@@ -105,8 +105,7 @@ void getSuggestedItemsAnalyzerNotDeployed() throws Exception {
     analyzeLaunchRQ.setAnalyzerHistoryMode("ALL");
     mockMvc.perform(post(DEFAULT_PROJECT_BASE_URL + "/launch/analyze").with(
                 token(oAuthHelper.getDefaultToken()))
-            .content(objectMapper.writeValueAsBytes(analyzeLaunchRQ))
-            .contentType(APPLICATION_JSON))
+            .content(objectMapper.writeValueAsBytes(analyzeLaunchRQ)).contentType(APPLICATION_JSON))
         .andExpect(
             result -> assertTrue(result.getResolvedException() instanceof ReportPortalException))
         .andExpect(result -> assertEquals(
@@ -122,8 +121,7 @@ void updateLaunchPositive() throws Exception {
     rq.setDescription("description");
     rq.setAttributes(Sets.newHashSet(new ItemAttributeResource("test", "test")));
     mockMvc.perform(put(DEFAULT_PROJECT_BASE_URL + "/launch/3/update").with(
-            token(oAuthHelper.getDefaultToken()))
-        .content(objectMapper.writeValueAsBytes(rq))
+            token(oAuthHelper.getDefaultToken())).content(objectMapper.writeValueAsBytes(rq))
         .contentType(APPLICATION_JSON)).andExpect(status().is(200));
   }
 
@@ -136,32 +134,28 @@ void getLaunchPositive() throws Exception {
 
   @Test
   void getLaunchStringPositive() throws Exception {
-    mockMvc.perform(get(
-            DEFAULT_PROJECT_BASE_URL + "/launch/4850a659-ac26-4a65-8ea4-a6756a57fb92").with(
-            token(oAuthHelper.getDefaultToken())))
-        .andExpect(status().is(200));
+    mockMvc.perform(
+        get(DEFAULT_PROJECT_BASE_URL + "/launch/4850a659-ac26-4a65-8ea4-a6756a57fb92").with(
+            token(oAuthHelper.getDefaultToken()))).andExpect(status().is(200));
   }
 
   @Test
   void getLaunchUuidPositive() throws Exception {
-    mockMvc.perform(get(
-            DEFAULT_PROJECT_BASE_URL + "/launch/uuid/4850a659-ac26-4a65-8ea4-a6756a57fb92").with(
-            token(oAuthHelper.getDefaultToken())))
-        .andExpect(status().is(200));
+    mockMvc.perform(
+        get(DEFAULT_PROJECT_BASE_URL + "/launch/uuid/4850a659-ac26-4a65-8ea4-a6756a57fb92").with(
+            token(oAuthHelper.getDefaultToken()))).andExpect(status().is(200));
   }
 
   @Test
   void getDebugLaunches() throws Exception {
     mockMvc.perform(get(SUPERADMIN_PROJECT_BASE_URL + "/launch/mode").with(
-            token(oAuthHelper.getSuperadminToken())))
-        .andExpect(status().is(200));
+        token(oAuthHelper.getSuperadminToken()))).andExpect(status().is(200));
   }
 
   @Test
   void compareLaunches() throws Exception {
     mockMvc.perform(get(DEFAULT_PROJECT_BASE_URL + "/launch/compare?ids=1,2").with(
-            token(oAuthHelper.getDefaultToken())))
-        .andExpect(status().is(200));
+        token(oAuthHelper.getDefaultToken()))).andExpect(status().is(200));
   }
 
   @Test
@@ -176,8 +170,8 @@ void mergeLaunchesPositive() throws Exception {
     rq.setStartTime(new Date());
     rq.setEndTime(new Date());
     mockMvc.perform(post(DEFAULT_PROJECT_BASE_URL + "/launch/merge").contentType(APPLICATION_JSON)
-        .with(token(oAuthHelper.getDefaultToken()))
-        .content(objectMapper.writeValueAsBytes(rq))).andExpect(status().is(200));
+            .with(token(oAuthHelper.getDefaultToken())).content(objectMapper.writeValueAsBytes(rq)))
+        .andExpect(status().is(200));
   }
 
   @Test
@@ -197,8 +191,7 @@ void deleteLaunchNegative() throws Exception {
   @Test
   void getStatus() throws Exception {
     mockMvc.perform(get(DEFAULT_PROJECT_BASE_URL + "/launch/status?ids=1").with(
-            token(oAuthHelper.getDefaultToken())))
-        .andExpect(status().is(200));
+        token(oAuthHelper.getDefaultToken()))).andExpect(status().is(200));
   }
 
   @Test
@@ -235,25 +228,25 @@ void bulkForceFinish() throws Exception {
       return finishExecutionRQ;
     })));
     mockMvc.perform(
-        put(DEFAULT_PROJECT_BASE_URL + "/launch/stop").with(token(oAuthHelper.getDefaultToken()))
-            .contentType(APPLICATION_JSON)
-            .content(objectMapper.writeValueAsBytes(bulkRQ))).andExpect(status().isOk());
+            put(DEFAULT_PROJECT_BASE_URL + "/launch/stop").with(token(oAuthHelper.getDefaultToken()))
+                .contentType(APPLICATION_JSON).content(objectMapper.writeValueAsBytes(bulkRQ)))
+        .andExpect(status().isOk());
   }
 
   @Test
   void getAllOwners() throws Exception {
     mockMvc.perform(
-        get(DEFAULT_PROJECT_BASE_URL + "/launch/owners?filter.cnt.user=def").contentType(
-                APPLICATION_JSON)
-            .with(token(oAuthHelper.getDefaultToken()))).andExpect(status().is(200));
+            get(DEFAULT_PROJECT_BASE_URL + "/launch/owners?filter.cnt.user=def").contentType(
+                APPLICATION_JSON).with(token(oAuthHelper.getDefaultToken())))
+        .andExpect(status().is(200));
   }
 
   @Test
   void getAllLaunchNames() throws Exception {
     mockMvc.perform(
-        get(DEFAULT_PROJECT_BASE_URL + "/launch/names?filter.cnt.name=test").contentType(
-                APPLICATION_JSON)
-            .with(token(oAuthHelper.getDefaultToken()))).andExpect(status().is(200));
+            get(DEFAULT_PROJECT_BASE_URL + "/launch/names?filter.cnt.name=test").contentType(
+                APPLICATION_JSON).with(token(oAuthHelper.getDefaultToken())))
+        .andExpect(status().is(200));
   }
 
   @Test
@@ -270,11 +263,10 @@ void bulkDeleteLaunches() throws Exception {
 
   @Test
   void bulkMoveToDebug() throws Exception {
-    final List<Long> ids = launchRepository.findByFilter(Filter.builder()
-            .withTarget(Launch.class)
+    final List<Long> ids = launchRepository.findByFilter(Filter.builder().withTarget(Launch.class)
             .withCondition(
-                FilterCondition.builder().eq(CRITERIA_PROJECT_ID, String.valueOf(2L)).build())
-            .build()).stream().filter(it -> it.getMode() == LaunchModeEnum.DEFAULT).map(Launch::getId)
+                FilterCondition.builder().eq(CRITERIA_PROJECT_ID, String.valueOf(2L)).build()).build())
+        .stream().filter(it -> it.getMode() == LaunchModeEnum.DEFAULT).map(Launch::getId)
         .collect(Collectors.toList());
     final Map<Long, UpdateLaunchRQ> entities = ids.stream().collect(toMap(it -> it, it -> {
       final UpdateLaunchRQ updateLaunchRQ = new UpdateLaunchRQ();
@@ -284,9 +276,9 @@ void bulkMoveToDebug() throws Exception {
     final BulkRQ<Long, UpdateLaunchRQ> bulkRQ = new BulkRQ<>();
     bulkRQ.setEntities(entities);
     mockMvc.perform(
-        put(DEFAULT_PROJECT_BASE_URL + "/launch/update").with(token(oAuthHelper.getDefaultToken()))
-            .content(objectMapper.writeValueAsBytes(bulkRQ))
-            .contentType(APPLICATION_JSON)).andExpect(status().is(200));
+            put(DEFAULT_PROJECT_BASE_URL + "/launch/update").with(token(oAuthHelper.getDefaultToken()))
+                .content(objectMapper.writeValueAsBytes(bulkRQ)).contentType(APPLICATION_JSON))
+        .andExpect(status().is(200));
     launchRepository.findAllById(ids).forEach(it -> assertSame(it.getMode(), LaunchModeEnum.DEBUG));
   }
 
@@ -294,31 +286,27 @@ void bulkMoveToDebug() throws Exception {
   void getLaunches() throws Exception {
     mockMvc.perform(get(DEFAULT_PROJECT_BASE_URL
         + "/launch?page.page=1&page.size=50&page.sort=statistics$defects$product_bug$total,ASC").contentType(
-            APPLICATION_JSON)
-        .with(token(oAuthHelper.getDefaultToken()))).andExpect(status().is(200));
+        APPLICATION_JSON).with(token(oAuthHelper.getDefaultToken()))).andExpect(status().is(200));
   }
 
   @Test
   void getLatestLaunches() throws Exception {
     mockMvc.perform(get(DEFAULT_PROJECT_BASE_URL
-            + "/launch/latest?page.page=1&page.size=10&page.sort=name,ASC").with(
-            token(oAuthHelper.getDefaultToken())))
-        .andExpect(status().is(200));
+        + "/launch/latest?page.page=1&page.size=10&page.sort=name,ASC").with(
+        token(oAuthHelper.getDefaultToken()))).andExpect(status().is(200));
   }
 
   @Test
   void getAttributeKeys() throws Exception {
     mockMvc.perform(get(DEFAULT_PROJECT_BASE_URL
-            + "/launch/attribute/keys?filter.cnt.attributeKey=browser").with(
-            token(oAuthHelper.getDefaultToken())))
-        .andExpect(status().isOk());
+        + "/launch/attribute/keys?filter.cnt.attributeKey=browser").with(
+        token(oAuthHelper.getDefaultToken()))).andExpect(status().isOk());
   }
 
   @Test
   void getAttributeValues() throws Exception {
-    mockMvc.perform(get(
-        DEFAULT_PROJECT_BASE_URL
-            + "/launch/attribute/values?filter.eq.attributeKey=browser&filter.cnt.attributeValue=ch").with(
+    mockMvc.perform(get(DEFAULT_PROJECT_BASE_URL
+        + "/launch/attribute/values?filter.eq.attributeKey=browser&filter.cnt.attributeValue=ch").with(
         token(oAuthHelper.getDefaultToken()))).andExpect(status().isOk());
   }
 
@@ -326,15 +314,13 @@ void getAttributeValues() throws Exception {
   void getProjectLaunches() throws Exception {
     mockMvc.perform(
             get(DEFAULT_PROJECT_BASE_URL + "/launch").with(token(oAuthHelper.getDefaultToken())))
-        .andExpect(status().isOk())
-        .andExpect(jsonPath("$.content", hasSize(4)));
+        .andExpect(status().isOk()).andExpect(jsonPath("$.content", hasSize(4)));
   }
 
   @Test
   void export() throws Exception {
     mockMvc.perform(get(DEFAULT_PROJECT_BASE_URL + "/launch/1/report").with(
-            token(oAuthHelper.getDefaultToken())))
-        .andExpect(status().isOk());
+        token(oAuthHelper.getDefaultToken()))).andExpect(status().isOk());
   }
 
   @Test
@@ -354,23 +340,20 @@ void bulkUpdateItemAttributes() throws Exception {
     request.setAttributes(Lists.newArrayList(updateItemAttributeRQ));
 
     mockMvc.perform(
-        put(DEFAULT_PROJECT_BASE_URL + "/launch/info").with(token(oAuthHelper.getDefaultToken()))
-            .contentType(APPLICATION_JSON)
-            .content(objectMapper.writeValueAsBytes(request))).andExpect(status().isOk());
+            put(DEFAULT_PROJECT_BASE_URL + "/launch/info").with(token(oAuthHelper.getDefaultToken()))
+                .contentType(APPLICATION_JSON).content(objectMapper.writeValueAsBytes(request)))
+        .andExpect(status().isOk());
 
     List<Launch> launches = launchRepository.findAllById(launchIds);
     launches.forEach(it -> launchRepository.refresh(it));
 
     launches.forEach(it -> {
-      assertTrue(it.getAttributes()
-          .stream()
-          .noneMatch(attr -> "testKey".equals(attr.getKey()) && attr.getValue().equals("testValue")
+      assertTrue(it.getAttributes().stream().noneMatch(
+          attr -> "testKey".equals(attr.getKey()) && attr.getValue().equals("testValue")
+              && !attr.isSystem()));
+      assertTrue(it.getAttributes().stream().anyMatch(
+          attr -> "updatedKey".equals(attr.getKey()) && attr.getValue().equals("updatedValue")
               && !attr.isSystem()));
-      assertTrue(it.getAttributes()
-          .stream()
-          .anyMatch(
-              attr -> "updatedKey".equals(attr.getKey()) && attr.getValue().equals("updatedValue")
-                  && !attr.isSystem()));
       assertEquals(comment, it.getDescription());
     });
   }
@@ -391,19 +374,17 @@ void bulkCreateAttributes() throws Exception {
     request.setAttributes(Lists.newArrayList(updateItemAttributeRQ));
 
     mockMvc.perform(
-        put(DEFAULT_PROJECT_BASE_URL + "/launch/info").with(token(oAuthHelper.getDefaultToken()))
-            .contentType(APPLICATION_JSON)
-            .content(objectMapper.writeValueAsBytes(request))).andExpect(status().isOk());
+            put(DEFAULT_PROJECT_BASE_URL + "/launch/info").with(token(oAuthHelper.getDefaultToken()))
+                .contentType(APPLICATION_JSON).content(objectMapper.writeValueAsBytes(request)))
+        .andExpect(status().isOk());
 
     List<Launch> launches = launchRepository.findAllById(launchIds);
     launches.forEach(it -> launchRepository.refresh(it));
 
     launches.forEach(it -> {
-      assertTrue(it.getAttributes()
-          .stream()
-          .anyMatch(
-              attr -> "createdKey".equals(attr.getKey()) && attr.getValue().equals("createdValue")
-                  && !attr.isSystem()));
+      assertTrue(it.getAttributes().stream().anyMatch(
+          attr -> "createdKey".equals(attr.getKey()) && attr.getValue().equals("createdValue")
+              && !attr.isSystem()));
       assertTrue(
           it.getDescription().length() > comment.length() && it.getDescription().contains(comment));
     });
@@ -425,17 +406,16 @@ void bulkDeleteAttributes() throws Exception {
     request.setAttributes(Lists.newArrayList(updateItemAttributeRQ));
 
     mockMvc.perform(
-        put(DEFAULT_PROJECT_BASE_URL + "/launch/info").with(token(oAuthHelper.getDefaultToken()))
-            .contentType(APPLICATION_JSON)
-            .content(objectMapper.writeValueAsBytes(request))).andExpect(status().isOk());
+            put(DEFAULT_PROJECT_BASE_URL + "/launch/info").with(token(oAuthHelper.getDefaultToken()))
+                .contentType(APPLICATION_JSON).content(objectMapper.writeValueAsBytes(request)))
+        .andExpect(status().isOk());
 
     List<Launch> launches = launchRepository.findAllById(launchIds);
     launches.forEach(it -> launchRepository.refresh(it));
 
     launches.forEach(it -> {
-      assertTrue(it.getAttributes()
-          .stream()
-          .noneMatch(attr -> "testKey".equals(attr.getKey()) && attr.getValue().equals("testValue")
+      assertTrue(it.getAttributes().stream().noneMatch(
+          attr -> "testKey".equals(attr.getKey()) && attr.getValue().equals("testValue")
               && !attr.isSystem()));
       assertEquals(comment, it.getDescription());
     });
diff --git a/src/test/java/com/epam/ta/reportportal/ws/controller/LaunchControllerValidationTest.java b/src/test/java/com/epam/ta/reportportal/ws/controller/LaunchControllerValidationTest.java
index 0b3070b83b..f42b152a21 100644
--- a/src/test/java/com/epam/ta/reportportal/ws/controller/LaunchControllerValidationTest.java
+++ b/src/test/java/com/epam/ta/reportportal/ws/controller/LaunchControllerValidationTest.java
@@ -32,7 +32,7 @@
 import com.epam.ta.reportportal.ws.BaseMvcTest;
 import com.epam.ta.reportportal.ws.model.ErrorRS;
 import com.epam.ta.reportportal.ws.model.attribute.ItemAttributesRQ;
-import com.epam.ta.reportportal.ws.model.launch.MergeLaunchesRQ;
+import com.epam.ta.reportportal.model.launch.MergeLaunchesRQ;
 import com.epam.ta.reportportal.ws.model.launch.StartLaunchRQ;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.google.common.collect.Sets;
diff --git a/src/test/java/com/epam/ta/reportportal/ws/controller/LogControllerTest.java b/src/test/java/com/epam/ta/reportportal/ws/controller/LogControllerTest.java
index 7076cf8f98..91591ef142 100644
--- a/src/test/java/com/epam/ta/reportportal/ws/controller/LogControllerTest.java
+++ b/src/test/java/com/epam/ta/reportportal/ws/controller/LogControllerTest.java
@@ -26,7 +26,7 @@
 import com.epam.ta.reportportal.exception.ReportPortalException;
 import com.epam.ta.reportportal.ws.BaseMvcTest;
 import com.epam.ta.reportportal.ws.model.log.SaveLogRQ;
-import com.epam.ta.reportportal.ws.model.log.SearchLogRq;
+import com.epam.ta.reportportal.model.log.SearchLogRq;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import java.time.LocalDateTime;
 import java.time.ZoneId;
diff --git a/src/test/java/com/epam/ta/reportportal/ws/controller/ProjectControllerTest.java b/src/test/java/com/epam/ta/reportportal/ws/controller/ProjectControllerTest.java
index 7a08a2e65a..4ddfa28f0d 100644
--- a/src/test/java/com/epam/ta/reportportal/ws/controller/ProjectControllerTest.java
+++ b/src/test/java/com/epam/ta/reportportal/ws/controller/ProjectControllerTest.java
@@ -22,15 +22,15 @@
 import com.epam.ta.reportportal.entity.project.Project;
 import com.epam.ta.reportportal.entity.project.ProjectAttribute;
 import com.epam.ta.reportportal.ws.BaseMvcTest;
-import com.epam.ta.reportportal.ws.model.DeleteBulkRQ;
+import com.epam.ta.reportportal.model.DeleteBulkRQ;
 import com.epam.ta.reportportal.ws.model.attribute.ItemAttributeResource;
-import com.epam.ta.reportportal.ws.model.project.AssignUsersRQ;
-import com.epam.ta.reportportal.ws.model.project.CreateProjectRQ;
-import com.epam.ta.reportportal.ws.model.project.UnassignUsersRQ;
-import com.epam.ta.reportportal.ws.model.project.UpdateProjectRQ;
-import com.epam.ta.reportportal.ws.model.project.config.ProjectConfigurationUpdate;
-import com.epam.ta.reportportal.ws.model.project.email.ProjectNotificationConfigDTO;
-import com.epam.ta.reportportal.ws.model.project.email.SenderCaseDTO;
+import com.epam.ta.reportportal.model.project.AssignUsersRQ;
+import com.epam.ta.reportportal.model.project.CreateProjectRQ;
+import com.epam.ta.reportportal.model.project.UnassignUsersRQ;
+import com.epam.ta.reportportal.model.project.UpdateProjectRQ;
+import com.epam.ta.reportportal.model.project.config.ProjectConfigurationUpdate;
+import com.epam.ta.reportportal.model.project.email.ProjectNotificationConfigDTO;
+import com.epam.ta.reportportal.model.project.email.SenderCaseDTO;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.google.common.collect.Lists;
 import com.google.common.collect.Sets;
diff --git a/src/test/java/com/epam/ta/reportportal/ws/controller/ProjectSettingsControllerTest.java b/src/test/java/com/epam/ta/reportportal/ws/controller/ProjectSettingsControllerTest.java
index 4ba4c88e86..3e738ba320 100644
--- a/src/test/java/com/epam/ta/reportportal/ws/controller/ProjectSettingsControllerTest.java
+++ b/src/test/java/com/epam/ta/reportportal/ws/controller/ProjectSettingsControllerTest.java
@@ -31,14 +31,14 @@
 import com.epam.ta.reportportal.entity.enums.SendCase;
 import com.epam.ta.reportportal.entity.item.issue.IssueType;
 import com.epam.ta.reportportal.entity.project.email.SenderCase;
+import com.epam.ta.reportportal.model.project.config.CreateIssueSubTypeRQ;
+import com.epam.ta.reportportal.model.project.config.ProjectSettingsResource;
+import com.epam.ta.reportportal.model.project.config.UpdateIssueSubTypeRQ;
+import com.epam.ta.reportportal.model.project.config.UpdateOneIssueSubTypeRQ;
+import com.epam.ta.reportportal.model.project.config.pattern.CreatePatternTemplateRQ;
+import com.epam.ta.reportportal.model.project.config.pattern.UpdatePatternTemplateRQ;
+import com.epam.ta.reportportal.model.project.email.SenderCaseDTO;
 import com.epam.ta.reportportal.ws.BaseMvcTest;
-import com.epam.ta.reportportal.ws.model.project.config.CreateIssueSubTypeRQ;
-import com.epam.ta.reportportal.ws.model.project.config.ProjectSettingsResource;
-import com.epam.ta.reportportal.ws.model.project.config.UpdateIssueSubTypeRQ;
-import com.epam.ta.reportportal.ws.model.project.config.UpdateOneIssueSubTypeRQ;
-import com.epam.ta.reportportal.ws.model.project.config.pattern.CreatePatternTemplateRQ;
-import com.epam.ta.reportportal.ws.model.project.config.pattern.UpdatePatternTemplateRQ;
-import com.epam.ta.reportportal.ws.model.project.email.SenderCaseDTO;
 import com.fasterxml.jackson.core.type.TypeReference;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import java.util.Collection;
@@ -76,21 +76,20 @@ void createSubType() throws Exception {
     rq.setLongName("LongName");
     rq.setShortName("name");
     mockMvc.perform(
-        post(DEFAULT_PROJECT_BASE_URL + "/settings/sub-type").contentType(APPLICATION_JSON)
-            .with(token(oAuthHelper.getDefaultToken()))
-            .content(objectMapper.writeValueAsBytes(rq))).andExpect(status().isCreated());
+            post(DEFAULT_PROJECT_BASE_URL + "/settings/sub-type").contentType(APPLICATION_JSON)
+                .with(token(oAuthHelper.getDefaultToken())).content(objectMapper.writeValueAsBytes(rq)))
+        .andExpect(status().isCreated());
   }
 
   @Test
   void getProjectSettings() throws Exception {
     final MvcResult mvcResult = mockMvc.perform(
             get(DEFAULT_PROJECT_BASE_URL + "/settings").with(token(oAuthHelper.getDefaultToken())))
-        .andExpect(status().isOk())
-        .andReturn();
-    final ProjectSettingsResource projectSettingsResource = objectMapper.readValue(
-        mvcResult.getResponse().getContentAsString(),
-        ProjectSettingsResource.class
-    );
+        .andExpect(status().isOk()).andReturn();
+    final ProjectSettingsResource projectSettingsResource =
+        objectMapper.readValue(mvcResult.getResponse().getContentAsString(),
+            ProjectSettingsResource.class
+        );
     assertEquals(8,
         projectSettingsResource.getSubTypes().values().stream().flatMap(Collection::stream)
             .collect(Collectors.toList()).size()
@@ -100,8 +99,7 @@ void getProjectSettings() throws Exception {
   @Test
   void deleteSubType() throws Exception {
     mockMvc.perform(delete(DEFAULT_PROJECT_BASE_URL + "/settings/sub-type/6").with(
-            token(oAuthHelper.getDefaultToken())))
-        .andExpect(status().isOk());
+        token(oAuthHelper.getDefaultToken()))).andExpect(status().isOk());
 
     Optional<IssueType> byId = issueTypeRepository.findById(6L);
     assertFalse(byId.isPresent());
@@ -119,8 +117,7 @@ void updateSubType() throws Exception {
     updateOneIssueSubTypeRQ.setTypeRef("TO_INVESTIGATE");
     request.setIds(Collections.singletonList(updateOneIssueSubTypeRQ));
     mockMvc.perform(put(DEFAULT_PROJECT_BASE_URL + "/settings/sub-type").with(
-            token(oAuthHelper.getDefaultToken()))
-        .contentType(APPLICATION_JSON)
+            token(oAuthHelper.getDefaultToken())).contentType(APPLICATION_JSON)
         .content(objectMapper.writeValueAsBytes(request))).andExpect(status().isOk());
   }
 
@@ -132,8 +129,7 @@ void createPatternTemplate() throws Exception {
     createPatternTemplateRQ.setType("string");
     createPatternTemplateRQ.setValue("qwe");
     mockMvc.perform(post(DEFAULT_PROJECT_BASE_URL + "/settings/pattern").with(
-                token(oAuthHelper.getDefaultToken()))
-            .contentType(APPLICATION_JSON)
+                token(oAuthHelper.getDefaultToken())).contentType(APPLICATION_JSON)
             .content(objectMapper.writeValueAsBytes(createPatternTemplateRQ)))
         .andExpect(status().isCreated());
   }
@@ -146,8 +142,7 @@ void createPatternTemplateWithWrongType() throws Exception {
     createPatternTemplateRQ.setType("dd");
     createPatternTemplateRQ.setValue("qwe");
     mockMvc.perform(post(DEFAULT_PROJECT_BASE_URL + "/settings/pattern").with(
-                token(oAuthHelper.getDefaultToken()))
-            .contentType(APPLICATION_JSON)
+                token(oAuthHelper.getDefaultToken())).contentType(APPLICATION_JSON)
             .content(objectMapper.writeValueAsBytes(createPatternTemplateRQ)))
         .andExpect(status().isBadRequest());
   }
@@ -161,8 +156,7 @@ void createPatternTemplateWithDuplicateName() throws Exception {
     createPatternTemplateRQ.setValue("qwe");
 
     mockMvc.perform(post(DEFAULT_PROJECT_BASE_URL + "/settings/pattern").with(
-                token(oAuthHelper.getDefaultToken()))
-            .contentType(APPLICATION_JSON)
+                token(oAuthHelper.getDefaultToken())).contentType(APPLICATION_JSON)
             .content(objectMapper.writeValueAsBytes(createPatternTemplateRQ)))
         .andExpect(status().isConflict());
   }
@@ -175,8 +169,7 @@ void updatePatternTemplate() throws Exception {
     updatePatternTemplateRQ.setEnabled(true);
 
     mockMvc.perform(put(DEFAULT_PROJECT_BASE_URL + "/settings/pattern/1").with(
-                token(oAuthHelper.getDefaultToken()))
-            .contentType(APPLICATION_JSON)
+                token(oAuthHelper.getDefaultToken())).contentType(APPLICATION_JSON)
             .content(objectMapper.writeValueAsBytes(updatePatternTemplateRQ)))
         .andExpect(status().isOk());
   }
@@ -189,8 +182,7 @@ void updatePatternTemplateWithTheSameName() throws Exception {
     updatePatternTemplateRQ.setEnabled(true);
 
     mockMvc.perform(put(DEFAULT_PROJECT_BASE_URL + "/settings/pattern/1").with(
-                token(oAuthHelper.getDefaultToken()))
-            .contentType(APPLICATION_JSON)
+                token(oAuthHelper.getDefaultToken())).contentType(APPLICATION_JSON)
             .content(objectMapper.writeValueAsBytes(updatePatternTemplateRQ)))
         .andExpect(status().isOk());
   }
@@ -203,23 +195,19 @@ void updatePatternTemplateWithDuplicateName() throws Exception {
     updatePatternTemplateRQ.setEnabled(true);
 
     mockMvc.perform(put(DEFAULT_PROJECT_BASE_URL + "/settings/pattern/2").with(
-                token(oAuthHelper.getDefaultToken()))
-            .contentType(APPLICATION_JSON)
+                token(oAuthHelper.getDefaultToken())).contentType(APPLICATION_JSON)
             .content(objectMapper.writeValueAsBytes(updatePatternTemplateRQ)))
         .andExpect(status().isConflict());
   }
 
   @Test
   void getNotifications() throws Exception {
-    final MvcResult mvcResult = mockMvc.perform(get(
-            DEFAULT_PROJECT_BASE_URL + NOTIFICATION_URL).with(token(oAuthHelper.getDefaultToken())))
-        .andExpect(status().isOk())
-        .andReturn();
-    final List<SenderCaseDTO> senderCaseDTOS = objectMapper.readValue(
-        mvcResult.getResponse().getContentAsString(),
-        new TypeReference<>() {
-        }
-    );
+    final MvcResult mvcResult = mockMvc.perform(
+            get(DEFAULT_PROJECT_BASE_URL + NOTIFICATION_URL).with(token(oAuthHelper.getDefaultToken())))
+        .andExpect(status().isOk()).andReturn();
+    final List<SenderCaseDTO> senderCaseDTOS =
+        objectMapper.readValue(mvcResult.getResponse().getContentAsString(), new TypeReference<>() {
+        });
     assertEquals(4, senderCaseDTOS.size());
   }
 
@@ -236,8 +224,7 @@ void createNotification() throws Exception {
 
     mockMvc.perform(
             post(DEFAULT_PROJECT_BASE_URL + NOTIFICATION_URL).with(token(oAuthHelper.getDefaultToken()))
-                .contentType(APPLICATION_JSON)
-                .content(objectMapper.writeValueAsBytes(senderCaseDTO)))
+                .contentType(APPLICATION_JSON).content(objectMapper.writeValueAsBytes(senderCaseDTO)))
         .andExpect(status().isCreated());
   }
 
@@ -254,8 +241,7 @@ void createNotificationWithDuplicateRuleName() throws Exception {
 
     mockMvc.perform(
             post(DEFAULT_PROJECT_BASE_URL + NOTIFICATION_URL).with(token(oAuthHelper.getDefaultToken()))
-                .contentType(APPLICATION_JSON)
-                .content(objectMapper.writeValueAsBytes(senderCaseDTO)))
+                .contentType(APPLICATION_JSON).content(objectMapper.writeValueAsBytes(senderCaseDTO)))
         .andExpect(status().isConflict());
   }
 
@@ -271,9 +257,9 @@ void updateNotification() throws Exception {
     updateRq.setAttributesOperator(LogicalOperator.AND.getOperator());
 
     mockMvc.perform(
-        put(DEFAULT_PROJECT_BASE_URL + NOTIFICATION_URL).with(token(oAuthHelper.getDefaultToken()))
-            .contentType(APPLICATION_JSON)
-            .content(objectMapper.writeValueAsBytes(updateRq))).andExpect(status().isCreated());
+            put(DEFAULT_PROJECT_BASE_URL + NOTIFICATION_URL).with(token(oAuthHelper.getDefaultToken()))
+                .contentType(APPLICATION_JSON).content(objectMapper.writeValueAsBytes(updateRq)))
+        .andExpect(status().isCreated());
   }
 
   @Test
@@ -281,8 +267,7 @@ void deleteNotification() throws Exception {
     Long id = 1L;
 
     mockMvc.perform(delete(DEFAULT_PROJECT_BASE_URL + NOTIFICATION_URL + id).with(
-            token(oAuthHelper.getDefaultToken())))
-        .andExpect(status().isOk());
+        token(oAuthHelper.getDefaultToken()))).andExpect(status().isOk());
 
     List<SenderCase> senderCases = senderCaseRepository.findAll();
 
diff --git a/src/test/java/com/epam/ta/reportportal/ws/controller/SettingsControllerTest.java b/src/test/java/com/epam/ta/reportportal/ws/controller/SettingsControllerTest.java
index f674aa8b31..e43387bdc1 100644
--- a/src/test/java/com/epam/ta/reportportal/ws/controller/SettingsControllerTest.java
+++ b/src/test/java/com/epam/ta/reportportal/ws/controller/SettingsControllerTest.java
@@ -21,8 +21,8 @@
 import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.put;
 import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
 
+import com.epam.ta.reportportal.model.settings.AnalyticsResource;
 import com.epam.ta.reportportal.ws.BaseMvcTest;
-import com.epam.ta.reportportal.ws.model.settings.AnalyticsResource;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -48,8 +48,8 @@ void updateAnalyticsSettings() throws Exception {
     resource.setType("server.analytics.all");
     resource.setEnabled(true);
     mockMvc.perform(put("/v1/settings/analytics").with(token(oAuthHelper.getSuperadminToken()))
-        .contentType(MediaType.APPLICATION_JSON)
-        .content(objectMapper.writeValueAsBytes(resource))).andExpect(status().isOk());
+            .contentType(MediaType.APPLICATION_JSON).content(objectMapper.writeValueAsBytes(resource)))
+        .andExpect(status().isOk());
   }
 
   @Test
@@ -58,7 +58,7 @@ void saveAnalyticsSettingsNegative() throws Exception {
     resource.setEnabled(true);
     resource.setType("");
     mockMvc.perform(put("/v1/settings/analytics").with(token(oAuthHelper.getSuperadminToken()))
-        .contentType(APPLICATION_JSON)
-        .content(objectMapper.writeValueAsBytes(resource))).andExpect(status().isBadRequest());
+            .contentType(APPLICATION_JSON).content(objectMapper.writeValueAsBytes(resource)))
+        .andExpect(status().isBadRequest());
   }
 }
\ No newline at end of file
diff --git a/src/test/java/com/epam/ta/reportportal/ws/controller/TestItemControllerTest.java b/src/test/java/com/epam/ta/reportportal/ws/controller/TestItemControllerTest.java
index 98a4098ce4..7f5a47f6a6 100644
--- a/src/test/java/com/epam/ta/reportportal/ws/controller/TestItemControllerTest.java
+++ b/src/test/java/com/epam/ta/reportportal/ws/controller/TestItemControllerTest.java
@@ -45,12 +45,12 @@
 import com.epam.ta.reportportal.ws.model.StartTestItemRQ;
 import com.epam.ta.reportportal.ws.model.attribute.ItemAttributeResource;
 import com.epam.ta.reportportal.ws.model.attribute.UpdateItemAttributeRQ;
-import com.epam.ta.reportportal.ws.model.issue.DefineIssueRQ;
+import com.epam.ta.reportportal.model.issue.DefineIssueRQ;
 import com.epam.ta.reportportal.ws.model.issue.Issue;
-import com.epam.ta.reportportal.ws.model.issue.IssueDefinition;
-import com.epam.ta.reportportal.ws.model.item.LinkExternalIssueRQ;
-import com.epam.ta.reportportal.ws.model.item.UnlinkExternalIssueRQ;
-import com.epam.ta.reportportal.ws.model.item.UpdateTestItemRQ;
+import com.epam.ta.reportportal.model.issue.IssueDefinition;
+import com.epam.ta.reportportal.model.item.LinkExternalIssueRQ;
+import com.epam.ta.reportportal.model.item.UnlinkExternalIssueRQ;
+import com.epam.ta.reportportal.model.item.UpdateTestItemRQ;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.Lists;
diff --git a/src/test/java/com/epam/ta/reportportal/ws/controller/TestItemControllerValidationTest.java b/src/test/java/com/epam/ta/reportportal/ws/controller/TestItemControllerValidationTest.java
index ac34e211de..633e1fbf69 100644
--- a/src/test/java/com/epam/ta/reportportal/ws/controller/TestItemControllerValidationTest.java
+++ b/src/test/java/com/epam/ta/reportportal/ws/controller/TestItemControllerValidationTest.java
@@ -31,11 +31,11 @@
 import com.epam.ta.reportportal.ws.BaseMvcTest;
 import com.epam.ta.reportportal.ws.model.ErrorRS;
 import com.epam.ta.reportportal.ws.model.StartTestItemRQ;
-import com.epam.ta.reportportal.ws.model.issue.DefineIssueRQ;
+import com.epam.ta.reportportal.model.issue.DefineIssueRQ;
 import com.epam.ta.reportportal.ws.model.issue.Issue;
-import com.epam.ta.reportportal.ws.model.issue.IssueDefinition;
-import com.epam.ta.reportportal.ws.model.item.LinkExternalIssueRQ;
-import com.epam.ta.reportportal.ws.model.item.UnlinkExternalIssueRQ;
+import com.epam.ta.reportportal.model.issue.IssueDefinition;
+import com.epam.ta.reportportal.model.item.LinkExternalIssueRQ;
+import com.epam.ta.reportportal.model.item.UnlinkExternalIssueRQ;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import java.time.LocalDateTime;
 import java.time.ZoneId;
diff --git a/src/test/java/com/epam/ta/reportportal/ws/controller/UserControllerTest.java b/src/test/java/com/epam/ta/reportportal/ws/controller/UserControllerTest.java
index 6a01d0a9cd..7807873e40 100644
--- a/src/test/java/com/epam/ta/reportportal/ws/controller/UserControllerTest.java
+++ b/src/test/java/com/epam/ta/reportportal/ws/controller/UserControllerTest.java
@@ -25,10 +25,10 @@
 import com.epam.ta.reportportal.entity.project.Project;
 import com.epam.ta.reportportal.entity.project.ProjectIssueType;
 import com.epam.ta.reportportal.ws.BaseMvcTest;
-import com.epam.ta.reportportal.ws.model.DeleteBulkRQ;
-import com.epam.ta.reportportal.ws.model.Page;
+import com.epam.ta.reportportal.model.DeleteBulkRQ;
+import com.epam.ta.reportportal.model.Page;
 import com.epam.ta.reportportal.ws.model.ValidationConstraints;
-import com.epam.ta.reportportal.ws.model.user.*;
+import com.epam.ta.reportportal.model.user.*;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.google.common.collect.Lists;
 import org.apache.commons.lang3.RandomStringUtils;
diff --git a/src/test/java/com/epam/ta/reportportal/ws/controller/UserFilterControllerTest.java b/src/test/java/com/epam/ta/reportportal/ws/controller/UserFilterControllerTest.java
index 0fbb00a9db..4d2dbd0dc6 100644
--- a/src/test/java/com/epam/ta/reportportal/ws/controller/UserFilterControllerTest.java
+++ b/src/test/java/com/epam/ta/reportportal/ws/controller/UserFilterControllerTest.java
@@ -16,187 +16,205 @@
 
 package com.epam.ta.reportportal.ws.controller;
 
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.springframework.http.MediaType.APPLICATION_JSON;
+import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.delete;
+import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get;
+import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.post;
+import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.put;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
+
 import com.epam.ta.reportportal.commons.querygen.FilterCondition;
 import com.epam.ta.reportportal.dao.UserFilterRepository;
 import com.epam.ta.reportportal.entity.filter.UserFilter;
+import com.epam.ta.reportportal.model.EntryCreatedRS;
+import com.epam.ta.reportportal.model.filter.Order;
+import com.epam.ta.reportportal.model.filter.UpdateUserFilterRQ;
+import com.epam.ta.reportportal.model.filter.UserFilterCondition;
 import com.epam.ta.reportportal.ws.BaseMvcTest;
-import com.epam.ta.reportportal.ws.model.EntryCreatedRS;
 import com.epam.ta.reportportal.ws.model.ValidationConstraints;
-import com.epam.ta.reportportal.ws.model.filter.Order;
-import com.epam.ta.reportportal.ws.model.filter.UpdateUserFilterRQ;
-import com.epam.ta.reportportal.ws.model.filter.UserFilterCondition;
 import com.fasterxml.jackson.core.type.TypeReference;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.google.common.collect.Lists;
 import com.google.common.collect.Sets;
+import java.util.Optional;
 import org.apache.commons.lang3.StringUtils;
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.test.context.jdbc.Sql;
 import org.springframework.test.web.servlet.MvcResult;
 
-import java.util.Optional;
-
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertTrue;
-import static org.springframework.http.MediaType.APPLICATION_JSON;
-import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.*;
-import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
-
 /**
  * @author <a href="mailto:ihar_kahadouski@epam.com">Ihar Kahadouski</a>
  */
 @Sql("/db/shareable/shareable-fill.sql")
 class UserFilterControllerTest extends BaseMvcTest {
 
-	@Autowired
-	private ObjectMapper objectMapper;
-
-	@Autowired
-	private UserFilterRepository repository;
-
-	@Test
-	void createFilterPositive() throws Exception {
-		String name = "userFilter";
-		String description = "description";
-		UpdateUserFilterRQ request = new UpdateUserFilterRQ();
-		request.setName(name);
-		request.setObjectType("Launch");
-
-		final Order order = new Order();
-		order.setIsAsc(false);
-		order.setSortingColumnName("startTime");
-
-		request.setOrders(Lists.newArrayList(order));
-		request.setDescription(description);
-		request.setConditions(Sets.newHashSet(new UserFilterCondition("name", "cnt", "test")));
-
-		MvcResult mvcResult = mockMvc.perform(post(DEFAULT_PROJECT_BASE_URL + "/filter").with(token(oAuthHelper.getDefaultToken()))
-				.content(objectMapper.writeValueAsBytes(request))
-				.contentType(APPLICATION_JSON)).andExpect(status().isCreated()).andReturn();
-
-		EntryCreatedRS response = objectMapper.readValue(mvcResult.getResponse().getContentAsString(), new TypeReference<EntryCreatedRS>() {
-		});
-		final Optional<UserFilter> optionalFilter = repository.findById(response.getId());
-
-		assertTrue(optionalFilter.isPresent());
-		assertEquals(name, optionalFilter.get().getName());
-		assertEquals(description, optionalFilter.get().getDescription());
-	}
-
-	@Test
-	void getFilterPositive() throws Exception {
-		mockMvc.perform(get(DEFAULT_PROJECT_BASE_URL + "/filter/3").with(token(oAuthHelper.getDefaultToken()))).andExpect(status().isOk());
-	}
-
-	@Test
-	void getFilterNegative() throws Exception {
-		mockMvc.perform(get(DEFAULT_PROJECT_BASE_URL + "/filter/100").with(token(oAuthHelper.getDefaultToken())))
-				.andExpect(status().isNotFound());
-	}
-
-	@Test
-	void getFiltersByIds() throws Exception {
-		mockMvc.perform(get(DEFAULT_PROJECT_BASE_URL + "/filter/filters?ids=3,4").with(token(oAuthHelper.getDefaultToken())))
-				.andExpect(status().isOk());
-	}
-
-	@Test
-	void getSharedFiltersPositive() throws Exception {
-		mockMvc.perform(get(SUPERADMIN_PROJECT_BASE_URL + "/filter/shared").with(token(oAuthHelper.getSuperadminToken())))
-				.andExpect(status().isBadRequest());
-	}
-
-	@Test
-	void getPermittedFilters() throws Exception {
-		mockMvc.perform(get(SUPERADMIN_PROJECT_BASE_URL + "/filter").with(token(oAuthHelper.getSuperadminToken())))
-				.andExpect(status().isOk());
-	}
-
-	@Test
-	void deleteFilterPositive() throws Exception {
-		mockMvc.perform(delete(DEFAULT_PROJECT_BASE_URL + "/filter/3").with(token(oAuthHelper.getDefaultToken())))
-				.andExpect(status().isOk());
-	}
-
-	@Test
-	void getAllFiltersNamesPositive() throws Exception {
-		mockMvc.perform(get(DEFAULT_PROJECT_BASE_URL + "/filter/names").with(token(oAuthHelper.getDefaultToken())))
-				.andExpect(status().isOk());
-	}
-
-	@Test
-	void getAllSharedFiltersNames() throws Exception {
-		mockMvc.perform(get(DEFAULT_PROJECT_BASE_URL + "/filter/names?share=true").with(token(oAuthHelper.getDefaultToken())))
-				.andExpect(status().isOk());
-	}
-
-	@Test
-	void updateUserFilterPositive() throws Exception {
-		UpdateUserFilterRQ updateUserFilterRQ = new UpdateUserFilterRQ();
-		updateUserFilterRQ.setName("new name");
-		updateUserFilterRQ.setObjectType("Launch");
-		updateUserFilterRQ.setDescription("new description");
-		Order order = new Order();
-		order.setIsAsc(true);
-		order.setSortingColumnName("name");
-		updateUserFilterRQ.setOrders(Lists.newArrayList(order));
-		updateUserFilterRQ.setConditions(Sets.newHashSet(new UserFilterCondition("name", "eq", "filter")));
-
-		mockMvc.perform(put(DEFAULT_PROJECT_BASE_URL + "/filter/3").with(token(oAuthHelper.getDefaultToken()))
-				.content(objectMapper.writeValueAsBytes(updateUserFilterRQ))
-				.contentType(APPLICATION_JSON)).andExpect(status().isOk());
-		final Optional<UserFilter> optionalUserFilter = repository.findById(3L);
-		assertTrue(optionalUserFilter.isPresent());
-		assertEquals("new description", optionalUserFilter.get().getDescription());
-		assertEquals("new name", optionalUserFilter.get().getName());
-	}
-
-	@Test
-	void createUserFiltersLongDescription() throws Exception {
-		String name = "userFilter";
-		UpdateUserFilterRQ request = new UpdateUserFilterRQ();
-		request.setName(name);
-		request.setObjectType("Launch");
-
-		final Order order = new Order();
-		order.setIsAsc(false);
-		order.setSortingColumnName("startTime");
-
-		request.setOrders(Lists.newArrayList(order));
-		request.setDescription(StringUtils.leftPad("", 1501, "a"));
-		request.setConditions(Sets.newHashSet(new UserFilterCondition("name", "cnt", "test")));
-
-		mockMvc.perform(post(DEFAULT_PROJECT_BASE_URL + "/filter").with(token(oAuthHelper.getDefaultToken()))
-				.contentType(APPLICATION_JSON)
-				.content(objectMapper.writeValueAsBytes(request))).andExpect(status().is4xxClientError());
-	}
-
-	@Test
-	void updateUserFilterWithKeyAndValueLongerThan512() throws Exception {
-		UpdateUserFilterRQ updateUserFilterRQ = new UpdateUserFilterRQ();
-		updateUserFilterRQ.setName("new name");
-		updateUserFilterRQ.setObjectType("Launch");
-		updateUserFilterRQ.setDescription("new description");
-		Order order = new Order();
-		order.setIsAsc(true);
-		order.setSortingColumnName("name");
-		updateUserFilterRQ.setOrders(Lists.newArrayList(order));
-		String key = StringUtils.leftPad("", ValidationConstraints.MAX_ATTRIBUTE_LENGTH + 1, "a");
-		String value = key + ":" + key;
-		updateUserFilterRQ.setConditions(Sets.newHashSet(new UserFilterCondition("name", "eq", value)));
-
-		mockMvc.perform(put(DEFAULT_PROJECT_BASE_URL + "/filter/3").with(token(oAuthHelper.getDefaultToken()))
-				.content(objectMapper.writeValueAsBytes(updateUserFilterRQ))
-				.contentType(APPLICATION_JSON)).andExpect(status().isOk());
-		final Optional<UserFilter> optionalUserFilter = repository.findById(3L);
-		assertTrue(optionalUserFilter.isPresent());
-		assertEquals("new description", optionalUserFilter.get().getDescription());
-		assertEquals("new name", optionalUserFilter.get().getName());
-		FilterCondition filterCondition = (FilterCondition) optionalUserFilter.get().getFilterCondition().toArray()[0];
-		String actualKey = filterCondition.getValue().substring(0, filterCondition.getValue().indexOf(":"));
-		String actualValue = filterCondition.getValue().substring(filterCondition.getValue().indexOf(":") + 1);
-		assertEquals(ValidationConstraints.MAX_ATTRIBUTE_LENGTH, actualKey.length());
-		assertEquals(ValidationConstraints.MAX_ATTRIBUTE_LENGTH, actualValue.length());
-	}
+  @Autowired
+  private ObjectMapper objectMapper;
+
+  @Autowired
+  private UserFilterRepository repository;
+
+  @Test
+  void createFilterPositive() throws Exception {
+    String name = "userFilter";
+    String description = "description";
+    UpdateUserFilterRQ request = new UpdateUserFilterRQ();
+    request.setName(name);
+    request.setObjectType("Launch");
+
+    final Order order = new Order();
+    order.setIsAsc(false);
+    order.setSortingColumnName("startTime");
+
+    request.setOrders(Lists.newArrayList(order));
+    request.setDescription(description);
+    request.setConditions(Sets.newHashSet(new UserFilterCondition("name", "cnt", "test")));
+
+    MvcResult mvcResult = mockMvc.perform(
+            post(DEFAULT_PROJECT_BASE_URL + "/filter").with(token(oAuthHelper.getDefaultToken()))
+                .content(objectMapper.writeValueAsBytes(request)).contentType(APPLICATION_JSON))
+        .andExpect(status().isCreated()).andReturn();
+
+    EntryCreatedRS response = objectMapper.readValue(mvcResult.getResponse().getContentAsString(),
+        new TypeReference<EntryCreatedRS>() {
+        }
+    );
+    final Optional<UserFilter> optionalFilter = repository.findById(response.getId());
+
+    assertTrue(optionalFilter.isPresent());
+    assertEquals(name, optionalFilter.get().getName());
+    assertEquals(description, optionalFilter.get().getDescription());
+  }
+
+  @Test
+  void getFilterPositive() throws Exception {
+    mockMvc.perform(
+            get(DEFAULT_PROJECT_BASE_URL + "/filter/3").with(token(oAuthHelper.getDefaultToken())))
+        .andExpect(status().isOk());
+  }
+
+  @Test
+  void getFilterNegative() throws Exception {
+    mockMvc.perform(
+            get(DEFAULT_PROJECT_BASE_URL + "/filter/100").with(token(oAuthHelper.getDefaultToken())))
+        .andExpect(status().isNotFound());
+  }
+
+  @Test
+  void getFiltersByIds() throws Exception {
+    mockMvc.perform(get(DEFAULT_PROJECT_BASE_URL + "/filter/filters?ids=3,4").with(
+        token(oAuthHelper.getDefaultToken()))).andExpect(status().isOk());
+  }
+
+  @Test
+  void getSharedFiltersPositive() throws Exception {
+    mockMvc.perform(get(SUPERADMIN_PROJECT_BASE_URL + "/filter/shared").with(
+        token(oAuthHelper.getSuperadminToken()))).andExpect(status().isBadRequest());
+  }
+
+  @Test
+  void getPermittedFilters() throws Exception {
+    mockMvc.perform(
+            get(SUPERADMIN_PROJECT_BASE_URL + "/filter").with(token(oAuthHelper.getSuperadminToken())))
+        .andExpect(status().isOk());
+  }
+
+  @Test
+  void deleteFilterPositive() throws Exception {
+    mockMvc.perform(
+            delete(DEFAULT_PROJECT_BASE_URL + "/filter/3").with(token(oAuthHelper.getDefaultToken())))
+        .andExpect(status().isOk());
+  }
+
+  @Test
+  void getAllFiltersNamesPositive() throws Exception {
+    mockMvc.perform(
+            get(DEFAULT_PROJECT_BASE_URL + "/filter/names").with(token(oAuthHelper.getDefaultToken())))
+        .andExpect(status().isOk());
+  }
+
+  @Test
+  void getAllSharedFiltersNames() throws Exception {
+    mockMvc.perform(get(DEFAULT_PROJECT_BASE_URL + "/filter/names?share=true").with(
+        token(oAuthHelper.getDefaultToken()))).andExpect(status().isOk());
+  }
+
+  @Test
+  void updateUserFilterPositive() throws Exception {
+    UpdateUserFilterRQ updateUserFilterRQ = new UpdateUserFilterRQ();
+    updateUserFilterRQ.setName("new name");
+    updateUserFilterRQ.setObjectType("Launch");
+    updateUserFilterRQ.setDescription("new description");
+    Order order = new Order();
+    order.setIsAsc(true);
+    order.setSortingColumnName("name");
+    updateUserFilterRQ.setOrders(Lists.newArrayList(order));
+    updateUserFilterRQ.setConditions(
+        Sets.newHashSet(new UserFilterCondition("name", "eq", "filter")));
+
+    mockMvc.perform(
+        put(DEFAULT_PROJECT_BASE_URL + "/filter/3").with(token(oAuthHelper.getDefaultToken()))
+            .content(objectMapper.writeValueAsBytes(updateUserFilterRQ))
+            .contentType(APPLICATION_JSON)).andExpect(status().isOk());
+    final Optional<UserFilter> optionalUserFilter = repository.findById(3L);
+    assertTrue(optionalUserFilter.isPresent());
+    assertEquals("new description", optionalUserFilter.get().getDescription());
+    assertEquals("new name", optionalUserFilter.get().getName());
+  }
+
+  @Test
+  void createUserFiltersLongDescription() throws Exception {
+    String name = "userFilter";
+    UpdateUserFilterRQ request = new UpdateUserFilterRQ();
+    request.setName(name);
+    request.setObjectType("Launch");
+
+    final Order order = new Order();
+    order.setIsAsc(false);
+    order.setSortingColumnName("startTime");
+
+    request.setOrders(Lists.newArrayList(order));
+    request.setDescription(StringUtils.leftPad("", 1501, "a"));
+    request.setConditions(Sets.newHashSet(new UserFilterCondition("name", "cnt", "test")));
+
+    mockMvc.perform(
+            post(DEFAULT_PROJECT_BASE_URL + "/filter").with(token(oAuthHelper.getDefaultToken()))
+                .contentType(APPLICATION_JSON).content(objectMapper.writeValueAsBytes(request)))
+        .andExpect(status().is4xxClientError());
+  }
+
+  @Test
+  void updateUserFilterWithKeyAndValueLongerThan512() throws Exception {
+    UpdateUserFilterRQ updateUserFilterRQ = new UpdateUserFilterRQ();
+    updateUserFilterRQ.setName("new name");
+    updateUserFilterRQ.setObjectType("Launch");
+    updateUserFilterRQ.setDescription("new description");
+    Order order = new Order();
+    order.setIsAsc(true);
+    order.setSortingColumnName("name");
+    updateUserFilterRQ.setOrders(Lists.newArrayList(order));
+    String key = StringUtils.leftPad("", ValidationConstraints.MAX_ATTRIBUTE_LENGTH + 1, "a");
+    String value = key + ":" + key;
+    updateUserFilterRQ.setConditions(Sets.newHashSet(new UserFilterCondition("name", "eq", value)));
+
+    mockMvc.perform(
+        put(DEFAULT_PROJECT_BASE_URL + "/filter/3").with(token(oAuthHelper.getDefaultToken()))
+            .content(objectMapper.writeValueAsBytes(updateUserFilterRQ))
+            .contentType(APPLICATION_JSON)).andExpect(status().isOk());
+    final Optional<UserFilter> optionalUserFilter = repository.findById(3L);
+    assertTrue(optionalUserFilter.isPresent());
+    assertEquals("new description", optionalUserFilter.get().getDescription());
+    assertEquals("new name", optionalUserFilter.get().getName());
+    FilterCondition filterCondition =
+        (FilterCondition) optionalUserFilter.get().getFilterCondition().toArray()[0];
+    String actualKey =
+        filterCondition.getValue().substring(0, filterCondition.getValue().indexOf(":"));
+    String actualValue =
+        filterCondition.getValue().substring(filterCondition.getValue().indexOf(":") + 1);
+    assertEquals(ValidationConstraints.MAX_ATTRIBUTE_LENGTH, actualKey.length());
+    assertEquals(ValidationConstraints.MAX_ATTRIBUTE_LENGTH, actualValue.length());
+  }
 }
\ No newline at end of file
diff --git a/src/test/java/com/epam/ta/reportportal/ws/controller/UserFilterControllerValidationTest.java b/src/test/java/com/epam/ta/reportportal/ws/controller/UserFilterControllerValidationTest.java
index def3e3e20b..478bb2b1dd 100644
--- a/src/test/java/com/epam/ta/reportportal/ws/controller/UserFilterControllerValidationTest.java
+++ b/src/test/java/com/epam/ta/reportportal/ws/controller/UserFilterControllerValidationTest.java
@@ -32,11 +32,11 @@
 import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.put;
 import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
 
+import com.epam.ta.reportportal.model.filter.Order;
+import com.epam.ta.reportportal.model.filter.UpdateUserFilterRQ;
+import com.epam.ta.reportportal.model.filter.UserFilterCondition;
 import com.epam.ta.reportportal.ws.BaseMvcTest;
 import com.epam.ta.reportportal.ws.model.ErrorRS;
-import com.epam.ta.reportportal.ws.model.filter.Order;
-import com.epam.ta.reportportal.ws.model.filter.UpdateUserFilterRQ;
-import com.epam.ta.reportportal.ws.model.filter.UserFilterCondition;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.google.common.collect.Lists;
 import com.google.common.collect.Sets;
@@ -51,8 +51,8 @@ public class UserFilterControllerValidationTest extends BaseMvcTest {
 
   private static final String FILTER_PATH = "/filter";
 
-  private static final String FIELD_NAME_SIZE_MESSAGE = String.format(
-      FIELD_NAME_SIZE_MESSAGE_WITH_FORMAT, 3, 128);
+  private static final String FIELD_NAME_SIZE_MESSAGE =
+      String.format(FIELD_NAME_SIZE_MESSAGE_WITH_FORMAT, 3, 128);
 
   @Autowired
   private ObjectMapper objectMapper;
@@ -63,15 +63,14 @@ public void createFilterShouldReturnErrorWhenNameIsNull() throws Exception {
     UpdateUserFilterRQ userFilterRQ = prepareFilter();
 
     //WHEN
-    MvcResult mvcResult = mockMvc.perform(post(DEFAULT_PROJECT_BASE_URL + FILTER_PATH)
-            .with(token(oAuthHelper.getDefaultToken()))
-            .content(objectMapper.writeValueAsBytes(userFilterRQ))
-            .contentType(APPLICATION_JSON))
+    MvcResult mvcResult = mockMvc.perform(
+            post(DEFAULT_PROJECT_BASE_URL + FILTER_PATH).with(token(oAuthHelper.getDefaultToken()))
+                .content(objectMapper.writeValueAsBytes(userFilterRQ)).contentType(APPLICATION_JSON))
         .andExpect(status().isBadRequest()).andReturn();
 
     //THEN
-    ErrorRS error = objectMapper.readValue(mvcResult.getResponse().getContentAsString(),
-        ErrorRS.class);
+    ErrorRS error =
+        objectMapper.readValue(mvcResult.getResponse().getContentAsString(), ErrorRS.class);
     assertEquals(INCORRECT_REQUEST, error.getErrorType());
     assertEquals(INCORRECT_REQUEST_MESSAGE + FIELD_NAME_IS_NULL_MESSAGE, error.getMessage());
   }
@@ -83,15 +82,14 @@ public void createFilterShouldReturnErrorWhenNameIsEmpty() throws Exception {
     userFilterRQ.setName(EMPTY);
 
     //WHEN
-    MvcResult mvcResult = mockMvc.perform(post(DEFAULT_PROJECT_BASE_URL + FILTER_PATH)
-            .with(token(oAuthHelper.getDefaultToken()))
-            .content(objectMapper.writeValueAsBytes(userFilterRQ))
-            .contentType(APPLICATION_JSON))
+    MvcResult mvcResult = mockMvc.perform(
+            post(DEFAULT_PROJECT_BASE_URL + FILTER_PATH).with(token(oAuthHelper.getDefaultToken()))
+                .content(objectMapper.writeValueAsBytes(userFilterRQ)).contentType(APPLICATION_JSON))
         .andExpect(status().isBadRequest()).andReturn();
 
     //THEN
-    ErrorRS error = objectMapper.readValue(mvcResult.getResponse().getContentAsString(),
-        ErrorRS.class);
+    ErrorRS error =
+        objectMapper.readValue(mvcResult.getResponse().getContentAsString(), ErrorRS.class);
     assertEquals(INCORRECT_REQUEST, error.getErrorType());
     assertEquals(INCORRECT_REQUEST_MESSAGE + "[" + FIELD_NAME_IS_BLANK_MESSAGE + " "
         + FIELD_NAME_SIZE_MESSAGE + "] ", error.getMessage());
@@ -104,15 +102,14 @@ public void createFilterShouldReturnErrorWhenNameConsistsOfWhitespaces() throws
     userFilterRQ.setName(WHITESPACES_NAME_VALUE);
 
     //WHEN
-    MvcResult mvcResult = mockMvc.perform(post(DEFAULT_PROJECT_BASE_URL + FILTER_PATH)
-            .with(token(oAuthHelper.getDefaultToken()))
-            .content(objectMapper.writeValueAsBytes(userFilterRQ))
-            .contentType(APPLICATION_JSON))
+    MvcResult mvcResult = mockMvc.perform(
+            post(DEFAULT_PROJECT_BASE_URL + FILTER_PATH).with(token(oAuthHelper.getDefaultToken()))
+                .content(objectMapper.writeValueAsBytes(userFilterRQ)).contentType(APPLICATION_JSON))
         .andExpect(status().isBadRequest()).andReturn();
 
     //THEN
-    ErrorRS error = objectMapper.readValue(mvcResult.getResponse().getContentAsString(),
-        ErrorRS.class);
+    ErrorRS error =
+        objectMapper.readValue(mvcResult.getResponse().getContentAsString(), ErrorRS.class);
     assertEquals(INCORRECT_REQUEST, error.getErrorType());
     assertEquals(INCORRECT_REQUEST_MESSAGE + "[" + FIELD_NAME_IS_BLANK_MESSAGE + " "
         + FIELD_NAME_SIZE_MESSAGE + "] ", error.getMessage());
@@ -125,18 +122,18 @@ public void createFilterShouldReturnErrorWhenNameIsLessThanThreeCharacters() thr
     userFilterRQ.setName(SHORT_NAME_VALUE);
 
     //WHEN
-    MvcResult mvcResult = mockMvc.perform(post(DEFAULT_PROJECT_BASE_URL + FILTER_PATH)
-            .with(token(oAuthHelper.getDefaultToken()))
-            .content(objectMapper.writeValueAsBytes(userFilterRQ))
-            .contentType(APPLICATION_JSON))
+    MvcResult mvcResult = mockMvc.perform(
+            post(DEFAULT_PROJECT_BASE_URL + FILTER_PATH).with(token(oAuthHelper.getDefaultToken()))
+                .content(objectMapper.writeValueAsBytes(userFilterRQ)).contentType(APPLICATION_JSON))
         .andExpect(status().isBadRequest()).andReturn();
 
     //THEN
-    ErrorRS error = objectMapper.readValue(mvcResult.getResponse().getContentAsString(),
-        ErrorRS.class);
+    ErrorRS error =
+        objectMapper.readValue(mvcResult.getResponse().getContentAsString(), ErrorRS.class);
     assertEquals(INCORRECT_REQUEST, error.getErrorType());
     assertEquals(INCORRECT_REQUEST_MESSAGE + "[" + FIELD_NAME_SIZE_MESSAGE + "] ",
-        error.getMessage());
+        error.getMessage()
+    );
   }
 
   @Test
@@ -147,18 +144,18 @@ public void createFilterShouldReturnErrorWhenNameIsGreaterThanOneHundredAndTwent
     userFilterRQ.setName(LONG_NAME_VALUE);
 
     //WHEN
-    MvcResult mvcResult = mockMvc.perform(post(DEFAULT_PROJECT_BASE_URL + FILTER_PATH)
-            .with(token(oAuthHelper.getDefaultToken()))
-            .content(objectMapper.writeValueAsBytes(userFilterRQ))
-            .contentType(APPLICATION_JSON))
+    MvcResult mvcResult = mockMvc.perform(
+            post(DEFAULT_PROJECT_BASE_URL + FILTER_PATH).with(token(oAuthHelper.getDefaultToken()))
+                .content(objectMapper.writeValueAsBytes(userFilterRQ)).contentType(APPLICATION_JSON))
         .andExpect(status().isBadRequest()).andReturn();
 
     //THEN
-    ErrorRS error = objectMapper.readValue(mvcResult.getResponse().getContentAsString(),
-        ErrorRS.class);
+    ErrorRS error =
+        objectMapper.readValue(mvcResult.getResponse().getContentAsString(), ErrorRS.class);
     assertEquals(INCORRECT_REQUEST, error.getErrorType());
     assertEquals(INCORRECT_REQUEST_MESSAGE + "[" + FIELD_NAME_SIZE_MESSAGE + "] ",
-        error.getMessage());
+        error.getMessage()
+    );
   }
 
   @Test
@@ -167,15 +164,15 @@ public void updateFilterShouldReturnErrorWhenNameIsNull() throws Exception {
     UpdateUserFilterRQ userFilterRQ = prepareFilter();
 
     //WHEN
-    MvcResult mvcResult = mockMvc.perform(put(DEFAULT_PROJECT_BASE_URL + FILTER_PATH + ID_PATH)
-            .with(token(oAuthHelper.getDefaultToken()))
-            .content(objectMapper.writeValueAsBytes(userFilterRQ))
-            .contentType(APPLICATION_JSON))
+    MvcResult mvcResult = mockMvc.perform(
+            put(DEFAULT_PROJECT_BASE_URL + FILTER_PATH + ID_PATH).with(
+                    token(oAuthHelper.getDefaultToken()))
+                .content(objectMapper.writeValueAsBytes(userFilterRQ)).contentType(APPLICATION_JSON))
         .andExpect(status().isBadRequest()).andReturn();
 
     //THEN
-    ErrorRS error = objectMapper.readValue(mvcResult.getResponse().getContentAsString(),
-        ErrorRS.class);
+    ErrorRS error =
+        objectMapper.readValue(mvcResult.getResponse().getContentAsString(), ErrorRS.class);
     assertEquals(INCORRECT_REQUEST, error.getErrorType());
     assertEquals(INCORRECT_REQUEST_MESSAGE + FIELD_NAME_IS_NULL_MESSAGE, error.getMessage());
   }
@@ -187,15 +184,15 @@ public void updateFilterShouldReturnErrorWhenNameIsEmpty() throws Exception {
     userFilterRQ.setName(EMPTY);
 
     //WHEN
-    MvcResult mvcResult = mockMvc.perform(put(DEFAULT_PROJECT_BASE_URL + FILTER_PATH + ID_PATH)
-            .with(token(oAuthHelper.getDefaultToken()))
-            .content(objectMapper.writeValueAsBytes(userFilterRQ))
-            .contentType(APPLICATION_JSON))
+    MvcResult mvcResult = mockMvc.perform(
+            put(DEFAULT_PROJECT_BASE_URL + FILTER_PATH + ID_PATH).with(
+                    token(oAuthHelper.getDefaultToken()))
+                .content(objectMapper.writeValueAsBytes(userFilterRQ)).contentType(APPLICATION_JSON))
         .andExpect(status().isBadRequest()).andReturn();
 
     //THEN
-    ErrorRS error = objectMapper.readValue(mvcResult.getResponse().getContentAsString(),
-        ErrorRS.class);
+    ErrorRS error =
+        objectMapper.readValue(mvcResult.getResponse().getContentAsString(), ErrorRS.class);
     assertEquals(INCORRECT_REQUEST, error.getErrorType());
     assertEquals(INCORRECT_REQUEST_MESSAGE + "[" + FIELD_NAME_IS_BLANK_MESSAGE + " "
         + FIELD_NAME_SIZE_MESSAGE + "] ", error.getMessage());
@@ -208,15 +205,15 @@ public void updateFilterShouldReturnErrorWhenNameConsistsOfWhitespaces() throws
     userFilterRQ.setName(WHITESPACES_NAME_VALUE);
 
     //WHEN
-    MvcResult mvcResult = mockMvc.perform(put(DEFAULT_PROJECT_BASE_URL + FILTER_PATH + ID_PATH)
-            .with(token(oAuthHelper.getDefaultToken()))
-            .content(objectMapper.writeValueAsBytes(userFilterRQ))
-            .contentType(APPLICATION_JSON))
+    MvcResult mvcResult = mockMvc.perform(
+            put(DEFAULT_PROJECT_BASE_URL + FILTER_PATH + ID_PATH).with(
+                    token(oAuthHelper.getDefaultToken()))
+                .content(objectMapper.writeValueAsBytes(userFilterRQ)).contentType(APPLICATION_JSON))
         .andExpect(status().isBadRequest()).andReturn();
 
     //THEN
-    ErrorRS error = objectMapper.readValue(mvcResult.getResponse().getContentAsString(),
-        ErrorRS.class);
+    ErrorRS error =
+        objectMapper.readValue(mvcResult.getResponse().getContentAsString(), ErrorRS.class);
     assertEquals(INCORRECT_REQUEST, error.getErrorType());
     assertEquals(INCORRECT_REQUEST_MESSAGE + "[" + FIELD_NAME_IS_BLANK_MESSAGE + " "
         + FIELD_NAME_SIZE_MESSAGE + "] ", error.getMessage());
@@ -229,18 +226,19 @@ public void updateFilterShouldReturnErrorWhenNameIsLessThanThreeCharacters() thr
     userFilterRQ.setName(SHORT_NAME_VALUE);
 
     //WHEN
-    MvcResult mvcResult = mockMvc.perform(put(DEFAULT_PROJECT_BASE_URL + FILTER_PATH + ID_PATH)
-            .with(token(oAuthHelper.getDefaultToken()))
-            .content(objectMapper.writeValueAsBytes(userFilterRQ))
-            .contentType(APPLICATION_JSON))
+    MvcResult mvcResult = mockMvc.perform(
+            put(DEFAULT_PROJECT_BASE_URL + FILTER_PATH + ID_PATH).with(
+                    token(oAuthHelper.getDefaultToken()))
+                .content(objectMapper.writeValueAsBytes(userFilterRQ)).contentType(APPLICATION_JSON))
         .andExpect(status().isBadRequest()).andReturn();
 
     //THEN
-    ErrorRS error = objectMapper.readValue(mvcResult.getResponse().getContentAsString(),
-        ErrorRS.class);
+    ErrorRS error =
+        objectMapper.readValue(mvcResult.getResponse().getContentAsString(), ErrorRS.class);
     assertEquals(INCORRECT_REQUEST, error.getErrorType());
     assertEquals(INCORRECT_REQUEST_MESSAGE + "[" + FIELD_NAME_SIZE_MESSAGE + "] ",
-        error.getMessage());
+        error.getMessage()
+    );
   }
 
   @Test
@@ -251,18 +249,19 @@ public void updateFilterShouldReturnErrorWhenNameIsGreaterThanOneHundredAndTwent
     userFilterRQ.setName(LONG_NAME_VALUE);
 
     //WHEN
-    MvcResult mvcResult = mockMvc.perform(put(DEFAULT_PROJECT_BASE_URL + FILTER_PATH + ID_PATH)
-            .with(token(oAuthHelper.getDefaultToken()))
-            .content(objectMapper.writeValueAsBytes(userFilterRQ))
-            .contentType(APPLICATION_JSON))
+    MvcResult mvcResult = mockMvc.perform(
+            put(DEFAULT_PROJECT_BASE_URL + FILTER_PATH + ID_PATH).with(
+                    token(oAuthHelper.getDefaultToken()))
+                .content(objectMapper.writeValueAsBytes(userFilterRQ)).contentType(APPLICATION_JSON))
         .andExpect(status().isBadRequest()).andReturn();
 
     //THEN
-    ErrorRS error = objectMapper.readValue(mvcResult.getResponse().getContentAsString(),
-        ErrorRS.class);
+    ErrorRS error =
+        objectMapper.readValue(mvcResult.getResponse().getContentAsString(), ErrorRS.class);
     assertEquals(INCORRECT_REQUEST, error.getErrorType());
     assertEquals(INCORRECT_REQUEST_MESSAGE + "[" + FIELD_NAME_SIZE_MESSAGE + "] ",
-        error.getMessage());
+        error.getMessage()
+    );
   }
 
   private UpdateUserFilterRQ prepareFilter() {
diff --git a/src/test/java/com/epam/ta/reportportal/ws/controller/WidgetControllerTest.java b/src/test/java/com/epam/ta/reportportal/ws/controller/WidgetControllerTest.java
index 22a8d60233..a4cfb42657 100644
--- a/src/test/java/com/epam/ta/reportportal/ws/controller/WidgetControllerTest.java
+++ b/src/test/java/com/epam/ta/reportportal/ws/controller/WidgetControllerTest.java
@@ -16,835 +16,864 @@
 
 package com.epam.ta.reportportal.ws.controller;
 
+import static org.hamcrest.Matchers.hasSize;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.springframework.http.MediaType.APPLICATION_JSON;
+import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get;
+import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.post;
+import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.put;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.content;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.jsonPath;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
+
 import com.epam.ta.reportportal.dao.WidgetRepository;
 import com.epam.ta.reportportal.entity.widget.Widget;
+import com.epam.ta.reportportal.model.EntryCreatedRS;
+import com.epam.ta.reportportal.model.widget.ContentParameters;
+import com.epam.ta.reportportal.model.widget.WidgetPreviewRQ;
+import com.epam.ta.reportportal.model.widget.WidgetRQ;
 import com.epam.ta.reportportal.ws.BaseMvcTest;
-import com.epam.ta.reportportal.ws.model.EntryCreatedRS;
-import com.epam.ta.reportportal.ws.model.widget.ContentParameters;
-import com.epam.ta.reportportal.ws.model.widget.WidgetPreviewRQ;
-import com.epam.ta.reportportal.ws.model.widget.WidgetRQ;
 import com.fasterxml.jackson.databind.ObjectMapper;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.Optional;
 import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.test.context.jdbc.Sql;
 import org.springframework.test.web.servlet.MvcResult;
 
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.Optional;
-
-import static org.hamcrest.Matchers.hasSize;
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertTrue;
-import static org.springframework.http.MediaType.APPLICATION_JSON;
-import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.*;
-import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.*;
-
 /**
  * @author <a href="mailto:ihar_kahadouski@epam.com">Ihar Kahadouski</a>
  */
 @Sql("/db/shareable/shareable-fill.sql")
 class WidgetControllerTest extends BaseMvcTest {
 
-	@Autowired
-	private ObjectMapper objectMapper;
-
-	@Autowired
-	private WidgetRepository widgetRepository;
-
-	@Test
-	void createWidgetPositive() throws Exception {
-		WidgetRQ rq = new WidgetRQ();
-		rq.setName("widget");
-		rq.setDescription("description");
-		rq.setWidgetType("oldLineChart");
-		ContentParameters contentParameters = new ContentParameters();
-		contentParameters.setContentFields(Collections.singletonList("statistics$executions$passed"));
-		contentParameters.setItemsCount(50);
-		rq.setFilterIds(Collections.singletonList(3L));
-		rq.setContentParameters(contentParameters);
-		final MvcResult mvcResult = mockMvc.perform(post(DEFAULT_PROJECT_BASE_URL + "/widget").with(token(oAuthHelper.getDefaultToken()))
-				.content(objectMapper.writeValueAsBytes(rq))
-				.contentType(APPLICATION_JSON)).andExpect(status().isCreated()).andReturn();
-		final EntryCreatedRS entryCreatedRS = objectMapper.readValue(mvcResult.getResponse().getContentAsString(), EntryCreatedRS.class);
-		final Optional<Widget> optionalWidget = widgetRepository.findById(entryCreatedRS.getId());
-		assertTrue(optionalWidget.isPresent());
-		assertEquals("widget", optionalWidget.get().getName());
-		assertEquals("description", optionalWidget.get().getDescription());
-	}
-
-	@Test
-	void getWidgetPositive() throws Exception {
-		mockMvc.perform(get(DEFAULT_PROJECT_BASE_URL + "/widget/10").with(token(oAuthHelper.getDefaultToken()))).andExpect(status().isOk());
-	}
-
-	@Test
-	void updateWidgetPositive() throws Exception {
-		final WidgetRQ rq = new WidgetRQ();
-		rq.setName("updated");
-		rq.setDescription("updated");
-		rq.setWidgetType("activityStream");
-		final ContentParameters contentParameters = new ContentParameters();
-		contentParameters.setContentFields(Arrays.asList("number", "start_time", "user"));
-		contentParameters.setItemsCount(50);
-		rq.setContentParameters(contentParameters);
-		mockMvc.perform(put(DEFAULT_PROJECT_BASE_URL + "/widget/12").with(token(oAuthHelper.getDefaultToken()))
-				.content(objectMapper.writeValueAsBytes(rq))
-				.contentType(APPLICATION_JSON)).andExpect(status().isOk());
-		final Optional<Widget> optionalWidget = widgetRepository.findById(12L);
-		assertTrue(optionalWidget.isPresent());
-		assertEquals("updated", optionalWidget.get().getName());
-		assertEquals("updated", optionalWidget.get().getDescription());
-	}
-
-	@Test
-	void updateNonExistingWidget() throws Exception {
-		WidgetRQ rq = new WidgetRQ();
-		rq.setName("name");
-		rq.setWidgetType("oldLineChart");
-	    var contextParams =	new ContentParameters();
-	    contextParams.setItemsCount(1);
-		contextParams.setContentFields(Collections.singletonList("test"));
-		rq.setContentParameters(contextParams);
-		mockMvc.perform(put(DEFAULT_PROJECT_BASE_URL + "/widget/100").with(token(oAuthHelper.getDefaultToken()))
-				.content(objectMapper.writeValueAsBytes(rq))
-				.contentType(APPLICATION_JSON)).andExpect(status().isNotFound());
-	}
-
-	@Test
-	void updateWidgetWithDuplicatedName() throws Exception {
-		final WidgetRQ rq = new WidgetRQ();
-		rq.setName("LAUNCH STATISTICS");
-		rq.setDescription("updated");
-		rq.setWidgetType("activityStream");
-		final ContentParameters contentParameters = new ContentParameters();
-		contentParameters.setContentFields(Arrays.asList("number", "start_time", "user"));
-		contentParameters.setItemsCount(50);
-		rq.setContentParameters(contentParameters);
-		mockMvc.perform(put(SUPERADMIN_PROJECT_BASE_URL + "/widget/5").with(token(oAuthHelper.getSuperadminToken()))
-				.content(objectMapper.writeValueAsBytes(rq))
-				.contentType(APPLICATION_JSON)).andExpect(status().isConflict());
-	}
-
-	@Test
-	void getSharedWidgetsListPositive() throws Exception {
-		mockMvc.perform(get(SUPERADMIN_PROJECT_BASE_URL + "/widget/shared").with(token(oAuthHelper.getSuperadminToken())))
-				.andExpect(status().isBadRequest());
-	}
-
-	@Test
-	void searchSharedWidgetsListPositive() throws Exception {
-		mockMvc.perform(get(SUPERADMIN_PROJECT_BASE_URL + "/widget/shared/search?term=ch").with(token(oAuthHelper.getSuperadminToken())))
-				.andExpect(status().isNotFound());
-	}
-
-	@Test
-	void getWidgetNamesPositive() throws Exception {
-		mockMvc.perform(get(DEFAULT_PROJECT_BASE_URL + "/widget/names/all").with(token(oAuthHelper.getDefaultToken())))
-				.andExpect(status().is(200));
-	}
-
-	@Test
-	void getWidgetPreview() throws Exception {
-		WidgetPreviewRQ request = new WidgetPreviewRQ();
-		request.setWidgetType("launchStatistics");
-		final ContentParameters contentParameters = new ContentParameters();
-		final HashMap<String, Object> widgetOptions = new HashMap<>();
-		widgetOptions.put("timeline", "WEEK");
-		contentParameters.setWidgetOptions(widgetOptions);
-		contentParameters.setItemsCount(20);
-		contentParameters.setContentFields(Arrays.asList(
-				"statistics$executions$total",
-				"statistics$executions$passed",
-				"statistics$executions$failed",
-				"statistics$executions$skipped"
-		));
-		request.setContentParameters(contentParameters);
-		request.setFilterIds(Collections.singletonList(4L));
-
-		mockMvc.perform(post(DEFAULT_PROJECT_BASE_URL + "/widget/preview").with(token(oAuthHelper.getDefaultToken()))
-				.contentType(APPLICATION_JSON)
-				.content(objectMapper.writeValueAsBytes(request))).andExpect(status().isOk());
-	}
-
-	@Sql("/db/widget/launch-statistics.sql")
-	@Test
-	void getLaunchStatisticsWidget() throws Exception {
-		mockMvc.perform(get(SUPERADMIN_PROJECT_BASE_URL + "/widget/2").with(token(oAuthHelper.getSuperadminToken())))
-				.andExpect(status().isOk())
-				.andExpect(content().contentType("application/json"))
-				.andExpect(jsonPath("$.name").value("launch stats"))
-				.andExpect(jsonPath("$.widgetType").value("launchStatistics"))
-				.andExpect(jsonPath("$.content.result[0].name").value("test launch"))
-				.andExpect(jsonPath("$.content.result[0].values.statistics$defects$automation_bug$ab001").value("1"))
-				.andExpect(jsonPath("$.content.result[0].values.statistics$defects$product_bug$pb001").value("1"))
-				.andExpect(jsonPath("$.content.result[0].values.statistics$defects$to_investigate$ti001").value("1"))
-				.andExpect(jsonPath("$.content.result[0].values.statistics$executions$failed").value("3"))
-				.andExpect(jsonPath("$.content.result[0].values.statistics$executions$passed").value("2"))
-				.andExpect(jsonPath("$.content.result[0].values.statistics$executions$total").value("5"));
-	}
-
-	@Sql("/db/widget/not-passed.sql")
-	@Test
-	void getNotPassedWidget() throws Exception {
-		mockMvc.perform(get(SUPERADMIN_PROJECT_BASE_URL + "/widget/2").with(token(oAuthHelper.getSuperadminToken())))
-				.andExpect(status().isOk())
-				.andExpect(content().contentType("application/json"))
-				.andExpect(jsonPath("$.name").value("not passed"))
-				.andExpect(jsonPath("$.widgetType").value("notPassed"))
-				.andExpect(jsonPath("$.content.result[0].name").value("test launch"))
-				.andExpect(jsonPath("$.content.result[0].values.*").value("60.0"));
-	}
-
-	@Sql("/db/widget/not-passed.sql")
-	@Test
-	void getEmptyContentNotPassedWidget() throws Exception {
-		mockMvc.perform(get(SUPERADMIN_PROJECT_BASE_URL + "/widget/3").with(token(oAuthHelper.getSuperadminToken())))
-				.andExpect(status().isOk())
-				.andExpect(jsonPath("$.content").isEmpty());
-	}
-
-	@Sql("/db/widget/launches-comparison-chart.sql")
-	@Test
-	void getLaunchesComparisonWidget() throws Exception {
-		mockMvc.perform(get(SUPERADMIN_PROJECT_BASE_URL + "/widget/2").with(token(oAuthHelper.getSuperadminToken())))
-				.andExpect(status().isOk())
-				.andExpect(content().contentType("application/json"))
-				.andExpect(jsonPath("$.name").value("launch comparison"))
-				.andExpect(jsonPath("$.widgetType").value("launchesComparisonChart"))
-				.andExpect(jsonPath("$.content.result[0].name").value("test launch"))
-				.andExpect(jsonPath("$.content.result[0].values.statistics$defects$automation_bug$ab001").value("33.33"))
-				.andExpect(jsonPath("$.content.result[0].values.statistics$defects$product_bug$pb001").value("33.33"))
-				.andExpect(jsonPath("$.content.result[0].values.statistics$defects$to_investigate$ti001").value("33.33"))
-				.andExpect(jsonPath("$.content.result[0].values.statistics$executions$failed").value("60.0"))
-				.andExpect(jsonPath("$.content.result[0].values.statistics$executions$passed").value("40.0"))
-				.andExpect(jsonPath("$.content.result[0].values.statistics$executions$total").value("5.0"))
-				.andExpect(jsonPath("$.content.result[1].name").value("test launch"))
-				.andExpect(jsonPath("$.content.result[1].values.statistics$defects$product_bug$pb001").value("33.33"))
-				.andExpect(jsonPath("$.content.result[1].values.statistics$defects$to_investigate$ti001").value("66.67"))
-				.andExpect(jsonPath("$.content.result[1].values.statistics$executions$failed").value("60.0"))
-				.andExpect(jsonPath("$.content.result[1].values.statistics$executions$passed").value("20.0"))
-				.andExpect(jsonPath("$.content.result[1].values.statistics$executions$skipped").value("20.0"))
-				.andExpect(jsonPath("$.content.result[1].values.statistics$executions$total").value("5.0"));
-	}
-
-	@Sql("/db/widget/launches-comparison-chart.sql")
-	@Test
-	void getEmptyContentLaunchesComparisonWidget() throws Exception {
-		mockMvc.perform(get(SUPERADMIN_PROJECT_BASE_URL + "/widget/3").with(token(oAuthHelper.getSuperadminToken())))
-				.andExpect(status().isOk())
-				.andExpect(content().contentType("application/json"))
-				.andExpect(jsonPath("$.name").value("launch comparison"))
-				.andExpect(jsonPath("$.widgetType").value("launchesComparisonChart"))
-				.andExpect(jsonPath("$.content").isEmpty());
-	}
-
-	@Sql("/db/widget/launches-duration-chart.sql")
-	@Test
-	void getLaunchesDurationWidget() throws Exception {
-		mockMvc.perform(get(SUPERADMIN_PROJECT_BASE_URL + "/widget/2").with(token(oAuthHelper.getSuperadminToken())))
-				.andExpect(status().isOk())
-				.andExpect(content().contentType("application/json"))
-				.andExpect(jsonPath("$.name").value("launches duration"))
-				.andExpect(jsonPath("$.widgetType").value("launchesDurationChart"))
-				.andExpect(jsonPath("$.content.result[0].name").value("test launch"))
-				.andExpect(jsonPath("$.content.result[0].duration").value("540000"))
-				.andExpect(jsonPath("$.content.result[1].name").value("test launch"))
-				.andExpect(jsonPath("$.content.result[1].duration").value("660000"));
-	}
-
-	@Sql("/db/widget/launches-duration-chart.sql")
-	@Test
-	void getEmptyContentLaunchesDurationWidget() throws Exception {
-		mockMvc.perform(get(SUPERADMIN_PROJECT_BASE_URL + "/widget/3").with(token(oAuthHelper.getSuperadminToken())))
-				.andExpect(status().isOk())
-				.andExpect(content().contentType("application/json"))
-				.andExpect(jsonPath("$.name").value("launches duration"))
-				.andExpect(jsonPath("$.widgetType").value("launchesDurationChart"))
-				.andExpect(jsonPath("$.content").isEmpty());
-	}
-
-	@Sql("/db/widget/bug-trend.sql")
-	@Test
-	void getBugTrendWidget() throws Exception {
-		mockMvc.perform(get(SUPERADMIN_PROJECT_BASE_URL + "/widget/2").with(token(oAuthHelper.getSuperadminToken())))
-				.andExpect(status().isOk())
-				.andExpect(content().contentType("application/json"))
-				.andExpect(jsonPath("$.name").value("bug trend"))
-				.andExpect(jsonPath("$.widgetType").value("bugTrend"))
-				.andExpect(jsonPath("$.content.result[0].name").value("test launch"))
-				.andExpect(jsonPath("$.content.result[0].values.statistics$executions$failed").value("3"))
-				.andExpect(jsonPath("$.content.result[0].values.total").value("3"))
-				.andExpect(jsonPath("$.content.result[1].name").value("test launch"))
-				.andExpect(jsonPath("$.content.result[1].values.statistics$executions$failed").value("3"))
-				.andExpect(jsonPath("$.content.result[1].values.total").value("3"));
-	}
-
-	@Sql("/db/widget/launches-table.sql")
-	@Test
-	void getLaunchesTableWidget() throws Exception {
-		mockMvc.perform(get(SUPERADMIN_PROJECT_BASE_URL + "/widget/2").with(token(oAuthHelper.getSuperadminToken())))
-				.andExpect(status().isOk())
-				.andExpect(content().contentType("application/json"))
-				.andExpect(jsonPath("$.name").value("launches table"))
-				.andExpect(jsonPath("$.widgetType").value("launchesTable"))
-				.andExpect(jsonPath("$.content.result[0].values.statistics$executions$skipped").value("1"))
-				.andExpect(jsonPath("$.content.result[0].values.status").value("FAILED"))
-				.andExpect(jsonPath("$.content.result[0].values.description").value("desc"))
-				.andExpect(jsonPath("$.content.result[0].values.user").value("superadmin"))
-				.andExpect(jsonPath("$.content.result[0].values.statistics$executions$failed").value("3"))
-				.andExpect(jsonPath("$.content.result[0].values.statistics$executions$total").value("5"))
-				.andExpect(jsonPath("$.content.result[0].values.statistics$executions$passed").value("1"))
-				.andExpect(jsonPath("$..attributes[?(@.value == 'value1')]").exists())
-				.andExpect(jsonPath("$..attributes[?(@.value == 'value')]").exists())
-				.andReturn();
-	}
-
-	@Sql("/db/widget/launches-table.sql")
-	@Test
-	void getEmptyContentLaunchesTableWidget() throws Exception {
-		mockMvc.perform(get(SUPERADMIN_PROJECT_BASE_URL + "/widget/3").with(token(oAuthHelper.getSuperadminToken())))
-				.andExpect(status().isOk())
-				.andExpect(content().contentType("application/json"))
-				.andExpect(jsonPath("$.name").value("launches table"))
-				.andExpect(jsonPath("$.widgetType").value("launchesTable"))
-				.andExpect(jsonPath("$.content").isEmpty());
-	}
-
-	@Sql("/db/widget/top-test-cases.sql")
-	@Test
-	void getTopTestCasesWidget() throws Exception {
-		mockMvc.perform(get(SUPERADMIN_PROJECT_BASE_URL + "/widget/1").with(token(oAuthHelper.getSuperadminToken())))
-				.andExpect(status().isOk())
-				.andExpect(content().contentType("application/json"))
-				.andExpect(jsonPath("$.name").value("top test cases"))
-				.andExpect(jsonPath("$.widgetType").value("topTestCases"))
-				.andExpect(jsonPath("$.content.latestLaunch.name").value("test launch"))
-				.andExpect(jsonPath("$.content.result[0].name").value("test item 5"))
-				.andExpect(jsonPath("$.content.result[0].total").value("1"))
-				.andExpect(jsonPath("$.content.result[1].name").value("test item 2"))
-				.andExpect(jsonPath("$.content.result[1].total").value("1"))
-				.andExpect(jsonPath("$.content.result[2].name").value("test item 3"))
-				.andExpect(jsonPath("$.content.result[2].total").value("1"));
-	}
-
-	@Sql("/db/widget/top-test-cases.sql")
-	@Test
-	void getEmptyContentTopTestCasesWidget() throws Exception {
-		mockMvc.perform(get(SUPERADMIN_PROJECT_BASE_URL + "/widget/2").with(token(oAuthHelper.getSuperadminToken())))
-				.andExpect(status().isOk())
-				.andExpect(content().contentType("application/json"))
-				.andExpect(jsonPath("$.name").value("top test cases"))
-				.andExpect(jsonPath("$.widgetType").value("topTestCases"))
-				.andExpect(jsonPath("$.content").isEmpty());
-	}
-
-	@Sql("/db/widget/top-test-cases.sql")
-	@Test
-	void getTopTestCasesWidgetWithNotExistLaunch() throws Exception {
-		mockMvc.perform(get(SUPERADMIN_PROJECT_BASE_URL + "/widget/3").with(token(oAuthHelper.getSuperadminToken())))
-				.andExpect(status().isOk())
-				.andExpect(jsonPath("$.content").isEmpty());
-	}
-
-	@Sql("/db/widget/top-test-cases.sql")
-	@Test
-	void getTopTestCasesIncludeMethodsWidget() throws Exception {
-		mockMvc.perform(get(SUPERADMIN_PROJECT_BASE_URL + "/widget/4").with(token(oAuthHelper.getSuperadminToken())))
-				.andExpect(status().isOk())
-				.andExpect(content().contentType("application/json"))
-				.andExpect(jsonPath("$.name").value("top test cases"))
-				.andExpect(jsonPath("$.widgetType").value("topTestCases"))
-				.andExpect(jsonPath("$.content.latestLaunch.name").value("test launch"))
-				.andExpect(jsonPath("$.content.result[0].name").value("test item 5"))
-				.andExpect(jsonPath("$.content.result[0].total").value("1"))
-				.andExpect(jsonPath("$.content.result[1].name").value("test item 2"))
-				.andExpect(jsonPath("$.content.result[1].total").value("1"))
-				.andExpect(jsonPath("$.content.result[2].name").value("test item 3"))
-				.andExpect(jsonPath("$.content.result[2].total").value("1"));
-	}
-
-	@Sql("/db/widget/flaky-test-cases.sql")
-	@Test
-	void getFlakyTestCasesWidget() throws Exception {
-		mockMvc.perform(get(SUPERADMIN_PROJECT_BASE_URL + "/widget/1").with(token(oAuthHelper.getSuperadminToken())))
-				.andExpect(status().isOk())
-				.andExpect(content().contentType("application/json"))
-				.andExpect(jsonPath("$.name").value("flaky test cases"))
-				.andExpect(jsonPath("$.widgetType").value("flakyTestCases"))
-				.andExpect(jsonPath("$.content.latestLaunch.name").value("test launch"))
-				.andExpect(jsonPath("$.content.flaky[0].flakyCount").value("1"))
-				.andExpect(jsonPath("$.content.flaky[0].itemName").value("test item 4"));
-	}
-
-	@Sql("/db/widget/flaky-test-cases.sql")
-	@Test
-	void getFlakyTestCasesWidgetWithNotExistLaunch() throws Exception {
-		mockMvc.perform(get(SUPERADMIN_PROJECT_BASE_URL + "/widget/2").with(token(oAuthHelper.getSuperadminToken())))
-				.andExpect(status().isOk());
-	}
-
-	@Sql("/db/widget/flaky-test-cases.sql")
-	@Test
-	void getEmptyContentFlakyTestCasesWidget() throws Exception {
-		mockMvc.perform(get(SUPERADMIN_PROJECT_BASE_URL + "/widget/3").with(token(oAuthHelper.getSuperadminToken())))
-				.andExpect(status().isOk())
-				.andExpect(content().contentType("application/json"))
-				.andExpect(jsonPath("$.name").value("flaky test cases"))
-				.andExpect(jsonPath("$.widgetType").value("flakyTestCases"))
-				.andExpect(jsonPath("$.content").isEmpty());
-	}
-
-	@Sql("/db/widget/flaky-test-cases.sql")
-	@Test
-	void getFlakyTestCasesWithIncludeMethodsWidget() throws Exception {
-		mockMvc.perform(get(SUPERADMIN_PROJECT_BASE_URL + "/widget/4").with(token(oAuthHelper.getSuperadminToken())))
-				.andExpect(status().isOk())
-				.andExpect(content().contentType("application/json"))
-				.andExpect(jsonPath("$.name").value("flaky test cases"))
-				.andExpect(jsonPath("$.widgetType").value("flakyTestCases"))
-				.andExpect(jsonPath("$.content.latestLaunch.name").value("test launch"))
-				.andExpect(jsonPath("$.content.flaky[0].flakyCount").value("1"))
-				.andExpect(jsonPath("$.content.flaky[0].itemName").value("test item 4"));
-	}
-
-	@Sql("/db/widget/cases-trend.sql")
-	@Test
-	void getCasesTrendWidget() throws Exception {
-		mockMvc.perform(get(SUPERADMIN_PROJECT_BASE_URL + "/widget/4").with(token(oAuthHelper.getSuperadminToken())))
-				.andExpect(status().isOk())
-				.andExpect(content().contentType("application/json"))
-				.andExpect(jsonPath("$.name").value("cases trend"))
-				.andExpect(jsonPath("$.widgetType").value("casesTrend"))
-				.andExpect(jsonPath("$.content.result[0].name").value("test launch"))
-				.andExpect(jsonPath("$.content.result[0].number").value("1"))
-				.andExpect(jsonPath("$.content.result[0].values.statistics$executions$total").value("5"))
-				.andExpect(jsonPath("$.content.result[1].name").value("test launch"))
-				.andExpect(jsonPath("$.content.result[1].number").value("2"))
-				.andExpect(jsonPath("$.content.result[1].values.statistics$executions$total").value("5"));
-	}
-
-	@Sql("/db/widget/cases-trend.sql")
-	@Test
-	void getCasesTrendWidgetWithTimeline() throws Exception {
-		mockMvc.perform(get(SUPERADMIN_PROJECT_BASE_URL + "/widget/5").with(token(oAuthHelper.getSuperadminToken())))
-				.andExpect(status().isOk())
-				.andExpect(content().contentType("application/json"))
-				.andExpect(jsonPath("$.name").value("cases trend"))
-				.andExpect(jsonPath("$.widgetType").value("casesTrend"))
-				.andExpect(jsonPath("$.content.result.*.name").value("test launch"))
-				.andExpect(jsonPath("$.content.result.*.number").value(2))
-				.andExpect(jsonPath("$.content.result.*.values.statistics$executions$total").value("5"));
-	}
-
-	@Sql("/db/widget/cases-trend.sql")
-	@Test
-	void getEmptyContentCasesTrendWidget() throws Exception {
-		mockMvc.perform(get(SUPERADMIN_PROJECT_BASE_URL + "/widget/6").with(token(oAuthHelper.getSuperadminToken())))
-				.andExpect(status().isOk())
-				.andExpect(content().contentType("application/json"))
-				.andExpect(jsonPath("$.name").value("cases trend"))
-				.andExpect(jsonPath("$.widgetType").value("casesTrend"))
-				.andExpect(jsonPath("$.content").isEmpty());
-	}
-
-	@Sql("/db/widget/cases-trend.sql")
-	@Test
-	void getCasesTrendWidgetWithWrongTimeLineOption() throws Exception {
-		mockMvc.perform(get(SUPERADMIN_PROJECT_BASE_URL + "/widget/7").with(token(oAuthHelper.getSuperadminToken())))
-				.andExpect(status().isOk())
-				.andExpect(content().contentType("application/json"))
-				.andExpect(jsonPath("$.name").value("cases trend"))
-				.andExpect(jsonPath("$.widgetType").value("casesTrend"))
-				.andExpect(jsonPath("$.content.result[0].name").value("test launch"))
-				.andExpect(jsonPath("$.content.result[0].number").value("1"))
-				.andExpect(jsonPath("$.content.result[0].values.statistics$executions$total").value("5"))
-				.andExpect(jsonPath("$.content.result[1].name").value("test launch"))
-				.andExpect(jsonPath("$.content.result[1].number").value("2"))
-				.andExpect(jsonPath("$.content.result[1].values.statistics$executions$total").value("5"));
-	}
-
-	@Sql("/db/widget/cases-trend.sql")
-	@Test
-	void getCasesTrendWidgetWithDescOrdering() throws Exception {
-		mockMvc.perform(get(SUPERADMIN_PROJECT_BASE_URL + "/widget/8").with(token(oAuthHelper.getSuperadminToken())))
-				.andExpect(status().isOk())
-				.andExpect(content().contentType("application/json"))
-				.andExpect(jsonPath("$.name").value("cases trend"))
-				.andExpect(jsonPath("$.widgetType").value("casesTrend"))
-				.andExpect(jsonPath("$.content.result.*.name").value("test launch"))
-				.andExpect(jsonPath("$.content.result.*.number").value(2))
-				.andExpect(jsonPath("$.content.result.*.values.statistics$executions$total").value("5"));
-	}
-
-	@Sql("/db/widget/passing-rate-per-launch.sql")
-	@Test
-	void getPassingRatePerLaunchWidget() throws Exception {
-		mockMvc.perform(get(SUPERADMIN_PROJECT_BASE_URL + "/widget/1").with(token(oAuthHelper.getSuperadminToken())))
-				.andExpect(status().isOk())
-				.andExpect(content().contentType("application/json"))
-				.andExpect(jsonPath("$.name").value("passing rate per launch"))
-				.andExpect(jsonPath("$.widgetType").value("passingRatePerLaunch"))
-				.andExpect(jsonPath("$.content.result.passed").value("1"))
-				.andExpect(jsonPath("$.content.result.total").value("5"))
-				.andReturn();
-	}
-
-	@Sql("/db/widget/passing-rate-per-launch.sql")
-	@Test
-	void getEmptyContentPassingRatePerLaunchWidget() throws Exception {
-		mockMvc.perform(get(SUPERADMIN_PROJECT_BASE_URL + "/widget/2").with(token(oAuthHelper.getSuperadminToken())))
-				.andExpect(status().isOk())
-				.andExpect(content().contentType("application/json"))
-				.andExpect(jsonPath("$.name").value("passing rate per launch"))
-				.andExpect(jsonPath("$.widgetType").value("passingRatePerLaunch"))
-				.andExpect(jsonPath("$.content").isEmpty());
-	}
-
-	@Sql("/db/widget/passing-rate-per-launch.sql")
-	@Test
-	void getPassingRatePerLaunchWidgetWithNotExistLaunchName() throws Exception {
-		mockMvc.perform(get(SUPERADMIN_PROJECT_BASE_URL + "/widget/3").with(token(oAuthHelper.getSuperadminToken())))
-				.andExpect(status().isOk());
-	}
-
-	@Sql("/db/widget/passing-rate-summary.sql")
-	@Test
-	void getPassingRateSummaryWidget() throws Exception {
-		mockMvc.perform(get(SUPERADMIN_PROJECT_BASE_URL + "/widget/2").with(token(oAuthHelper.getSuperadminToken())))
-				.andExpect(status().isOk())
-				.andExpect(content().contentType("application/json"))
-				.andExpect(jsonPath("$.name").value("passing rate summary"))
-				.andExpect(jsonPath("$.widgetType").value("passingRateSummary"))
-				.andExpect(jsonPath("$.content.result.passed").value("3"))
-				.andExpect(jsonPath("$.content.result.total").value("10"));
-	}
-
-	@Sql("/db/widget/passing-rate-summary.sql")
-	@Test
-	void getEmptyContentPassingRateSummaryWidget() throws Exception {
-		mockMvc.perform(get(SUPERADMIN_PROJECT_BASE_URL + "/widget/3").with(token(oAuthHelper.getSuperadminToken())))
-				.andExpect(status().isOk())
-				.andExpect(jsonPath("$.content").isEmpty());
-	}
-
-	@Sql("/db/widget/old-line-chart.sql")
-	@Test
-	void getOldLineChartWidget() throws Exception {
-		mockMvc.perform(get(SUPERADMIN_PROJECT_BASE_URL + "/widget/2").with(token(oAuthHelper.getSuperadminToken())))
-				.andExpect(status().isOk())
-				.andExpect(content().contentType("application/json"))
-				.andExpect(jsonPath("$.name").value("old line chart"))
-				.andExpect(jsonPath("$.widgetType").value("oldLineChart"))
-				.andExpect(jsonPath("$.content.result[0].name").value("test launch"))
-				.andExpect(jsonPath("$.content.result[0].values.statistics$defects$automation_bug$ab001").value("1"))
-				.andExpect(jsonPath("$.content.result[0].values.statistics$defects$product_bug$pb001").value("1"))
-				.andExpect(jsonPath("$.content.result[0].values.statistics$defects$to_investigate$ti001").value("1"))
-				.andExpect(jsonPath("$.content.result[0].values.statistics$executions$failed").value("3"))
-				.andExpect(jsonPath("$.content.result[0].values.statistics$executions$passed").value("2"))
-				.andExpect(jsonPath("$.content.result[0].values.statistics$executions$total").value("5"));
-	}
-
-	@Sql("/db/widget/old-line-chart.sql")
-	@Test
-	void getEmptyContentOldLineChartWidget() throws Exception {
-		mockMvc.perform(get(SUPERADMIN_PROJECT_BASE_URL + "/widget/3").with(token(oAuthHelper.getSuperadminToken())))
-				.andExpect(status().isOk())
-				.andExpect(content().contentType("application/json"))
-				.andExpect(jsonPath("$.name").value("old line chart"))
-				.andExpect(jsonPath("$.widgetType").value("oldLineChart"))
-				.andExpect(jsonPath("$.content").isEmpty());
-	}
-
-	@Sql("/db/widget/old-line-chart.sql")
-	@Test
-	void getOldLineChartWithTimeLineWidget() throws Exception {
-		mockMvc.perform(get(SUPERADMIN_PROJECT_BASE_URL + "/widget/5").with(token(oAuthHelper.getSuperadminToken())))
-				.andExpect(status().isOk())
-				.andExpect(content().contentType("application/json"))
-				.andExpect(jsonPath("$.name").value("old line chart"))
-				.andExpect(jsonPath("$.widgetType").value("oldLineChart"))
-				.andExpect(jsonPath("$.content.result.*.values.statistics$defects$automation_bug$ab001").value("1.0"))
-				.andExpect(jsonPath("$.content.result.*.values.statistics$defects$product_bug$pb001").value("1.0"))
-				.andExpect(jsonPath("$.content.result.*.values.statistics$defects$automation_bug$ab001").value("1.0"))
-				.andExpect(jsonPath("$.content.result.*.values.statistics$executions$failed").value("3.0"))
-				.andExpect(jsonPath("$.content.result.*.values.statistics$executions$passed").value("2.0"))
-				.andExpect(jsonPath("$.content.result.*.values.statistics$executions$total").value("5.0"));
-	}
-
-	@Sql("/db/widget/old-line-chart.sql")
-	@Test
-	void getEmptyContentOldLineChartWithTimeLineWidget() throws Exception {
-		mockMvc.perform(get(SUPERADMIN_PROJECT_BASE_URL + "/widget/6").with(token(oAuthHelper.getSuperadminToken())))
-				.andExpect(status().isOk())
-				.andExpect(content().contentType("application/json"))
-				.andExpect(jsonPath("$.name").value("old line chart"))
-				.andExpect(jsonPath("$.widgetType").value("oldLineChart"))
-				.andExpect(jsonPath("$.content").isEmpty());
-	}
-
-	@Sql("/db/widget/old-line-chart.sql")
-	@Test
-	void getOldLineChartWidgetWithIncorrectTimeLine() throws Exception {
-		mockMvc.perform(get(SUPERADMIN_PROJECT_BASE_URL + "/widget/7").with(token(oAuthHelper.getSuperadminToken())))
-				.andExpect(status().isOk())
-				.andExpect(content().contentType("application/json"))
-				.andExpect(jsonPath("$.name").value("old line chart"))
-				.andExpect(jsonPath("$.widgetType").value("oldLineChart"))
-				.andExpect(jsonPath("$.content").isEmpty());
-	}
-
-	@Sql("/db/widget/investigated-trend.sql")
-	@Test
-	void getInvestigatedTrendWidget() throws Exception {
-		mockMvc.perform(get(SUPERADMIN_PROJECT_BASE_URL + "/widget/2").with(token(oAuthHelper.getSuperadminToken())))
-				.andExpect(status().isOk())
-				.andExpect(content().contentType("application/json"))
-				.andExpect(jsonPath("$.name").value("investigated trend"))
-				.andExpect(jsonPath("$.widgetType").value("investigatedTrend"))
-				.andExpect(jsonPath("$.content.result[0].name").value("test launch"))
-				.andExpect(jsonPath("$.content.result[0].number").value("1"))
-				.andExpect(jsonPath("$.content.result[0].values.toInvestigate").value("33.33"))
-				.andExpect(jsonPath("$.content.result[0].values.investigated").value("66.67"))
-				.andExpect(jsonPath("$.content.result[1].name").value("test launch"))
-				.andExpect(jsonPath("$.content.result[1].number").value("2"))
-				.andExpect(jsonPath("$.content.result[1].values.toInvestigate").value("66.67"))
-				.andExpect(jsonPath("$.content.result[1].values.investigated").value("33.33"));
-	}
-
-	//Waiting for fix
-	@Disabled
-	@Sql("/db/widget/investigated-trend.sql")
-	@Test
-	void getInvestigatedTrendWidgetWithTimeline() throws Exception {
-		mockMvc.perform(get(SUPERADMIN_PROJECT_BASE_URL + "/widget/3").with(token(oAuthHelper.getSuperadminToken())))
-				.andExpect(status().isOk())
-				.andExpect(content().contentType("application/json"))
-				.andExpect(jsonPath("$.name").value("investigated trend"))
-				.andExpect(jsonPath("$.widgetType").value("investigatedTrend"));
-	}
-
-	@Sql("/db/widget/unique-bug-table.sql")
-	@Test
-	void getUniqueBugTableWidget() throws Exception {
-		mockMvc.perform(get(SUPERADMIN_PROJECT_BASE_URL + "/widget/2").with(token(oAuthHelper.getSuperadminToken())))
-				.andExpect(status().isOk())
-				.andExpect(content().contentType("application/json"))
-				.andExpect(jsonPath("$.name").value("unique bug table"))
-				.andExpect(jsonPath("$.widgetType").value("uniqueBugTable"))
-				.andExpect(jsonPath("$.content.result.ticket1.submitter").value("superadmin"))
-				.andExpect(jsonPath("$.content.result.ticket1.url").value("http:/example.com/ticket1"))
-				.andExpect(jsonPath("$.content.result.ticket1.items[0].launchId").value(1))
-				.andExpect(jsonPath("$.content.result.ticket1.items[0].itemName").value("test item 2"))
-				.andExpect(jsonPath("$.content.result.ticket1.items[0].itemId").value(2))
-				.andExpect(jsonPath("$.content.result.ticket1.items[0].attributes", hasSize(2)));
-	}
-
-	@Sql("/db/widget/unique-bug-table.sql")
-	@Test
-	void getEmptyContentUniqueBugTableWidget() throws Exception {
-		mockMvc.perform(get(SUPERADMIN_PROJECT_BASE_URL + "/widget/3").with(token(oAuthHelper.getSuperadminToken())))
-				.andExpect(status().isOk())
-				.andExpect(content().contentType("application/json"))
-				.andExpect(jsonPath("$.name").value("unique bug table"))
-				.andExpect(jsonPath("$.widgetType").value("uniqueBugTable"))
-				.andExpect(jsonPath("$.content").isEmpty());
-	}
-
-	@Sql("/db/widget/most-time-consuming.sql")
-	@Test
-	void getMostTimeConsumingWidget() throws Exception {
-		mockMvc.perform(get(SUPERADMIN_PROJECT_BASE_URL + "/widget/3").with(token(oAuthHelper.getSuperadminToken())))
-				.andExpect(status().isOk())
-				.andExpect(content().contentType("application/json"))
-				.andExpect(jsonPath("$.name").value("most time consuming"))
-				.andExpect(jsonPath("$.widgetType").value("mostTimeConsuming"))
-				.andExpect(jsonPath("$.content.result[0].name").value("test item 3"))
-				.andExpect(jsonPath("$.content.result[0].duration").value("337.0"))
-				.andExpect(jsonPath("$.content.result[1].name").value("test item 5"))
-				.andExpect(jsonPath("$.content.result[1].duration").value("251.0"))
-				.andExpect(jsonPath("$.content.result[2].name").value("test item 2"))
-				.andExpect(jsonPath("$.content.result[2].duration").value("192.0"))
-				.andExpect(jsonPath("$.content.result[3].name").value("test item 1"))
-				.andExpect(jsonPath("$.content.result[3].duration").value("165.0"))
-				.andExpect(jsonPath("$.content.result[4].name").value("test item 4"))
-				.andExpect(jsonPath("$.content.result[4].duration").value("87.0"));
-	}
-
-	@Sql("/db/widget/most-time-consuming.sql")
-	@Test
-	void getEmptyContentMostTimeConsumingWidget() throws Exception {
-		mockMvc.perform(get(SUPERADMIN_PROJECT_BASE_URL + "/widget/4").with(token(oAuthHelper.getSuperadminToken())))
-				.andExpect(status().isOk())
-				.andExpect(content().contentType("application/json"))
-				.andExpect(jsonPath("$.name").value("most time consuming"))
-				.andExpect(jsonPath("$.widgetType").value("mostTimeConsuming"))
-				.andExpect(jsonPath("$.content").isEmpty());
-	}
-
-	@Sql("/db/widget/most-time-consuming.sql")
-	@Test
-	void getMostTimeConsumingWidgetWithNotExistLaunch() throws Exception {
-		mockMvc.perform(get(SUPERADMIN_PROJECT_BASE_URL + "/widget/5").with(token(oAuthHelper.getSuperadminToken())))
-				.andExpect(status().isOk());
-	}
-
-	@Sql("/db/widget/most-time-consuming.sql")
-	@Test
-	void getMostTimeConsumingWidgetWithIncludeMethods() throws Exception {
-		mockMvc.perform(get(SUPERADMIN_PROJECT_BASE_URL + "/widget/6").with(token(oAuthHelper.getSuperadminToken())))
-				.andExpect(status().isOk())
-				.andExpect(content().contentType("application/json"))
-				.andExpect(jsonPath("$.name").value("most time consuming"))
-				.andExpect(jsonPath("$.widgetType").value("mostTimeConsuming"))
-				.andExpect(jsonPath("$.content.result[0].name").value("test item 3"))
-				.andExpect(jsonPath("$.content.result[0].duration").value("337.0"))
-				.andExpect(jsonPath("$.content.result[1].name").value("test item 5"))
-				.andExpect(jsonPath("$.content.result[1].duration").value("251.0"))
-				.andExpect(jsonPath("$.content.result[2].name").value("test item 2"))
-				.andExpect(jsonPath("$.content.result[2].duration").value("192.0"))
-				.andExpect(jsonPath("$.content.result[3].name").value("test item 1"))
-				.andExpect(jsonPath("$.content.result[3].duration").value("165.0"))
-				.andExpect(jsonPath("$.content.result[4].name").value("test item 4"))
-				.andExpect(jsonPath("$.content.result[4].duration").value("87.0"));
-	}
-
-	@Sql("/db/widget/overall-statistics.sql")
-	@Test
-	void getOverallStatisticsWidget() throws Exception {
-		mockMvc.perform(get(SUPERADMIN_PROJECT_BASE_URL + "/widget/2").with(token(oAuthHelper.getSuperadminToken())))
-				.andExpect(status().isOk())
-				.andExpect(content().contentType("application/json"))
-				.andExpect(jsonPath("$.name").value("overall statistics"))
-				.andExpect(jsonPath("$.widgetType").value("overallStatistics"))
-				.andExpect(jsonPath("$.content.result[0].values.statistics$defects$automation_bug$ab001").value("1"))
-				.andExpect(jsonPath("$.content.result[0].values.statistics$defects$product_bug$pb001").value("1"))
-				.andExpect(jsonPath("$.content.result[0].values.statistics$defects$to_investigate$ti001").value("1"))
-				.andExpect(jsonPath("$.content.result[0].values.statistics$executions$failed").value("3"))
-				.andExpect(jsonPath("$.content.result[0].values.statistics$executions$passed").value("2"))
-				.andExpect(jsonPath("$.content.result[0].values.statistics$executions$total").value("5"));
-	}
-
-	@Sql("/db/widget/overall-statistics.sql")
-	@Test
-	void getEmptyContentOverallStatisticsWidget() throws Exception {
-		mockMvc.perform(get(SUPERADMIN_PROJECT_BASE_URL + "/widget/3").with(token(oAuthHelper.getSuperadminToken())))
-				.andExpect(status().isOk())
-				.andExpect(content().contentType("application/json"))
-				.andExpect(jsonPath("$.name").value("overall statistics"))
-				.andExpect(jsonPath("$.widgetType").value("overallStatistics"))
-				.andExpect(jsonPath("$.content").isEmpty());
-	}
-
-	@Sql("/db/widget/activity-stream.sql")
-	@Test
-	void getActivityStreamWidget() throws Exception {
-		mockMvc.perform(get(SUPERADMIN_PROJECT_BASE_URL + "/widget/1").with(token(oAuthHelper.getSuperadminToken())))
-				.andExpect(status().isOk())
-				.andExpect(content().contentType("application/json"))
-				.andExpect(jsonPath("$.name").value("activity stream"))
-				.andExpect(jsonPath("$.widgetType").value("activityStream"))
-				.andExpect(jsonPath("$.content.result[0].user").value("superadmin"))
-				.andExpect(jsonPath("$.content.result[0].actionType").value("startLaunch"))
-				.andExpect(jsonPath("$.content.result[0].objectType").value("LAUNCH"))
-				.andExpect(jsonPath("$.content.result[1].user").value("superadmin"))
-				.andExpect(jsonPath("$.content.result[1].actionType").value("updateItem"))
-				.andExpect(jsonPath("$.content.result[1].objectType").value("ITEM"))
-				.andExpect(jsonPath("$.content.result[2].user").value("superadmin"))
-				.andExpect(jsonPath("$.content.result[2].actionType").value("deleteLaunch"))
-				.andExpect(jsonPath("$.content.result[2].objectType").value("LAUNCH"));
-	}
-
-	@Sql("/db/widget/activity-stream.sql")
-	@Test
-	void getEmptyContentActivityStreamWidget() throws Exception {
-		mockMvc.perform(get(SUPERADMIN_PROJECT_BASE_URL + "/widget/2").with(token(oAuthHelper.getSuperadminToken())))
-				.andExpect(status().isOk())
-				.andExpect(content().contentType("application/json"))
-				.andExpect(jsonPath("$.name").value("activity stream"))
-				.andExpect(jsonPath("$.widgetType").value("activityStream"))
-				.andExpect(jsonPath("$.content").isEmpty());
-	}
-
-	@Sql("/db/widget/activity-stream.sql")
-	@Test
-	void getActivityStreamWidgetWithNotExistUser() throws Exception {
-		mockMvc.perform(get(SUPERADMIN_PROJECT_BASE_URL + "/widget/3").with(token(oAuthHelper.getSuperadminToken())))
-				.andExpect(status().isNotFound());
-	}
-
-	@Sql("/db/widget/activity-stream.sql")
-	@Test
-	void getActivityStreamWidgetWithEmptyUserOption() throws Exception {
-		mockMvc.perform(get(SUPERADMIN_PROJECT_BASE_URL + "/widget/4").with(token(oAuthHelper.getSuperadminToken())))
-				.andExpect(status().isOk())
-				.andExpect(content().contentType("application/json"))
-				.andExpect(jsonPath("$.name").value("activity stream"))
-				.andExpect(jsonPath("$.widgetType").value("activityStream"))
-				.andExpect(jsonPath("$.content.result[0].user").value("superadmin"))
-				.andExpect(jsonPath("$.content.result[0].actionType").value("startLaunch"))
-				.andExpect(jsonPath("$.content.result[0].objectType").value("LAUNCH"))
-				.andExpect(jsonPath("$.content.result[1].user").value("superadmin"))
-				.andExpect(jsonPath("$.content.result[1].actionType").value("updateItem"))
-				.andExpect(jsonPath("$.content.result[1].objectType").value("ITEM"))
-				.andExpect(jsonPath("$.content.result[2].user").value("superadmin"))
-				.andExpect(jsonPath("$.content.result[2].actionType").value("deleteLaunch"))
-				.andExpect(jsonPath("$.content.result[2].objectType").value("LAUNCH"));
-	}
-
-	@Sql("/db/widget/product-status.sql")
-	@Test
-	void getProductStatusGroupedByLaunchWidget() throws Exception {
-		mockMvc.perform(get(SUPERADMIN_PROJECT_BASE_URL + "/widget/4").with(token(oAuthHelper.getSuperadminToken())))
-				.andExpect(status().isOk())
-				.andExpect(content().contentType("application/json"))
-				.andExpect(jsonPath("$.name").value("product status"))
-				.andExpect(jsonPath("$.widgetType").value("productStatus"))
-				.andExpect(jsonPath("$.content.result[0].name").value("test launch"))
-				.andExpect(jsonPath("$.content.result[0].number").value("1"))
-				.andExpect(jsonPath("$.content.result[0].attributes").isNotEmpty())
-				.andExpect(jsonPath("$.content.result[0].passingRate").value("40.0"))
-				.andExpect(jsonPath("$.content.result[1].name").value("test launch"))
-				.andExpect(jsonPath("$.content.result[1].number").value("2"))
-				.andExpect(jsonPath("$.content.result[1].attributes").doesNotExist())
-				.andExpect(jsonPath("$.content.result[1].passingRate").value("20.0"))
-				.andExpect(jsonPath("$.content.result[2].sum.statistics$executions$passed").value("3"))
-				.andExpect(jsonPath("$.content.result[2].sum.statistics$executions$skipped").value("1"))
-				.andExpect(jsonPath("$.content.result[2].sum.statistics$defects$to_investigate$ti001").value("3"))
-				.andExpect(jsonPath("$.content.result[2].sum.statistics$defects$product_bug$pb001").value("2"))
-				.andExpect(jsonPath("$.content.result[2].sum.statistics$defects$automation_bug$ab001").value("1"))
-				.andExpect(jsonPath("$.content.result[2].sum.statistics$executions$failed").value("6"))
-				.andExpect(jsonPath("$.content.result[2].sum.statistics$executions$total").value("10"))
-				.andExpect(jsonPath("$.content.result[2].averagePassingRate").value("30.0"));
-	}
-
-	@Sql("/db/widget/component-health-check.sql")
-	@Test
-	void getComponentHealthCheckContent() throws Exception {
-		mockMvc.perform(get(SUPERADMIN_PROJECT_BASE_URL
-				+ "/widget/multilevel/2?attributes=3.29.11.0,arch").with(token(oAuthHelper.getSuperadminToken())))
-				.andExpect(status().isOk())
-				.andExpect(content().contentType("application/json"))
-				.andExpect(jsonPath("$.name").value("health"))
-				.andExpect(jsonPath("$.widgetType").value("componentHealthCheck"))
-				.andExpect(jsonPath("$.content.result[0].attributeValue").value("android"))
-				.andExpect(jsonPath("$.content.result[0].total").value("1"))
-				.andExpect(jsonPath("$.content.result[0].passingRate").value("0.0"))
-				.andExpect(jsonPath("$.content.result[1].attributeValue").value("ios"))
-				.andExpect(jsonPath("$.content.result[1].total").value("1"))
-				.andExpect(jsonPath("$.content.result[1].passingRate").value("0.0"));
-	}
-
-	@Sql("/db/widget/product-status.sql")
-	@Test
-	void getEmptyContentProductStatusGroupedByLaunchWidget() throws Exception {
-		mockMvc.perform(get(SUPERADMIN_PROJECT_BASE_URL + "/widget/5").with(token(oAuthHelper.getSuperadminToken())))
-				.andExpect(status().isOk())
-				.andExpect(content().contentType("application/json"))
-				.andExpect(jsonPath("$.name").value("product status"))
-				.andExpect(jsonPath("$.widgetType").value("productStatus"))
-				.andExpect(jsonPath("$.content").isEmpty());
-	}
+  @Autowired
+  private ObjectMapper objectMapper;
+
+  @Autowired
+  private WidgetRepository widgetRepository;
+
+  @Test
+  void createWidgetPositive() throws Exception {
+    WidgetRQ rq = new WidgetRQ();
+    rq.setName("widget");
+    rq.setDescription("description");
+    rq.setWidgetType("oldLineChart");
+    ContentParameters contentParameters = new ContentParameters();
+    contentParameters.setContentFields(Collections.singletonList("statistics$executions$passed"));
+    contentParameters.setItemsCount(50);
+    rq.setFilterIds(Collections.singletonList(3L));
+    rq.setContentParameters(contentParameters);
+    final MvcResult mvcResult = mockMvc.perform(
+            post(DEFAULT_PROJECT_BASE_URL + "/widget").with(token(oAuthHelper.getDefaultToken()))
+                .content(objectMapper.writeValueAsBytes(rq)).contentType(APPLICATION_JSON))
+        .andExpect(status().isCreated()).andReturn();
+    final EntryCreatedRS entryCreatedRS =
+        objectMapper.readValue(mvcResult.getResponse().getContentAsString(), EntryCreatedRS.class);
+    final Optional<Widget> optionalWidget = widgetRepository.findById(entryCreatedRS.getId());
+    assertTrue(optionalWidget.isPresent());
+    assertEquals("widget", optionalWidget.get().getName());
+    assertEquals("description", optionalWidget.get().getDescription());
+  }
+
+  @Test
+  void getWidgetPositive() throws Exception {
+    mockMvc.perform(
+            get(DEFAULT_PROJECT_BASE_URL + "/widget/10").with(token(oAuthHelper.getDefaultToken())))
+        .andExpect(status().isOk());
+  }
+
+  @Test
+  void updateWidgetPositive() throws Exception {
+    final WidgetRQ rq = new WidgetRQ();
+    rq.setName("updated");
+    rq.setDescription("updated");
+    rq.setWidgetType("activityStream");
+    final ContentParameters contentParameters = new ContentParameters();
+    contentParameters.setContentFields(Arrays.asList("number", "start_time", "user"));
+    contentParameters.setItemsCount(50);
+    rq.setContentParameters(contentParameters);
+    mockMvc.perform(
+            put(DEFAULT_PROJECT_BASE_URL + "/widget/12").with(token(oAuthHelper.getDefaultToken()))
+                .content(objectMapper.writeValueAsBytes(rq)).contentType(APPLICATION_JSON))
+        .andExpect(status().isOk());
+    final Optional<Widget> optionalWidget = widgetRepository.findById(12L);
+    assertTrue(optionalWidget.isPresent());
+    assertEquals("updated", optionalWidget.get().getName());
+    assertEquals("updated", optionalWidget.get().getDescription());
+  }
+
+  @Test
+  void updateNonExistingWidget() throws Exception {
+    WidgetRQ rq = new WidgetRQ();
+    rq.setName("name");
+    rq.setWidgetType("oldLineChart");
+    var contextParams = new ContentParameters();
+    contextParams.setItemsCount(1);
+    contextParams.setContentFields(Collections.singletonList("test"));
+    rq.setContentParameters(contextParams);
+    mockMvc.perform(
+            put(DEFAULT_PROJECT_BASE_URL + "/widget/100").with(token(oAuthHelper.getDefaultToken()))
+                .content(objectMapper.writeValueAsBytes(rq)).contentType(APPLICATION_JSON))
+        .andExpect(status().isNotFound());
+  }
+
+  @Test
+  void updateWidgetWithDuplicatedName() throws Exception {
+    final WidgetRQ rq = new WidgetRQ();
+    rq.setName("LAUNCH STATISTICS");
+    rq.setDescription("updated");
+    rq.setWidgetType("activityStream");
+    final ContentParameters contentParameters = new ContentParameters();
+    contentParameters.setContentFields(Arrays.asList("number", "start_time", "user"));
+    contentParameters.setItemsCount(50);
+    rq.setContentParameters(contentParameters);
+    mockMvc.perform(
+            put(SUPERADMIN_PROJECT_BASE_URL + "/widget/5").with(token(oAuthHelper.getSuperadminToken()))
+                .content(objectMapper.writeValueAsBytes(rq)).contentType(APPLICATION_JSON))
+        .andExpect(status().isConflict());
+  }
+
+  @Test
+  void getSharedWidgetsListPositive() throws Exception {
+    mockMvc.perform(get(SUPERADMIN_PROJECT_BASE_URL + "/widget/shared").with(
+        token(oAuthHelper.getSuperadminToken()))).andExpect(status().isBadRequest());
+  }
+
+  @Test
+  void searchSharedWidgetsListPositive() throws Exception {
+    mockMvc.perform(get(SUPERADMIN_PROJECT_BASE_URL + "/widget/shared/search?term=ch").with(
+        token(oAuthHelper.getSuperadminToken()))).andExpect(status().isNotFound());
+  }
+
+  @Test
+  void getWidgetNamesPositive() throws Exception {
+    mockMvc.perform(get(DEFAULT_PROJECT_BASE_URL + "/widget/names/all").with(
+        token(oAuthHelper.getDefaultToken()))).andExpect(status().is(200));
+  }
+
+  @Test
+  void getWidgetPreview() throws Exception {
+    WidgetPreviewRQ request = new WidgetPreviewRQ();
+    request.setWidgetType("launchStatistics");
+    final ContentParameters contentParameters = new ContentParameters();
+    final HashMap<String, Object> widgetOptions = new HashMap<>();
+    widgetOptions.put("timeline", "WEEK");
+    contentParameters.setWidgetOptions(widgetOptions);
+    contentParameters.setItemsCount(20);
+    contentParameters.setContentFields(
+        Arrays.asList("statistics$executions$total", "statistics$executions$passed",
+            "statistics$executions$failed", "statistics$executions$skipped"
+        ));
+    request.setContentParameters(contentParameters);
+    request.setFilterIds(Collections.singletonList(4L));
+
+    mockMvc.perform(post(DEFAULT_PROJECT_BASE_URL + "/widget/preview").with(
+            token(oAuthHelper.getDefaultToken())).contentType(APPLICATION_JSON)
+        .content(objectMapper.writeValueAsBytes(request))).andExpect(status().isOk());
+  }
+
+  @Sql("/db/widget/launch-statistics.sql")
+  @Test
+  void getLaunchStatisticsWidget() throws Exception {
+    mockMvc.perform(get(SUPERADMIN_PROJECT_BASE_URL + "/widget/2").with(
+            token(oAuthHelper.getSuperadminToken()))).andExpect(status().isOk())
+        .andExpect(content().contentType("application/json"))
+        .andExpect(jsonPath("$.name").value("launch stats"))
+        .andExpect(jsonPath("$.widgetType").value("launchStatistics"))
+        .andExpect(jsonPath("$.content.result[0].name").value("test launch")).andExpect(
+            jsonPath("$.content.result[0].values.statistics$defects$automation_bug$ab001").value("1"))
+        .andExpect(
+            jsonPath("$.content.result[0].values.statistics$defects$product_bug$pb001").value("1"))
+        .andExpect(
+            jsonPath("$.content.result[0].values.statistics$defects$to_investigate$ti001").value(
+                "1"))
+        .andExpect(jsonPath("$.content.result[0].values.statistics$executions$failed").value("3"))
+        .andExpect(jsonPath("$.content.result[0].values.statistics$executions$passed").value("2"))
+        .andExpect(jsonPath("$.content.result[0].values.statistics$executions$total").value("5"));
+  }
+
+  @Sql("/db/widget/not-passed.sql")
+  @Test
+  void getNotPassedWidget() throws Exception {
+    mockMvc.perform(get(SUPERADMIN_PROJECT_BASE_URL + "/widget/2").with(
+            token(oAuthHelper.getSuperadminToken()))).andExpect(status().isOk())
+        .andExpect(content().contentType("application/json"))
+        .andExpect(jsonPath("$.name").value("not passed"))
+        .andExpect(jsonPath("$.widgetType").value("notPassed"))
+        .andExpect(jsonPath("$.content.result[0].name").value("test launch"))
+        .andExpect(jsonPath("$.content.result[0].values.*").value("60.0"));
+  }
+
+  @Sql("/db/widget/not-passed.sql")
+  @Test
+  void getEmptyContentNotPassedWidget() throws Exception {
+    mockMvc.perform(get(SUPERADMIN_PROJECT_BASE_URL + "/widget/3").with(
+            token(oAuthHelper.getSuperadminToken()))).andExpect(status().isOk())
+        .andExpect(jsonPath("$.content").isEmpty());
+  }
+
+  @Sql("/db/widget/launches-comparison-chart.sql")
+  @Test
+  void getLaunchesComparisonWidget() throws Exception {
+    mockMvc.perform(get(SUPERADMIN_PROJECT_BASE_URL + "/widget/2").with(
+            token(oAuthHelper.getSuperadminToken()))).andExpect(status().isOk())
+        .andExpect(content().contentType("application/json"))
+        .andExpect(jsonPath("$.name").value("launch comparison"))
+        .andExpect(jsonPath("$.widgetType").value("launchesComparisonChart"))
+        .andExpect(jsonPath("$.content.result[0].name").value("test launch")).andExpect(
+            jsonPath("$.content.result[0].values.statistics$defects$automation_bug$ab001").value(
+                "33.33")).andExpect(
+            jsonPath("$.content.result[0].values.statistics$defects$product_bug$pb001").value("33.33"))
+        .andExpect(
+            jsonPath("$.content.result[0].values.statistics$defects$to_investigate$ti001").value(
+                "33.33")).andExpect(
+            jsonPath("$.content.result[0].values.statistics$executions$failed").value("60.0"))
+        .andExpect(
+            jsonPath("$.content.result[0].values.statistics$executions$passed").value("40.0"))
+        .andExpect(jsonPath("$.content.result[0].values.statistics$executions$total").value("5.0"))
+        .andExpect(jsonPath("$.content.result[1].name").value("test launch")).andExpect(
+            jsonPath("$.content.result[1].values.statistics$defects$product_bug$pb001").value("33.33"))
+        .andExpect(
+            jsonPath("$.content.result[1].values.statistics$defects$to_investigate$ti001").value(
+                "66.67")).andExpect(
+            jsonPath("$.content.result[1].values.statistics$executions$failed").value("60.0"))
+        .andExpect(
+            jsonPath("$.content.result[1].values.statistics$executions$passed").value("20.0"))
+        .andExpect(
+            jsonPath("$.content.result[1].values.statistics$executions$skipped").value("20.0"))
+        .andExpect(jsonPath("$.content.result[1].values.statistics$executions$total").value("5.0"));
+  }
+
+  @Sql("/db/widget/launches-comparison-chart.sql")
+  @Test
+  void getEmptyContentLaunchesComparisonWidget() throws Exception {
+    mockMvc.perform(get(SUPERADMIN_PROJECT_BASE_URL + "/widget/3").with(
+            token(oAuthHelper.getSuperadminToken()))).andExpect(status().isOk())
+        .andExpect(content().contentType("application/json"))
+        .andExpect(jsonPath("$.name").value("launch comparison"))
+        .andExpect(jsonPath("$.widgetType").value("launchesComparisonChart"))
+        .andExpect(jsonPath("$.content").isEmpty());
+  }
+
+  @Sql("/db/widget/launches-duration-chart.sql")
+  @Test
+  void getLaunchesDurationWidget() throws Exception {
+    mockMvc.perform(get(SUPERADMIN_PROJECT_BASE_URL + "/widget/2").with(
+            token(oAuthHelper.getSuperadminToken()))).andExpect(status().isOk())
+        .andExpect(content().contentType("application/json"))
+        .andExpect(jsonPath("$.name").value("launches duration"))
+        .andExpect(jsonPath("$.widgetType").value("launchesDurationChart"))
+        .andExpect(jsonPath("$.content.result[0].name").value("test launch"))
+        .andExpect(jsonPath("$.content.result[0].duration").value("540000"))
+        .andExpect(jsonPath("$.content.result[1].name").value("test launch"))
+        .andExpect(jsonPath("$.content.result[1].duration").value("660000"));
+  }
+
+  @Sql("/db/widget/launches-duration-chart.sql")
+  @Test
+  void getEmptyContentLaunchesDurationWidget() throws Exception {
+    mockMvc.perform(get(SUPERADMIN_PROJECT_BASE_URL + "/widget/3").with(
+            token(oAuthHelper.getSuperadminToken()))).andExpect(status().isOk())
+        .andExpect(content().contentType("application/json"))
+        .andExpect(jsonPath("$.name").value("launches duration"))
+        .andExpect(jsonPath("$.widgetType").value("launchesDurationChart"))
+        .andExpect(jsonPath("$.content").isEmpty());
+  }
+
+  @Sql("/db/widget/bug-trend.sql")
+  @Test
+  void getBugTrendWidget() throws Exception {
+    mockMvc.perform(get(SUPERADMIN_PROJECT_BASE_URL + "/widget/2").with(
+            token(oAuthHelper.getSuperadminToken()))).andExpect(status().isOk())
+        .andExpect(content().contentType("application/json"))
+        .andExpect(jsonPath("$.name").value("bug trend"))
+        .andExpect(jsonPath("$.widgetType").value("bugTrend"))
+        .andExpect(jsonPath("$.content.result[0].name").value("test launch"))
+        .andExpect(jsonPath("$.content.result[0].values.statistics$executions$failed").value("3"))
+        .andExpect(jsonPath("$.content.result[0].values.total").value("3"))
+        .andExpect(jsonPath("$.content.result[1].name").value("test launch"))
+        .andExpect(jsonPath("$.content.result[1].values.statistics$executions$failed").value("3"))
+        .andExpect(jsonPath("$.content.result[1].values.total").value("3"));
+  }
+
+  @Sql("/db/widget/launches-table.sql")
+  @Test
+  void getLaunchesTableWidget() throws Exception {
+    mockMvc.perform(get(SUPERADMIN_PROJECT_BASE_URL + "/widget/2").with(
+            token(oAuthHelper.getSuperadminToken()))).andExpect(status().isOk())
+        .andExpect(content().contentType("application/json"))
+        .andExpect(jsonPath("$.name").value("launches table"))
+        .andExpect(jsonPath("$.widgetType").value("launchesTable"))
+        .andExpect(jsonPath("$.content.result[0].values.statistics$executions$skipped").value("1"))
+        .andExpect(jsonPath("$.content.result[0].values.status").value("FAILED"))
+        .andExpect(jsonPath("$.content.result[0].values.description").value("desc"))
+        .andExpect(jsonPath("$.content.result[0].values.user").value("superadmin"))
+        .andExpect(jsonPath("$.content.result[0].values.statistics$executions$failed").value("3"))
+        .andExpect(jsonPath("$.content.result[0].values.statistics$executions$total").value("5"))
+        .andExpect(jsonPath("$.content.result[0].values.statistics$executions$passed").value("1"))
+        .andExpect(jsonPath("$..attributes[?(@.value == 'value1')]").exists())
+        .andExpect(jsonPath("$..attributes[?(@.value == 'value')]").exists()).andReturn();
+  }
+
+  @Sql("/db/widget/launches-table.sql")
+  @Test
+  void getEmptyContentLaunchesTableWidget() throws Exception {
+    mockMvc.perform(get(SUPERADMIN_PROJECT_BASE_URL + "/widget/3").with(
+            token(oAuthHelper.getSuperadminToken()))).andExpect(status().isOk())
+        .andExpect(content().contentType("application/json"))
+        .andExpect(jsonPath("$.name").value("launches table"))
+        .andExpect(jsonPath("$.widgetType").value("launchesTable"))
+        .andExpect(jsonPath("$.content").isEmpty());
+  }
+
+  @Sql("/db/widget/top-test-cases.sql")
+  @Test
+  void getTopTestCasesWidget() throws Exception {
+    mockMvc.perform(get(SUPERADMIN_PROJECT_BASE_URL + "/widget/1").with(
+            token(oAuthHelper.getSuperadminToken()))).andExpect(status().isOk())
+        .andExpect(content().contentType("application/json"))
+        .andExpect(jsonPath("$.name").value("top test cases"))
+        .andExpect(jsonPath("$.widgetType").value("topTestCases"))
+        .andExpect(jsonPath("$.content.latestLaunch.name").value("test launch"))
+        .andExpect(jsonPath("$.content.result[0].name").value("test item 5"))
+        .andExpect(jsonPath("$.content.result[0].total").value("1"))
+        .andExpect(jsonPath("$.content.result[1].name").value("test item 2"))
+        .andExpect(jsonPath("$.content.result[1].total").value("1"))
+        .andExpect(jsonPath("$.content.result[2].name").value("test item 3"))
+        .andExpect(jsonPath("$.content.result[2].total").value("1"));
+  }
+
+  @Sql("/db/widget/top-test-cases.sql")
+  @Test
+  void getEmptyContentTopTestCasesWidget() throws Exception {
+    mockMvc.perform(get(SUPERADMIN_PROJECT_BASE_URL + "/widget/2").with(
+            token(oAuthHelper.getSuperadminToken()))).andExpect(status().isOk())
+        .andExpect(content().contentType("application/json"))
+        .andExpect(jsonPath("$.name").value("top test cases"))
+        .andExpect(jsonPath("$.widgetType").value("topTestCases"))
+        .andExpect(jsonPath("$.content").isEmpty());
+  }
+
+  @Sql("/db/widget/top-test-cases.sql")
+  @Test
+  void getTopTestCasesWidgetWithNotExistLaunch() throws Exception {
+    mockMvc.perform(get(SUPERADMIN_PROJECT_BASE_URL + "/widget/3").with(
+            token(oAuthHelper.getSuperadminToken()))).andExpect(status().isOk())
+        .andExpect(jsonPath("$.content").isEmpty());
+  }
+
+  @Sql("/db/widget/top-test-cases.sql")
+  @Test
+  void getTopTestCasesIncludeMethodsWidget() throws Exception {
+    mockMvc.perform(get(SUPERADMIN_PROJECT_BASE_URL + "/widget/4").with(
+            token(oAuthHelper.getSuperadminToken()))).andExpect(status().isOk())
+        .andExpect(content().contentType("application/json"))
+        .andExpect(jsonPath("$.name").value("top test cases"))
+        .andExpect(jsonPath("$.widgetType").value("topTestCases"))
+        .andExpect(jsonPath("$.content.latestLaunch.name").value("test launch"))
+        .andExpect(jsonPath("$.content.result[0].name").value("test item 5"))
+        .andExpect(jsonPath("$.content.result[0].total").value("1"))
+        .andExpect(jsonPath("$.content.result[1].name").value("test item 2"))
+        .andExpect(jsonPath("$.content.result[1].total").value("1"))
+        .andExpect(jsonPath("$.content.result[2].name").value("test item 3"))
+        .andExpect(jsonPath("$.content.result[2].total").value("1"));
+  }
+
+  @Sql("/db/widget/flaky-test-cases.sql")
+  @Test
+  void getFlakyTestCasesWidget() throws Exception {
+    mockMvc.perform(get(SUPERADMIN_PROJECT_BASE_URL + "/widget/1").with(
+            token(oAuthHelper.getSuperadminToken()))).andExpect(status().isOk())
+        .andExpect(content().contentType("application/json"))
+        .andExpect(jsonPath("$.name").value("flaky test cases"))
+        .andExpect(jsonPath("$.widgetType").value("flakyTestCases"))
+        .andExpect(jsonPath("$.content.latestLaunch.name").value("test launch"))
+        .andExpect(jsonPath("$.content.flaky[0].flakyCount").value("1"))
+        .andExpect(jsonPath("$.content.flaky[0].itemName").value("test item 4"));
+  }
+
+  @Sql("/db/widget/flaky-test-cases.sql")
+  @Test
+  void getFlakyTestCasesWidgetWithNotExistLaunch() throws Exception {
+    mockMvc.perform(get(SUPERADMIN_PROJECT_BASE_URL + "/widget/2").with(
+        token(oAuthHelper.getSuperadminToken()))).andExpect(status().isOk());
+  }
+
+  @Sql("/db/widget/flaky-test-cases.sql")
+  @Test
+  void getEmptyContentFlakyTestCasesWidget() throws Exception {
+    mockMvc.perform(get(SUPERADMIN_PROJECT_BASE_URL + "/widget/3").with(
+            token(oAuthHelper.getSuperadminToken()))).andExpect(status().isOk())
+        .andExpect(content().contentType("application/json"))
+        .andExpect(jsonPath("$.name").value("flaky test cases"))
+        .andExpect(jsonPath("$.widgetType").value("flakyTestCases"))
+        .andExpect(jsonPath("$.content").isEmpty());
+  }
+
+  @Sql("/db/widget/flaky-test-cases.sql")
+  @Test
+  void getFlakyTestCasesWithIncludeMethodsWidget() throws Exception {
+    mockMvc.perform(get(SUPERADMIN_PROJECT_BASE_URL + "/widget/4").with(
+            token(oAuthHelper.getSuperadminToken()))).andExpect(status().isOk())
+        .andExpect(content().contentType("application/json"))
+        .andExpect(jsonPath("$.name").value("flaky test cases"))
+        .andExpect(jsonPath("$.widgetType").value("flakyTestCases"))
+        .andExpect(jsonPath("$.content.latestLaunch.name").value("test launch"))
+        .andExpect(jsonPath("$.content.flaky[0].flakyCount").value("1"))
+        .andExpect(jsonPath("$.content.flaky[0].itemName").value("test item 4"));
+  }
+
+  @Sql("/db/widget/cases-trend.sql")
+  @Test
+  void getCasesTrendWidget() throws Exception {
+    mockMvc.perform(get(SUPERADMIN_PROJECT_BASE_URL + "/widget/4").with(
+            token(oAuthHelper.getSuperadminToken()))).andExpect(status().isOk())
+        .andExpect(content().contentType("application/json"))
+        .andExpect(jsonPath("$.name").value("cases trend"))
+        .andExpect(jsonPath("$.widgetType").value("casesTrend"))
+        .andExpect(jsonPath("$.content.result[0].name").value("test launch"))
+        .andExpect(jsonPath("$.content.result[0].number").value("1"))
+        .andExpect(jsonPath("$.content.result[0].values.statistics$executions$total").value("5"))
+        .andExpect(jsonPath("$.content.result[1].name").value("test launch"))
+        .andExpect(jsonPath("$.content.result[1].number").value("2"))
+        .andExpect(jsonPath("$.content.result[1].values.statistics$executions$total").value("5"));
+  }
+
+  @Sql("/db/widget/cases-trend.sql")
+  @Test
+  void getCasesTrendWidgetWithTimeline() throws Exception {
+    mockMvc.perform(get(SUPERADMIN_PROJECT_BASE_URL + "/widget/5").with(
+            token(oAuthHelper.getSuperadminToken()))).andExpect(status().isOk())
+        .andExpect(content().contentType("application/json"))
+        .andExpect(jsonPath("$.name").value("cases trend"))
+        .andExpect(jsonPath("$.widgetType").value("casesTrend"))
+        .andExpect(jsonPath("$.content.result.*.name").value("test launch"))
+        .andExpect(jsonPath("$.content.result.*.number").value(2))
+        .andExpect(jsonPath("$.content.result.*.values.statistics$executions$total").value("5"));
+  }
+
+  @Sql("/db/widget/cases-trend.sql")
+  @Test
+  void getEmptyContentCasesTrendWidget() throws Exception {
+    mockMvc.perform(get(SUPERADMIN_PROJECT_BASE_URL + "/widget/6").with(
+            token(oAuthHelper.getSuperadminToken()))).andExpect(status().isOk())
+        .andExpect(content().contentType("application/json"))
+        .andExpect(jsonPath("$.name").value("cases trend"))
+        .andExpect(jsonPath("$.widgetType").value("casesTrend"))
+        .andExpect(jsonPath("$.content").isEmpty());
+  }
+
+  @Sql("/db/widget/cases-trend.sql")
+  @Test
+  void getCasesTrendWidgetWithWrongTimeLineOption() throws Exception {
+    mockMvc.perform(get(SUPERADMIN_PROJECT_BASE_URL + "/widget/7").with(
+            token(oAuthHelper.getSuperadminToken()))).andExpect(status().isOk())
+        .andExpect(content().contentType("application/json"))
+        .andExpect(jsonPath("$.name").value("cases trend"))
+        .andExpect(jsonPath("$.widgetType").value("casesTrend"))
+        .andExpect(jsonPath("$.content.result[0].name").value("test launch"))
+        .andExpect(jsonPath("$.content.result[0].number").value("1"))
+        .andExpect(jsonPath("$.content.result[0].values.statistics$executions$total").value("5"))
+        .andExpect(jsonPath("$.content.result[1].name").value("test launch"))
+        .andExpect(jsonPath("$.content.result[1].number").value("2"))
+        .andExpect(jsonPath("$.content.result[1].values.statistics$executions$total").value("5"));
+  }
+
+  @Sql("/db/widget/cases-trend.sql")
+  @Test
+  void getCasesTrendWidgetWithDescOrdering() throws Exception {
+    mockMvc.perform(get(SUPERADMIN_PROJECT_BASE_URL + "/widget/8").with(
+            token(oAuthHelper.getSuperadminToken()))).andExpect(status().isOk())
+        .andExpect(content().contentType("application/json"))
+        .andExpect(jsonPath("$.name").value("cases trend"))
+        .andExpect(jsonPath("$.widgetType").value("casesTrend"))
+        .andExpect(jsonPath("$.content.result.*.name").value("test launch"))
+        .andExpect(jsonPath("$.content.result.*.number").value(2))
+        .andExpect(jsonPath("$.content.result.*.values.statistics$executions$total").value("5"));
+  }
+
+  @Sql("/db/widget/passing-rate-per-launch.sql")
+  @Test
+  void getPassingRatePerLaunchWidget() throws Exception {
+    mockMvc.perform(get(SUPERADMIN_PROJECT_BASE_URL + "/widget/1").with(
+            token(oAuthHelper.getSuperadminToken()))).andExpect(status().isOk())
+        .andExpect(content().contentType("application/json"))
+        .andExpect(jsonPath("$.name").value("passing rate per launch"))
+        .andExpect(jsonPath("$.widgetType").value("passingRatePerLaunch"))
+        .andExpect(jsonPath("$.content.result.passed").value("1"))
+        .andExpect(jsonPath("$.content.result.total").value("5")).andReturn();
+  }
+
+  @Sql("/db/widget/passing-rate-per-launch.sql")
+  @Test
+  void getEmptyContentPassingRatePerLaunchWidget() throws Exception {
+    mockMvc.perform(get(SUPERADMIN_PROJECT_BASE_URL + "/widget/2").with(
+            token(oAuthHelper.getSuperadminToken()))).andExpect(status().isOk())
+        .andExpect(content().contentType("application/json"))
+        .andExpect(jsonPath("$.name").value("passing rate per launch"))
+        .andExpect(jsonPath("$.widgetType").value("passingRatePerLaunch"))
+        .andExpect(jsonPath("$.content").isEmpty());
+  }
+
+  @Sql("/db/widget/passing-rate-per-launch.sql")
+  @Test
+  void getPassingRatePerLaunchWidgetWithNotExistLaunchName() throws Exception {
+    mockMvc.perform(get(SUPERADMIN_PROJECT_BASE_URL + "/widget/3").with(
+        token(oAuthHelper.getSuperadminToken()))).andExpect(status().isOk());
+  }
+
+  @Sql("/db/widget/passing-rate-summary.sql")
+  @Test
+  void getPassingRateSummaryWidget() throws Exception {
+    mockMvc.perform(get(SUPERADMIN_PROJECT_BASE_URL + "/widget/2").with(
+            token(oAuthHelper.getSuperadminToken()))).andExpect(status().isOk())
+        .andExpect(content().contentType("application/json"))
+        .andExpect(jsonPath("$.name").value("passing rate summary"))
+        .andExpect(jsonPath("$.widgetType").value("passingRateSummary"))
+        .andExpect(jsonPath("$.content.result.passed").value("3"))
+        .andExpect(jsonPath("$.content.result.total").value("10"));
+  }
+
+  @Sql("/db/widget/passing-rate-summary.sql")
+  @Test
+  void getEmptyContentPassingRateSummaryWidget() throws Exception {
+    mockMvc.perform(get(SUPERADMIN_PROJECT_BASE_URL + "/widget/3").with(
+            token(oAuthHelper.getSuperadminToken()))).andExpect(status().isOk())
+        .andExpect(jsonPath("$.content").isEmpty());
+  }
+
+  @Sql("/db/widget/old-line-chart.sql")
+  @Test
+  void getOldLineChartWidget() throws Exception {
+    mockMvc.perform(get(SUPERADMIN_PROJECT_BASE_URL + "/widget/2").with(
+            token(oAuthHelper.getSuperadminToken()))).andExpect(status().isOk())
+        .andExpect(content().contentType("application/json"))
+        .andExpect(jsonPath("$.name").value("old line chart"))
+        .andExpect(jsonPath("$.widgetType").value("oldLineChart"))
+        .andExpect(jsonPath("$.content.result[0].name").value("test launch")).andExpect(
+            jsonPath("$.content.result[0].values.statistics$defects$automation_bug$ab001").value("1"))
+        .andExpect(
+            jsonPath("$.content.result[0].values.statistics$defects$product_bug$pb001").value("1"))
+        .andExpect(
+            jsonPath("$.content.result[0].values.statistics$defects$to_investigate$ti001").value(
+                "1"))
+        .andExpect(jsonPath("$.content.result[0].values.statistics$executions$failed").value("3"))
+        .andExpect(jsonPath("$.content.result[0].values.statistics$executions$passed").value("2"))
+        .andExpect(jsonPath("$.content.result[0].values.statistics$executions$total").value("5"));
+  }
+
+  @Sql("/db/widget/old-line-chart.sql")
+  @Test
+  void getEmptyContentOldLineChartWidget() throws Exception {
+    mockMvc.perform(get(SUPERADMIN_PROJECT_BASE_URL + "/widget/3").with(
+            token(oAuthHelper.getSuperadminToken()))).andExpect(status().isOk())
+        .andExpect(content().contentType("application/json"))
+        .andExpect(jsonPath("$.name").value("old line chart"))
+        .andExpect(jsonPath("$.widgetType").value("oldLineChart"))
+        .andExpect(jsonPath("$.content").isEmpty());
+  }
+
+  @Sql("/db/widget/old-line-chart.sql")
+  @Test
+  void getOldLineChartWithTimeLineWidget() throws Exception {
+    mockMvc.perform(get(SUPERADMIN_PROJECT_BASE_URL + "/widget/5").with(
+            token(oAuthHelper.getSuperadminToken()))).andExpect(status().isOk())
+        .andExpect(content().contentType("application/json"))
+        .andExpect(jsonPath("$.name").value("old line chart"))
+        .andExpect(jsonPath("$.widgetType").value("oldLineChart")).andExpect(
+            jsonPath("$.content.result.*.values.statistics$defects$automation_bug$ab001").value("1.0"))
+        .andExpect(
+            jsonPath("$.content.result.*.values.statistics$defects$product_bug$pb001").value("1.0"))
+        .andExpect(
+            jsonPath("$.content.result.*.values.statistics$defects$automation_bug$ab001").value(
+                "1.0"))
+        .andExpect(jsonPath("$.content.result.*.values.statistics$executions$failed").value("3.0"))
+        .andExpect(jsonPath("$.content.result.*.values.statistics$executions$passed").value("2.0"))
+        .andExpect(jsonPath("$.content.result.*.values.statistics$executions$total").value("5.0"));
+  }
+
+  @Sql("/db/widget/old-line-chart.sql")
+  @Test
+  void getEmptyContentOldLineChartWithTimeLineWidget() throws Exception {
+    mockMvc.perform(get(SUPERADMIN_PROJECT_BASE_URL + "/widget/6").with(
+            token(oAuthHelper.getSuperadminToken()))).andExpect(status().isOk())
+        .andExpect(content().contentType("application/json"))
+        .andExpect(jsonPath("$.name").value("old line chart"))
+        .andExpect(jsonPath("$.widgetType").value("oldLineChart"))
+        .andExpect(jsonPath("$.content").isEmpty());
+  }
+
+  @Sql("/db/widget/old-line-chart.sql")
+  @Test
+  void getOldLineChartWidgetWithIncorrectTimeLine() throws Exception {
+    mockMvc.perform(get(SUPERADMIN_PROJECT_BASE_URL + "/widget/7").with(
+            token(oAuthHelper.getSuperadminToken()))).andExpect(status().isOk())
+        .andExpect(content().contentType("application/json"))
+        .andExpect(jsonPath("$.name").value("old line chart"))
+        .andExpect(jsonPath("$.widgetType").value("oldLineChart"))
+        .andExpect(jsonPath("$.content").isEmpty());
+  }
+
+  @Sql("/db/widget/investigated-trend.sql")
+  @Test
+  void getInvestigatedTrendWidget() throws Exception {
+    mockMvc.perform(get(SUPERADMIN_PROJECT_BASE_URL + "/widget/2").with(
+            token(oAuthHelper.getSuperadminToken()))).andExpect(status().isOk())
+        .andExpect(content().contentType("application/json"))
+        .andExpect(jsonPath("$.name").value("investigated trend"))
+        .andExpect(jsonPath("$.widgetType").value("investigatedTrend"))
+        .andExpect(jsonPath("$.content.result[0].name").value("test launch"))
+        .andExpect(jsonPath("$.content.result[0].number").value("1"))
+        .andExpect(jsonPath("$.content.result[0].values.toInvestigate").value("33.33"))
+        .andExpect(jsonPath("$.content.result[0].values.investigated").value("66.67"))
+        .andExpect(jsonPath("$.content.result[1].name").value("test launch"))
+        .andExpect(jsonPath("$.content.result[1].number").value("2"))
+        .andExpect(jsonPath("$.content.result[1].values.toInvestigate").value("66.67"))
+        .andExpect(jsonPath("$.content.result[1].values.investigated").value("33.33"));
+  }
+
+  //Waiting for fix
+  @Disabled
+  @Sql("/db/widget/investigated-trend.sql")
+  @Test
+  void getInvestigatedTrendWidgetWithTimeline() throws Exception {
+    mockMvc.perform(get(SUPERADMIN_PROJECT_BASE_URL + "/widget/3").with(
+            token(oAuthHelper.getSuperadminToken()))).andExpect(status().isOk())
+        .andExpect(content().contentType("application/json"))
+        .andExpect(jsonPath("$.name").value("investigated trend"))
+        .andExpect(jsonPath("$.widgetType").value("investigatedTrend"));
+  }
+
+  @Sql("/db/widget/unique-bug-table.sql")
+  @Test
+  void getUniqueBugTableWidget() throws Exception {
+    mockMvc.perform(get(SUPERADMIN_PROJECT_BASE_URL + "/widget/2").with(
+            token(oAuthHelper.getSuperadminToken()))).andExpect(status().isOk())
+        .andExpect(content().contentType("application/json"))
+        .andExpect(jsonPath("$.name").value("unique bug table"))
+        .andExpect(jsonPath("$.widgetType").value("uniqueBugTable"))
+        .andExpect(jsonPath("$.content.result.ticket1.submitter").value("superadmin"))
+        .andExpect(jsonPath("$.content.result.ticket1.url").value("http:/example.com/ticket1"))
+        .andExpect(jsonPath("$.content.result.ticket1.items[0].launchId").value(1))
+        .andExpect(jsonPath("$.content.result.ticket1.items[0].itemName").value("test item 2"))
+        .andExpect(jsonPath("$.content.result.ticket1.items[0].itemId").value(2))
+        .andExpect(jsonPath("$.content.result.ticket1.items[0].attributes", hasSize(2)));
+  }
+
+  @Sql("/db/widget/unique-bug-table.sql")
+  @Test
+  void getEmptyContentUniqueBugTableWidget() throws Exception {
+    mockMvc.perform(get(SUPERADMIN_PROJECT_BASE_URL + "/widget/3").with(
+            token(oAuthHelper.getSuperadminToken()))).andExpect(status().isOk())
+        .andExpect(content().contentType("application/json"))
+        .andExpect(jsonPath("$.name").value("unique bug table"))
+        .andExpect(jsonPath("$.widgetType").value("uniqueBugTable"))
+        .andExpect(jsonPath("$.content").isEmpty());
+  }
+
+  @Sql("/db/widget/most-time-consuming.sql")
+  @Test
+  void getMostTimeConsumingWidget() throws Exception {
+    mockMvc.perform(get(SUPERADMIN_PROJECT_BASE_URL + "/widget/3").with(
+            token(oAuthHelper.getSuperadminToken()))).andExpect(status().isOk())
+        .andExpect(content().contentType("application/json"))
+        .andExpect(jsonPath("$.name").value("most time consuming"))
+        .andExpect(jsonPath("$.widgetType").value("mostTimeConsuming"))
+        .andExpect(jsonPath("$.content.result[0].name").value("test item 3"))
+        .andExpect(jsonPath("$.content.result[0].duration").value("337.0"))
+        .andExpect(jsonPath("$.content.result[1].name").value("test item 5"))
+        .andExpect(jsonPath("$.content.result[1].duration").value("251.0"))
+        .andExpect(jsonPath("$.content.result[2].name").value("test item 2"))
+        .andExpect(jsonPath("$.content.result[2].duration").value("192.0"))
+        .andExpect(jsonPath("$.content.result[3].name").value("test item 1"))
+        .andExpect(jsonPath("$.content.result[3].duration").value("165.0"))
+        .andExpect(jsonPath("$.content.result[4].name").value("test item 4"))
+        .andExpect(jsonPath("$.content.result[4].duration").value("87.0"));
+  }
+
+  @Sql("/db/widget/most-time-consuming.sql")
+  @Test
+  void getEmptyContentMostTimeConsumingWidget() throws Exception {
+    mockMvc.perform(get(SUPERADMIN_PROJECT_BASE_URL + "/widget/4").with(
+            token(oAuthHelper.getSuperadminToken()))).andExpect(status().isOk())
+        .andExpect(content().contentType("application/json"))
+        .andExpect(jsonPath("$.name").value("most time consuming"))
+        .andExpect(jsonPath("$.widgetType").value("mostTimeConsuming"))
+        .andExpect(jsonPath("$.content").isEmpty());
+  }
+
+  @Sql("/db/widget/most-time-consuming.sql")
+  @Test
+  void getMostTimeConsumingWidgetWithNotExistLaunch() throws Exception {
+    mockMvc.perform(get(SUPERADMIN_PROJECT_BASE_URL + "/widget/5").with(
+        token(oAuthHelper.getSuperadminToken()))).andExpect(status().isOk());
+  }
+
+  @Sql("/db/widget/most-time-consuming.sql")
+  @Test
+  void getMostTimeConsumingWidgetWithIncludeMethods() throws Exception {
+    mockMvc.perform(get(SUPERADMIN_PROJECT_BASE_URL + "/widget/6").with(
+            token(oAuthHelper.getSuperadminToken()))).andExpect(status().isOk())
+        .andExpect(content().contentType("application/json"))
+        .andExpect(jsonPath("$.name").value("most time consuming"))
+        .andExpect(jsonPath("$.widgetType").value("mostTimeConsuming"))
+        .andExpect(jsonPath("$.content.result[0].name").value("test item 3"))
+        .andExpect(jsonPath("$.content.result[0].duration").value("337.0"))
+        .andExpect(jsonPath("$.content.result[1].name").value("test item 5"))
+        .andExpect(jsonPath("$.content.result[1].duration").value("251.0"))
+        .andExpect(jsonPath("$.content.result[2].name").value("test item 2"))
+        .andExpect(jsonPath("$.content.result[2].duration").value("192.0"))
+        .andExpect(jsonPath("$.content.result[3].name").value("test item 1"))
+        .andExpect(jsonPath("$.content.result[3].duration").value("165.0"))
+        .andExpect(jsonPath("$.content.result[4].name").value("test item 4"))
+        .andExpect(jsonPath("$.content.result[4].duration").value("87.0"));
+  }
+
+  @Sql("/db/widget/overall-statistics.sql")
+  @Test
+  void getOverallStatisticsWidget() throws Exception {
+    mockMvc.perform(get(SUPERADMIN_PROJECT_BASE_URL + "/widget/2").with(
+            token(oAuthHelper.getSuperadminToken()))).andExpect(status().isOk())
+        .andExpect(content().contentType("application/json"))
+        .andExpect(jsonPath("$.name").value("overall statistics"))
+        .andExpect(jsonPath("$.widgetType").value("overallStatistics")).andExpect(
+            jsonPath("$.content.result[0].values.statistics$defects$automation_bug$ab001").value("1"))
+        .andExpect(
+            jsonPath("$.content.result[0].values.statistics$defects$product_bug$pb001").value("1"))
+        .andExpect(
+            jsonPath("$.content.result[0].values.statistics$defects$to_investigate$ti001").value(
+                "1"))
+        .andExpect(jsonPath("$.content.result[0].values.statistics$executions$failed").value("3"))
+        .andExpect(jsonPath("$.content.result[0].values.statistics$executions$passed").value("2"))
+        .andExpect(jsonPath("$.content.result[0].values.statistics$executions$total").value("5"));
+  }
+
+  @Sql("/db/widget/overall-statistics.sql")
+  @Test
+  void getEmptyContentOverallStatisticsWidget() throws Exception {
+    mockMvc.perform(get(SUPERADMIN_PROJECT_BASE_URL + "/widget/3").with(
+            token(oAuthHelper.getSuperadminToken()))).andExpect(status().isOk())
+        .andExpect(content().contentType("application/json"))
+        .andExpect(jsonPath("$.name").value("overall statistics"))
+        .andExpect(jsonPath("$.widgetType").value("overallStatistics"))
+        .andExpect(jsonPath("$.content").isEmpty());
+  }
+
+  @Sql("/db/widget/activity-stream.sql")
+  @Test
+  void getActivityStreamWidget() throws Exception {
+    mockMvc.perform(get(SUPERADMIN_PROJECT_BASE_URL + "/widget/1").with(
+            token(oAuthHelper.getSuperadminToken()))).andExpect(status().isOk())
+        .andExpect(content().contentType("application/json"))
+        .andExpect(jsonPath("$.name").value("activity stream"))
+        .andExpect(jsonPath("$.widgetType").value("activityStream"))
+        .andExpect(jsonPath("$.content.result[0].user").value("superadmin"))
+        .andExpect(jsonPath("$.content.result[0].actionType").value("startLaunch"))
+        .andExpect(jsonPath("$.content.result[0].objectType").value("LAUNCH"))
+        .andExpect(jsonPath("$.content.result[1].user").value("superadmin"))
+        .andExpect(jsonPath("$.content.result[1].actionType").value("updateItem"))
+        .andExpect(jsonPath("$.content.result[1].objectType").value("ITEM"))
+        .andExpect(jsonPath("$.content.result[2].user").value("superadmin"))
+        .andExpect(jsonPath("$.content.result[2].actionType").value("deleteLaunch"))
+        .andExpect(jsonPath("$.content.result[2].objectType").value("LAUNCH"));
+  }
+
+  @Sql("/db/widget/activity-stream.sql")
+  @Test
+  void getEmptyContentActivityStreamWidget() throws Exception {
+    mockMvc.perform(get(SUPERADMIN_PROJECT_BASE_URL + "/widget/2").with(
+            token(oAuthHelper.getSuperadminToken()))).andExpect(status().isOk())
+        .andExpect(content().contentType("application/json"))
+        .andExpect(jsonPath("$.name").value("activity stream"))
+        .andExpect(jsonPath("$.widgetType").value("activityStream"))
+        .andExpect(jsonPath("$.content").isEmpty());
+  }
+
+  @Sql("/db/widget/activity-stream.sql")
+  @Test
+  void getActivityStreamWidgetWithNotExistUser() throws Exception {
+    mockMvc.perform(get(SUPERADMIN_PROJECT_BASE_URL + "/widget/3").with(
+        token(oAuthHelper.getSuperadminToken()))).andExpect(status().isNotFound());
+  }
+
+  @Sql("/db/widget/activity-stream.sql")
+  @Test
+  void getActivityStreamWidgetWithEmptyUserOption() throws Exception {
+    mockMvc.perform(get(SUPERADMIN_PROJECT_BASE_URL + "/widget/4").with(
+            token(oAuthHelper.getSuperadminToken()))).andExpect(status().isOk())
+        .andExpect(content().contentType("application/json"))
+        .andExpect(jsonPath("$.name").value("activity stream"))
+        .andExpect(jsonPath("$.widgetType").value("activityStream"))
+        .andExpect(jsonPath("$.content.result[0].user").value("superadmin"))
+        .andExpect(jsonPath("$.content.result[0].actionType").value("startLaunch"))
+        .andExpect(jsonPath("$.content.result[0].objectType").value("LAUNCH"))
+        .andExpect(jsonPath("$.content.result[1].user").value("superadmin"))
+        .andExpect(jsonPath("$.content.result[1].actionType").value("updateItem"))
+        .andExpect(jsonPath("$.content.result[1].objectType").value("ITEM"))
+        .andExpect(jsonPath("$.content.result[2].user").value("superadmin"))
+        .andExpect(jsonPath("$.content.result[2].actionType").value("deleteLaunch"))
+        .andExpect(jsonPath("$.content.result[2].objectType").value("LAUNCH"));
+  }
+
+  @Sql("/db/widget/product-status.sql")
+  @Test
+  void getProductStatusGroupedByLaunchWidget() throws Exception {
+    mockMvc.perform(get(SUPERADMIN_PROJECT_BASE_URL + "/widget/4").with(
+            token(oAuthHelper.getSuperadminToken()))).andExpect(status().isOk())
+        .andExpect(content().contentType("application/json"))
+        .andExpect(jsonPath("$.name").value("product status"))
+        .andExpect(jsonPath("$.widgetType").value("productStatus"))
+        .andExpect(jsonPath("$.content.result[0].name").value("test launch"))
+        .andExpect(jsonPath("$.content.result[0].number").value("1"))
+        .andExpect(jsonPath("$.content.result[0].attributes").isNotEmpty())
+        .andExpect(jsonPath("$.content.result[0].passingRate").value("40.0"))
+        .andExpect(jsonPath("$.content.result[1].name").value("test launch"))
+        .andExpect(jsonPath("$.content.result[1].number").value("2"))
+        .andExpect(jsonPath("$.content.result[1].attributes").doesNotExist())
+        .andExpect(jsonPath("$.content.result[1].passingRate").value("20.0"))
+        .andExpect(jsonPath("$.content.result[2].sum.statistics$executions$passed").value("3"))
+        .andExpect(jsonPath("$.content.result[2].sum.statistics$executions$skipped").value("1"))
+        .andExpect(
+            jsonPath("$.content.result[2].sum.statistics$defects$to_investigate$ti001").value("3"))
+        .andExpect(
+            jsonPath("$.content.result[2].sum.statistics$defects$product_bug$pb001").value("2"))
+        .andExpect(
+            jsonPath("$.content.result[2].sum.statistics$defects$automation_bug$ab001").value("1"))
+        .andExpect(jsonPath("$.content.result[2].sum.statistics$executions$failed").value("6"))
+        .andExpect(jsonPath("$.content.result[2].sum.statistics$executions$total").value("10"))
+        .andExpect(jsonPath("$.content.result[2].averagePassingRate").value("30.0"));
+  }
+
+  @Sql("/db/widget/component-health-check.sql")
+  @Test
+  void getComponentHealthCheckContent() throws Exception {
+    mockMvc.perform(
+            get(SUPERADMIN_PROJECT_BASE_URL + "/widget/multilevel/2?attributes=3.29.11.0,arch").with(
+                token(oAuthHelper.getSuperadminToken()))).andExpect(status().isOk())
+        .andExpect(content().contentType("application/json"))
+        .andExpect(jsonPath("$.name").value("health"))
+        .andExpect(jsonPath("$.widgetType").value("componentHealthCheck"))
+        .andExpect(jsonPath("$.content.result[0].attributeValue").value("android"))
+        .andExpect(jsonPath("$.content.result[0].total").value("1"))
+        .andExpect(jsonPath("$.content.result[0].passingRate").value("0.0"))
+        .andExpect(jsonPath("$.content.result[1].attributeValue").value("ios"))
+        .andExpect(jsonPath("$.content.result[1].total").value("1"))
+        .andExpect(jsonPath("$.content.result[1].passingRate").value("0.0"));
+  }
+
+  @Sql("/db/widget/product-status.sql")
+  @Test
+  void getEmptyContentProductStatusGroupedByLaunchWidget() throws Exception {
+    mockMvc.perform(get(SUPERADMIN_PROJECT_BASE_URL + "/widget/5").with(
+            token(oAuthHelper.getSuperadminToken()))).andExpect(status().isOk())
+        .andExpect(content().contentType("application/json"))
+        .andExpect(jsonPath("$.name").value("product status"))
+        .andExpect(jsonPath("$.widgetType").value("productStatus"))
+        .andExpect(jsonPath("$.content").isEmpty());
+  }
 }
\ No newline at end of file
diff --git a/src/test/java/com/epam/ta/reportportal/ws/controller/WidgetControllerValidationTest.java b/src/test/java/com/epam/ta/reportportal/ws/controller/WidgetControllerValidationTest.java
index 2abb2b8ae3..da25cc421b 100644
--- a/src/test/java/com/epam/ta/reportportal/ws/controller/WidgetControllerValidationTest.java
+++ b/src/test/java/com/epam/ta/reportportal/ws/controller/WidgetControllerValidationTest.java
@@ -16,18 +16,14 @@
 
 package com.epam.ta.reportportal.ws.controller;
 
-import com.epam.ta.reportportal.ws.BaseMvcTest;
-import com.epam.ta.reportportal.ws.model.ErrorRS;
-import com.epam.ta.reportportal.ws.model.widget.ContentParameters;
-import com.epam.ta.reportportal.ws.model.widget.WidgetRQ;
-import com.fasterxml.jackson.databind.ObjectMapper;
-import org.junit.jupiter.api.Test;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.test.web.servlet.MvcResult;
-
-import java.util.Arrays;
-
-import static com.epam.ta.reportportal.ws.controller.constants.ValidationTestsConstants.*;
+import static com.epam.ta.reportportal.ws.controller.constants.ValidationTestsConstants.FIELD_NAME_IS_BLANK_MESSAGE;
+import static com.epam.ta.reportportal.ws.controller.constants.ValidationTestsConstants.FIELD_NAME_IS_NULL_MESSAGE;
+import static com.epam.ta.reportportal.ws.controller.constants.ValidationTestsConstants.FIELD_NAME_SIZE_MESSAGE_WITH_FORMAT;
+import static com.epam.ta.reportportal.ws.controller.constants.ValidationTestsConstants.ID_PATH;
+import static com.epam.ta.reportportal.ws.controller.constants.ValidationTestsConstants.INCORRECT_REQUEST_MESSAGE;
+import static com.epam.ta.reportportal.ws.controller.constants.ValidationTestsConstants.LONG_NAME_VALUE;
+import static com.epam.ta.reportportal.ws.controller.constants.ValidationTestsConstants.SHORT_NAME_VALUE;
+import static com.epam.ta.reportportal.ws.controller.constants.ValidationTestsConstants.WHITESPACES_NAME_VALUE;
 import static com.epam.ta.reportportal.ws.model.ErrorType.INCORRECT_REQUEST;
 import static org.apache.commons.lang3.StringUtils.EMPTY;
 import static org.junit.jupiter.api.Assertions.assertEquals;
@@ -36,214 +32,236 @@
 import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.put;
 import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
 
+import com.epam.ta.reportportal.model.widget.ContentParameters;
+import com.epam.ta.reportportal.model.widget.WidgetRQ;
+import com.epam.ta.reportportal.ws.BaseMvcTest;
+import com.epam.ta.reportportal.ws.model.ErrorRS;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import java.util.Arrays;
+import org.junit.jupiter.api.Test;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.test.web.servlet.MvcResult;
+
 /**
  * @author <a href="mailto:tatyana_gladysheva@epam.com">Tatyana Gladysheva</a>
  */
 class WidgetControllerValidationTest extends BaseMvcTest {
 
-	private static final String WIDGET_PATH = "/widget";
-
-	private static final String FIELD_NAME_SIZE_MESSAGE = String.format(FIELD_NAME_SIZE_MESSAGE_WITH_FORMAT, 3, 128);
-
-	@Autowired
-	private ObjectMapper objectMapper;
-
-	@Test
-	public void createWidgetShouldReturnErrorWhenNameIsNull() throws Exception {
-		//GIVEN
-		WidgetRQ widgetRQ = prepareWidget();
-
-		//WHEN
-		MvcResult mvcResult = mockMvc.perform(post(DEFAULT_PROJECT_BASE_URL + WIDGET_PATH)
-				.with(token(oAuthHelper.getDefaultToken()))
-				.content(objectMapper.writeValueAsBytes(widgetRQ))
-				.contentType(APPLICATION_JSON))
-				.andExpect(status().isBadRequest()).andReturn();
-
-		//THEN
-		ErrorRS error = objectMapper.readValue(mvcResult.getResponse().getContentAsString(), ErrorRS.class);
-		assertEquals(INCORRECT_REQUEST, error.getErrorType());
-		assertEquals(INCORRECT_REQUEST_MESSAGE + FIELD_NAME_IS_NULL_MESSAGE, error.getMessage());
-	}
-
-	@Test
-	public void createWidgetShouldReturnErrorWhenNameIsEmpty() throws Exception {
-		//GIVEN
-		WidgetRQ widgetRQ = prepareWidget();
-		widgetRQ.setName(EMPTY);
-
-		//WHEN
-		MvcResult mvcResult = mockMvc.perform(post(DEFAULT_PROJECT_BASE_URL + WIDGET_PATH)
-				.with(token(oAuthHelper.getDefaultToken()))
-				.content(objectMapper.writeValueAsBytes(widgetRQ))
-				.contentType(APPLICATION_JSON))
-				.andExpect(status().isBadRequest()).andReturn();
-
-		//THEN
-		ErrorRS error = objectMapper.readValue(mvcResult.getResponse().getContentAsString(), ErrorRS.class);
-		assertEquals(INCORRECT_REQUEST, error.getErrorType());
-		assertEquals(INCORRECT_REQUEST_MESSAGE + "[" + FIELD_NAME_IS_BLANK_MESSAGE + " " + FIELD_NAME_SIZE_MESSAGE + "] ", error.getMessage());
-	}
-
-	@Test
-	public void createWidgetShouldReturnErrorWhenNameConsistsOfWhitespaces() throws Exception {
-		//GIVEN
-		WidgetRQ widgetRQ = prepareWidget();
-		widgetRQ.setName(WHITESPACES_NAME_VALUE);
-
-		//WHEN
-		MvcResult mvcResult = mockMvc.perform(post(DEFAULT_PROJECT_BASE_URL + WIDGET_PATH)
-				.with(token(oAuthHelper.getDefaultToken()))
-				.content(objectMapper.writeValueAsBytes(widgetRQ))
-				.contentType(APPLICATION_JSON))
-				.andExpect(status().isBadRequest()).andReturn();
-
-		//THEN
-		ErrorRS error = objectMapper.readValue(mvcResult.getResponse().getContentAsString(), ErrorRS.class);
-		assertEquals(INCORRECT_REQUEST, error.getErrorType());
-		assertEquals(INCORRECT_REQUEST_MESSAGE + "[" + FIELD_NAME_IS_BLANK_MESSAGE + " " + FIELD_NAME_SIZE_MESSAGE + "] ", error.getMessage());
-	}
-
-	@Test
-	public void createWidgetShouldReturnErrorWhenNameIsLessThanThreeCharacters() throws Exception {
-		//GIVEN
-		WidgetRQ widgetRQ = prepareWidget();
-		widgetRQ.setName(SHORT_NAME_VALUE);
-
-		//WHEN
-		MvcResult mvcResult = mockMvc.perform(post(DEFAULT_PROJECT_BASE_URL + WIDGET_PATH)
-				.with(token(oAuthHelper.getDefaultToken()))
-				.content(objectMapper.writeValueAsBytes(widgetRQ))
-				.contentType(APPLICATION_JSON))
-				.andExpect(status().isBadRequest()).andReturn();
-
-		//THEN
-		ErrorRS error = objectMapper.readValue(mvcResult.getResponse().getContentAsString(), ErrorRS.class);
-		assertEquals(INCORRECT_REQUEST, error.getErrorType());
-		assertEquals(INCORRECT_REQUEST_MESSAGE + "[" + FIELD_NAME_SIZE_MESSAGE + "] ", error.getMessage());
-	}
-
-	@Test
-	public void createWidgetShouldReturnErrorWhenNameIsGreaterThanOneHundredAndTwentyEightCharacters() throws Exception {
-		//GIVEN
-		WidgetRQ widgetRQ = prepareWidget();
-		widgetRQ.setName(LONG_NAME_VALUE);
-
-		//WHEN
-		MvcResult mvcResult = mockMvc.perform(post(DEFAULT_PROJECT_BASE_URL + WIDGET_PATH)
-				.with(token(oAuthHelper.getDefaultToken()))
-				.content(objectMapper.writeValueAsBytes(widgetRQ))
-				.contentType(APPLICATION_JSON))
-				.andExpect(status().isBadRequest()).andReturn();
-
-		//THEN
-		ErrorRS error = objectMapper.readValue(mvcResult.getResponse().getContentAsString(), ErrorRS.class);
-		assertEquals(INCORRECT_REQUEST, error.getErrorType());
-		assertEquals(INCORRECT_REQUEST_MESSAGE + "[" + FIELD_NAME_SIZE_MESSAGE + "] ", error.getMessage());
-	}
-
-	@Test
-	public void updateWidgetShouldReturnErrorWhenNameIsNull() throws Exception {
-		//GIVEN
-		WidgetRQ widgetRQ = prepareWidget();
-
-		//WHEN
-		MvcResult mvcResult = mockMvc.perform(put(DEFAULT_PROJECT_BASE_URL + WIDGET_PATH + ID_PATH)
-				.with(token(oAuthHelper.getDefaultToken()))
-				.content(objectMapper.writeValueAsBytes(widgetRQ))
-				.contentType(APPLICATION_JSON))
-				.andExpect(status().isBadRequest()).andReturn();
-
-		//THEN
-		ErrorRS error = objectMapper.readValue(mvcResult.getResponse().getContentAsString(), ErrorRS.class);
-		assertEquals(INCORRECT_REQUEST, error.getErrorType());
-		assertEquals(INCORRECT_REQUEST_MESSAGE + FIELD_NAME_IS_NULL_MESSAGE, error.getMessage());
-	}
-
-	@Test
-	public void updateWidgetShouldReturnErrorWhenNameIsEmpty() throws Exception {
-		//GIVEN
-		WidgetRQ widgetRQ = prepareWidget();
-		widgetRQ.setName(EMPTY);
-
-		//WHEN
-		MvcResult mvcResult = mockMvc.perform(put(DEFAULT_PROJECT_BASE_URL + WIDGET_PATH + ID_PATH)
-				.with(token(oAuthHelper.getDefaultToken()))
-				.content(objectMapper.writeValueAsBytes(widgetRQ))
-				.contentType(APPLICATION_JSON))
-				.andExpect(status().isBadRequest()).andReturn();
-
-		//THEN
-		ErrorRS error = objectMapper.readValue(mvcResult.getResponse().getContentAsString(), ErrorRS.class);
-		assertEquals(INCORRECT_REQUEST, error.getErrorType());
-		assertEquals(INCORRECT_REQUEST_MESSAGE + "[" + FIELD_NAME_IS_BLANK_MESSAGE + " " + FIELD_NAME_SIZE_MESSAGE + "] ", error.getMessage());
-	}
-
-	@Test
-	public void updateWidgetShouldReturnErrorWhenNameConsistsOfWhitespaces() throws Exception {
-		//GIVEN
-		WidgetRQ widgetRQ = prepareWidget();
-		widgetRQ.setName(WHITESPACES_NAME_VALUE);
-
-		//WHEN
-		MvcResult mvcResult = mockMvc.perform(put(DEFAULT_PROJECT_BASE_URL + WIDGET_PATH + ID_PATH)
-				.with(token(oAuthHelper.getDefaultToken()))
-				.content(objectMapper.writeValueAsBytes(widgetRQ))
-				.contentType(APPLICATION_JSON))
-				.andExpect(status().isBadRequest()).andReturn();
-
-		//THEN
-		ErrorRS error = objectMapper.readValue(mvcResult.getResponse().getContentAsString(), ErrorRS.class);
-		assertEquals(INCORRECT_REQUEST, error.getErrorType());
-		assertEquals(INCORRECT_REQUEST_MESSAGE + "[" + FIELD_NAME_IS_BLANK_MESSAGE + " " + FIELD_NAME_SIZE_MESSAGE + "] ", error.getMessage());
-	}
-
-	@Test
-	public void updateWidgetShouldReturnErrorWhenNameIsLessThanThreeCharacters() throws Exception {
-		//GIVEN
-		WidgetRQ widgetRQ = prepareWidget();
-		widgetRQ.setName(SHORT_NAME_VALUE);
-
-		//WHEN
-		MvcResult mvcResult = mockMvc.perform(put(DEFAULT_PROJECT_BASE_URL + WIDGET_PATH + ID_PATH)
-				.with(token(oAuthHelper.getDefaultToken()))
-				.content(objectMapper.writeValueAsBytes(widgetRQ))
-				.contentType(APPLICATION_JSON))
-				.andExpect(status().isBadRequest()).andReturn();
-
-		//THEN
-		ErrorRS error = objectMapper.readValue(mvcResult.getResponse().getContentAsString(), ErrorRS.class);
-		assertEquals(INCORRECT_REQUEST, error.getErrorType());
-		assertEquals(INCORRECT_REQUEST_MESSAGE + "[" + FIELD_NAME_SIZE_MESSAGE + "] ", error.getMessage());
-	}
-
-	@Test
-	public void updateWidgetShouldReturnErrorWhenNameIsGreaterThanOneHundredAndTwentyEightCharacters() throws Exception {
-		//GIVEN
-		WidgetRQ widgetRQ = prepareWidget();
-		widgetRQ.setName(LONG_NAME_VALUE);
-
-		//WHEN
-		MvcResult mvcResult = mockMvc.perform(put(DEFAULT_PROJECT_BASE_URL + WIDGET_PATH + ID_PATH)
-				.with(token(oAuthHelper.getDefaultToken()))
-				.content(objectMapper.writeValueAsBytes(widgetRQ))
-				.contentType(APPLICATION_JSON))
-				.andExpect(status().isBadRequest()).andReturn();
-
-		//THEN
-		ErrorRS error = objectMapper.readValue(mvcResult.getResponse().getContentAsString(), ErrorRS.class);
-		assertEquals(INCORRECT_REQUEST, error.getErrorType());
-		assertEquals(INCORRECT_REQUEST_MESSAGE + "[" + FIELD_NAME_SIZE_MESSAGE + "] ", error.getMessage());
-	}
-
-	private WidgetRQ prepareWidget() {
-		WidgetRQ widgetRQ = new WidgetRQ();
-		widgetRQ.setDescription("description");
-		widgetRQ.setWidgetType("oldLineChart");
-		ContentParameters contentParameters = new ContentParameters();
-		contentParameters.setContentFields(Arrays.asList("number", "name", "user", "statistics$defects$automation_bug$AB002"));
-		contentParameters.setItemsCount(50);
-		widgetRQ.setContentParameters(contentParameters);
-		return widgetRQ;
-	}
+  private static final String WIDGET_PATH = "/widget";
+
+  private static final String FIELD_NAME_SIZE_MESSAGE =
+      String.format(FIELD_NAME_SIZE_MESSAGE_WITH_FORMAT, 3, 128);
+
+  @Autowired
+  private ObjectMapper objectMapper;
+
+  @Test
+  public void createWidgetShouldReturnErrorWhenNameIsNull() throws Exception {
+    //GIVEN
+    WidgetRQ widgetRQ = prepareWidget();
+
+    //WHEN
+    MvcResult mvcResult = mockMvc.perform(
+            post(DEFAULT_PROJECT_BASE_URL + WIDGET_PATH).with(token(oAuthHelper.getDefaultToken()))
+                .content(objectMapper.writeValueAsBytes(widgetRQ)).contentType(APPLICATION_JSON))
+        .andExpect(status().isBadRequest()).andReturn();
+
+    //THEN
+    ErrorRS error =
+        objectMapper.readValue(mvcResult.getResponse().getContentAsString(), ErrorRS.class);
+    assertEquals(INCORRECT_REQUEST, error.getErrorType());
+    assertEquals(INCORRECT_REQUEST_MESSAGE + FIELD_NAME_IS_NULL_MESSAGE, error.getMessage());
+  }
+
+  @Test
+  public void createWidgetShouldReturnErrorWhenNameIsEmpty() throws Exception {
+    //GIVEN
+    WidgetRQ widgetRQ = prepareWidget();
+    widgetRQ.setName(EMPTY);
+
+    //WHEN
+    MvcResult mvcResult = mockMvc.perform(
+            post(DEFAULT_PROJECT_BASE_URL + WIDGET_PATH).with(token(oAuthHelper.getDefaultToken()))
+                .content(objectMapper.writeValueAsBytes(widgetRQ)).contentType(APPLICATION_JSON))
+        .andExpect(status().isBadRequest()).andReturn();
+
+    //THEN
+    ErrorRS error =
+        objectMapper.readValue(mvcResult.getResponse().getContentAsString(), ErrorRS.class);
+    assertEquals(INCORRECT_REQUEST, error.getErrorType());
+    assertEquals(INCORRECT_REQUEST_MESSAGE + "[" + FIELD_NAME_IS_BLANK_MESSAGE + " "
+        + FIELD_NAME_SIZE_MESSAGE + "] ", error.getMessage());
+  }
+
+  @Test
+  public void createWidgetShouldReturnErrorWhenNameConsistsOfWhitespaces() throws Exception {
+    //GIVEN
+    WidgetRQ widgetRQ = prepareWidget();
+    widgetRQ.setName(WHITESPACES_NAME_VALUE);
+
+    //WHEN
+    MvcResult mvcResult = mockMvc.perform(
+            post(DEFAULT_PROJECT_BASE_URL + WIDGET_PATH).with(token(oAuthHelper.getDefaultToken()))
+                .content(objectMapper.writeValueAsBytes(widgetRQ)).contentType(APPLICATION_JSON))
+        .andExpect(status().isBadRequest()).andReturn();
+
+    //THEN
+    ErrorRS error =
+        objectMapper.readValue(mvcResult.getResponse().getContentAsString(), ErrorRS.class);
+    assertEquals(INCORRECT_REQUEST, error.getErrorType());
+    assertEquals(INCORRECT_REQUEST_MESSAGE + "[" + FIELD_NAME_IS_BLANK_MESSAGE + " "
+        + FIELD_NAME_SIZE_MESSAGE + "] ", error.getMessage());
+  }
+
+  @Test
+  public void createWidgetShouldReturnErrorWhenNameIsLessThanThreeCharacters() throws Exception {
+    //GIVEN
+    WidgetRQ widgetRQ = prepareWidget();
+    widgetRQ.setName(SHORT_NAME_VALUE);
+
+    //WHEN
+    MvcResult mvcResult = mockMvc.perform(
+            post(DEFAULT_PROJECT_BASE_URL + WIDGET_PATH).with(token(oAuthHelper.getDefaultToken()))
+                .content(objectMapper.writeValueAsBytes(widgetRQ)).contentType(APPLICATION_JSON))
+        .andExpect(status().isBadRequest()).andReturn();
+
+    //THEN
+    ErrorRS error =
+        objectMapper.readValue(mvcResult.getResponse().getContentAsString(), ErrorRS.class);
+    assertEquals(INCORRECT_REQUEST, error.getErrorType());
+    assertEquals(
+        INCORRECT_REQUEST_MESSAGE + "[" + FIELD_NAME_SIZE_MESSAGE + "] ", error.getMessage());
+  }
+
+  @Test
+  public void createWidgetShouldReturnErrorWhenNameIsGreaterThanOneHundredAndTwentyEightCharacters()
+      throws Exception {
+    //GIVEN
+    WidgetRQ widgetRQ = prepareWidget();
+    widgetRQ.setName(LONG_NAME_VALUE);
+
+    //WHEN
+    MvcResult mvcResult = mockMvc.perform(
+            post(DEFAULT_PROJECT_BASE_URL + WIDGET_PATH).with(token(oAuthHelper.getDefaultToken()))
+                .content(objectMapper.writeValueAsBytes(widgetRQ)).contentType(APPLICATION_JSON))
+        .andExpect(status().isBadRequest()).andReturn();
+
+    //THEN
+    ErrorRS error =
+        objectMapper.readValue(mvcResult.getResponse().getContentAsString(), ErrorRS.class);
+    assertEquals(INCORRECT_REQUEST, error.getErrorType());
+    assertEquals(
+        INCORRECT_REQUEST_MESSAGE + "[" + FIELD_NAME_SIZE_MESSAGE + "] ", error.getMessage());
+  }
+
+  @Test
+  public void updateWidgetShouldReturnErrorWhenNameIsNull() throws Exception {
+    //GIVEN
+    WidgetRQ widgetRQ = prepareWidget();
+
+    //WHEN
+    MvcResult mvcResult = mockMvc.perform(
+        put(DEFAULT_PROJECT_BASE_URL + WIDGET_PATH + ID_PATH).with(
+                token(oAuthHelper.getDefaultToken())).content(objectMapper.writeValueAsBytes(widgetRQ))
+            .contentType(APPLICATION_JSON)).andExpect(status().isBadRequest()).andReturn();
+
+    //THEN
+    ErrorRS error =
+        objectMapper.readValue(mvcResult.getResponse().getContentAsString(), ErrorRS.class);
+    assertEquals(INCORRECT_REQUEST, error.getErrorType());
+    assertEquals(INCORRECT_REQUEST_MESSAGE + FIELD_NAME_IS_NULL_MESSAGE, error.getMessage());
+  }
+
+  @Test
+  public void updateWidgetShouldReturnErrorWhenNameIsEmpty() throws Exception {
+    //GIVEN
+    WidgetRQ widgetRQ = prepareWidget();
+    widgetRQ.setName(EMPTY);
+
+    //WHEN
+    MvcResult mvcResult = mockMvc.perform(
+        put(DEFAULT_PROJECT_BASE_URL + WIDGET_PATH + ID_PATH).with(
+                token(oAuthHelper.getDefaultToken())).content(objectMapper.writeValueAsBytes(widgetRQ))
+            .contentType(APPLICATION_JSON)).andExpect(status().isBadRequest()).andReturn();
+
+    //THEN
+    ErrorRS error =
+        objectMapper.readValue(mvcResult.getResponse().getContentAsString(), ErrorRS.class);
+    assertEquals(INCORRECT_REQUEST, error.getErrorType());
+    assertEquals(INCORRECT_REQUEST_MESSAGE + "[" + FIELD_NAME_IS_BLANK_MESSAGE + " "
+        + FIELD_NAME_SIZE_MESSAGE + "] ", error.getMessage());
+  }
+
+  @Test
+  public void updateWidgetShouldReturnErrorWhenNameConsistsOfWhitespaces() throws Exception {
+    //GIVEN
+    WidgetRQ widgetRQ = prepareWidget();
+    widgetRQ.setName(WHITESPACES_NAME_VALUE);
+
+    //WHEN
+    MvcResult mvcResult = mockMvc.perform(
+        put(DEFAULT_PROJECT_BASE_URL + WIDGET_PATH + ID_PATH).with(
+                token(oAuthHelper.getDefaultToken())).content(objectMapper.writeValueAsBytes(widgetRQ))
+            .contentType(APPLICATION_JSON)).andExpect(status().isBadRequest()).andReturn();
+
+    //THEN
+    ErrorRS error =
+        objectMapper.readValue(mvcResult.getResponse().getContentAsString(), ErrorRS.class);
+    assertEquals(INCORRECT_REQUEST, error.getErrorType());
+    assertEquals(INCORRECT_REQUEST_MESSAGE + "[" + FIELD_NAME_IS_BLANK_MESSAGE + " "
+        + FIELD_NAME_SIZE_MESSAGE + "] ", error.getMessage());
+  }
+
+  @Test
+  public void updateWidgetShouldReturnErrorWhenNameIsLessThanThreeCharacters() throws Exception {
+    //GIVEN
+    WidgetRQ widgetRQ = prepareWidget();
+    widgetRQ.setName(SHORT_NAME_VALUE);
+
+    //WHEN
+    MvcResult mvcResult = mockMvc.perform(
+        put(DEFAULT_PROJECT_BASE_URL + WIDGET_PATH + ID_PATH).with(
+                token(oAuthHelper.getDefaultToken())).content(objectMapper.writeValueAsBytes(widgetRQ))
+            .contentType(APPLICATION_JSON)).andExpect(status().isBadRequest()).andReturn();
+
+    //THEN
+    ErrorRS error =
+        objectMapper.readValue(mvcResult.getResponse().getContentAsString(), ErrorRS.class);
+    assertEquals(INCORRECT_REQUEST, error.getErrorType());
+    assertEquals(
+        INCORRECT_REQUEST_MESSAGE + "[" + FIELD_NAME_SIZE_MESSAGE + "] ", error.getMessage());
+  }
+
+  @Test
+  public void updateWidgetShouldReturnErrorWhenNameIsGreaterThanOneHundredAndTwentyEightCharacters()
+      throws Exception {
+    //GIVEN
+    WidgetRQ widgetRQ = prepareWidget();
+    widgetRQ.setName(LONG_NAME_VALUE);
+
+    //WHEN
+    MvcResult mvcResult = mockMvc.perform(
+        put(DEFAULT_PROJECT_BASE_URL + WIDGET_PATH + ID_PATH).with(
+                token(oAuthHelper.getDefaultToken())).content(objectMapper.writeValueAsBytes(widgetRQ))
+            .contentType(APPLICATION_JSON)).andExpect(status().isBadRequest()).andReturn();
+
+    //THEN
+    ErrorRS error =
+        objectMapper.readValue(mvcResult.getResponse().getContentAsString(), ErrorRS.class);
+    assertEquals(INCORRECT_REQUEST, error.getErrorType());
+    assertEquals(
+        INCORRECT_REQUEST_MESSAGE + "[" + FIELD_NAME_SIZE_MESSAGE + "] ", error.getMessage());
+  }
+
+  private WidgetRQ prepareWidget() {
+    WidgetRQ widgetRQ = new WidgetRQ();
+    widgetRQ.setDescription("description");
+    widgetRQ.setWidgetType("oldLineChart");
+    ContentParameters contentParameters = new ContentParameters();
+    contentParameters.setContentFields(
+        Arrays.asList("number", "name", "user", "statistics$defects$automation_bug$AB002"));
+    contentParameters.setItemsCount(50);
+    widgetRQ.setContentParameters(contentParameters);
+    return widgetRQ;
+  }
 }
\ No newline at end of file
diff --git a/src/test/java/com/epam/ta/reportportal/ws/converter/LogResourceAssemblerTest.java b/src/test/java/com/epam/ta/reportportal/ws/converter/LogResourceAssemblerTest.java
index 8c7b6c7598..a10fe570b8 100644
--- a/src/test/java/com/epam/ta/reportportal/ws/converter/LogResourceAssemblerTest.java
+++ b/src/test/java/com/epam/ta/reportportal/ws/converter/LogResourceAssemblerTest.java
@@ -21,7 +21,7 @@
 import com.epam.ta.reportportal.entity.enums.LogLevel;
 import com.epam.ta.reportportal.entity.item.TestItem;
 import com.epam.ta.reportportal.entity.log.LogFull;
-import com.epam.ta.reportportal.ws.model.log.LogResource;
+import com.epam.ta.reportportal.model.log.LogResource;
 import java.time.LocalDateTime;
 import java.util.Collections;
 import java.util.List;
diff --git a/src/test/java/com/epam/ta/reportportal/ws/converter/builders/DashboardBuilderTest.java b/src/test/java/com/epam/ta/reportportal/ws/converter/builders/DashboardBuilderTest.java
index 4443a04339..3a6f69e5f4 100644
--- a/src/test/java/com/epam/ta/reportportal/ws/converter/builders/DashboardBuilderTest.java
+++ b/src/test/java/com/epam/ta/reportportal/ws/converter/builders/DashboardBuilderTest.java
@@ -16,72 +16,74 @@
 
 package com.epam.ta.reportportal.ws.converter.builders;
 
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
 import com.epam.ta.reportportal.entity.dashboard.Dashboard;
 import com.epam.ta.reportportal.entity.dashboard.DashboardWidget;
 import com.epam.ta.reportportal.entity.dashboard.DashboardWidgetId;
-import com.epam.ta.reportportal.ws.model.Position;
-import com.epam.ta.reportportal.ws.model.Size;
-import com.epam.ta.reportportal.ws.model.dashboard.CreateDashboardRQ;
-import com.epam.ta.reportportal.ws.model.dashboard.DashboardResource;
-import com.epam.ta.reportportal.ws.model.dashboard.UpdateDashboardRQ;
-import org.junit.jupiter.api.Test;
-
+import com.epam.ta.reportportal.model.Position;
+import com.epam.ta.reportportal.model.Size;
+import com.epam.ta.reportportal.model.dashboard.CreateDashboardRQ;
+import com.epam.ta.reportportal.model.dashboard.DashboardResource;
+import com.epam.ta.reportportal.model.dashboard.UpdateDashboardRQ;
 import java.util.Collections;
-
-import static org.junit.jupiter.api.Assertions.assertEquals;
+import org.junit.jupiter.api.Test;
 
 /**
  * @author <a href="mailto:ihar_kahadouski@epam.com">Ihar Kahadouski</a>
  */
 class DashboardBuilderTest {
 
-	@Test
-	void createDashboard() {
-		final String name = "name";
-		final String description = "description";
-		final boolean share = true;
-		final String owner = "owner";
-		final Long projectId = 1L;
+  @Test
+  void createDashboard() {
+    final String name = "name";
+    final String description = "description";
+    final boolean share = true;
+    final String owner = "owner";
+    final Long projectId = 1L;
 
-		CreateDashboardRQ createDashboardRQ = new CreateDashboardRQ();
-		createDashboardRQ.setName(name);
-		createDashboardRQ.setDescription(description);
+    CreateDashboardRQ createDashboardRQ = new CreateDashboardRQ();
+    createDashboardRQ.setName(name);
+    createDashboardRQ.setDescription(description);
 
-		final Dashboard dashboard = new DashboardBuilder().addDashboardRq(createDashboardRQ).addOwner(owner).addProject(projectId).get();
+    final Dashboard dashboard =
+        new DashboardBuilder().addDashboardRq(createDashboardRQ).addOwner(owner)
+            .addProject(projectId).get();
 
-		assertEquals(name, dashboard.getName());
-		assertEquals(description, dashboard.getDescription());
-		assertEquals(owner, dashboard.getOwner());
-		assertEquals(projectId, dashboard.getProject().getId());
-	}
+    assertEquals(name, dashboard.getName());
+    assertEquals(description, dashboard.getDescription());
+    assertEquals(owner, dashboard.getOwner());
+    assertEquals(projectId, dashboard.getProject().getId());
+  }
 
-	@Test
-	void updateDashboard() {
-		final String name = "name";
-		final String description = "description";
-		final boolean share = true;
+  @Test
+  void updateDashboard() {
+    final String name = "name";
+    final String description = "description";
+    final boolean share = true;
 
-		UpdateDashboardRQ updateDashboardRQ = new UpdateDashboardRQ();
-		updateDashboardRQ.setName(name);
-		updateDashboardRQ.setDescription(description);
-		updateDashboardRQ.setWidgets(Collections.singletonList(new DashboardResource.WidgetObjectModel("kek", 1L,
-				new Size(10, 20),
-				new Position(30, 40)
-		)));
+    UpdateDashboardRQ updateDashboardRQ = new UpdateDashboardRQ();
+    updateDashboardRQ.setName(name);
+    updateDashboardRQ.setDescription(description);
+    updateDashboardRQ.setWidgets(Collections.singletonList(
+        new DashboardResource.WidgetObjectModel("kek", 1L, new Size(10, 20),
+            new Position(30, 40)
+        )));
 
-		DashboardWidget dashboardWidget = new DashboardWidget();
-		dashboardWidget.setHeight(5);
-		dashboardWidget.setWidth(10);
-		dashboardWidget.setPositionX(1);
-		dashboardWidget.setPositionY(2);
-		dashboardWidget.setId(new DashboardWidgetId(1L, 1L));
+    DashboardWidget dashboardWidget = new DashboardWidget();
+    dashboardWidget.setHeight(5);
+    dashboardWidget.setWidth(10);
+    dashboardWidget.setPositionX(1);
+    dashboardWidget.setPositionY(2);
+    dashboardWidget.setId(new DashboardWidgetId(1L, 1L));
 
-		final Dashboard existDashboard = new Dashboard();
-		existDashboard.addWidget(dashboardWidget);
+    final Dashboard existDashboard = new Dashboard();
+    existDashboard.addWidget(dashboardWidget);
 
-		final Dashboard dashboard = new DashboardBuilder(existDashboard).addUpdateRq(updateDashboardRQ).get();
+    final Dashboard dashboard =
+        new DashboardBuilder(existDashboard).addUpdateRq(updateDashboardRQ).get();
 
-		assertEquals(name, dashboard.getName());
-		assertEquals(description, dashboard.getDescription());
-	}
+    assertEquals(name, dashboard.getName());
+    assertEquals(description, dashboard.getDescription());
+  }
 }
\ No newline at end of file
diff --git a/src/test/java/com/epam/ta/reportportal/ws/converter/builders/PatternTemplateBuilderTest.java b/src/test/java/com/epam/ta/reportportal/ws/converter/builders/PatternTemplateBuilderTest.java
index bfb72f7c32..6603b03dff 100644
--- a/src/test/java/com/epam/ta/reportportal/ws/converter/builders/PatternTemplateBuilderTest.java
+++ b/src/test/java/com/epam/ta/reportportal/ws/converter/builders/PatternTemplateBuilderTest.java
@@ -19,7 +19,7 @@
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
 import com.epam.ta.reportportal.entity.pattern.PatternTemplate;
-import com.epam.ta.reportportal.ws.model.project.config.pattern.CreatePatternTemplateRQ;
+import com.epam.ta.reportportal.model.project.config.pattern.CreatePatternTemplateRQ;
 import org.junit.jupiter.api.Test;
 
 /**
diff --git a/src/test/java/com/epam/ta/reportportal/ws/converter/builders/UserBuilderTest.java b/src/test/java/com/epam/ta/reportportal/ws/converter/builders/UserBuilderTest.java
index 7cfb8a0fd3..7f70b36fa8 100644
--- a/src/test/java/com/epam/ta/reportportal/ws/converter/builders/UserBuilderTest.java
+++ b/src/test/java/com/epam/ta/reportportal/ws/converter/builders/UserBuilderTest.java
@@ -23,7 +23,7 @@
 import com.epam.ta.reportportal.entity.user.User;
 import com.epam.ta.reportportal.entity.user.UserRole;
 import com.epam.ta.reportportal.entity.user.UserType;
-import com.epam.ta.reportportal.ws.model.user.CreateUserRQConfirm;
+import com.epam.ta.reportportal.model.user.CreateUserRQConfirm;
 import org.junit.jupiter.api.Test;
 
 /**
diff --git a/src/test/java/com/epam/ta/reportportal/ws/converter/builders/UserFilterBuilderTest.java b/src/test/java/com/epam/ta/reportportal/ws/converter/builders/UserFilterBuilderTest.java
index 4238492102..e838baf3be 100644
--- a/src/test/java/com/epam/ta/reportportal/ws/converter/builders/UserFilterBuilderTest.java
+++ b/src/test/java/com/epam/ta/reportportal/ws/converter/builders/UserFilterBuilderTest.java
@@ -16,56 +16,57 @@
 
 package com.epam.ta.reportportal.ws.converter.builders;
 
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
 import com.epam.ta.reportportal.commons.querygen.FilterCondition;
 import com.epam.ta.reportportal.entity.filter.FilterSort;
 import com.epam.ta.reportportal.entity.filter.UserFilter;
 import com.epam.ta.reportportal.entity.launch.Launch;
-import com.epam.ta.reportportal.ws.model.filter.Order;
-import com.epam.ta.reportportal.ws.model.filter.UpdateUserFilterRQ;
-import com.epam.ta.reportportal.ws.model.filter.UserFilterCondition;
+import com.epam.ta.reportportal.model.filter.Order;
+import com.epam.ta.reportportal.model.filter.UpdateUserFilterRQ;
+import com.epam.ta.reportportal.model.filter.UserFilterCondition;
 import com.google.common.collect.Sets;
+import java.util.Collections;
 import org.junit.jupiter.api.Test;
 import org.springframework.data.domain.Sort;
 
-import java.util.Collections;
-
-import static org.assertj.core.api.Assertions.assertThat;
-import static org.junit.jupiter.api.Assertions.assertEquals;
-
 /**
  * @author <a href="mailto:ihar_kahadouski@epam.com">Ihar Kahadouski</a>
  */
 class UserFilterBuilderTest {
 
-	@Test
-	void userFilterBuilder() {
-		final UpdateUserFilterRQ request = new UpdateUserFilterRQ();
-		final String name = "name";
-		request.setName(name);
-		final String objectType = "Launch";
-		request.setObjectType(objectType);
-		request.setConditions(Sets.newHashSet(new UserFilterCondition("name", "eq", "value")));
-		final Order order = new Order();
-		order.setIsAsc(false);
-		order.setSortingColumnName("column");
-		request.setOrders(Collections.singletonList(order));
-		final String description = "description";
-		request.setDescription(description);
-		final boolean share = true;
-		final String owner = "owner";
-		final Long projectId = 1L;
+  @Test
+  void userFilterBuilder() {
+    final UpdateUserFilterRQ request = new UpdateUserFilterRQ();
+    final String name = "name";
+    request.setName(name);
+    final String objectType = "Launch";
+    request.setObjectType(objectType);
+    request.setConditions(Sets.newHashSet(new UserFilterCondition("name", "eq", "value")));
+    final Order order = new Order();
+    order.setIsAsc(false);
+    order.setSortingColumnName("column");
+    request.setOrders(Collections.singletonList(order));
+    final String description = "description";
+    request.setDescription(description);
+    final boolean share = true;
+    final String owner = "owner";
+    final Long projectId = 1L;
 
-		final UserFilter userFilter = new UserFilterBuilder().addFilterRq(request).addOwner(owner).addProject(projectId).get();
+    final UserFilter userFilter =
+        new UserFilterBuilder().addFilterRq(request).addOwner(owner).addProject(projectId).get();
 
-		assertEquals(name, userFilter.getName());
-		assertEquals(description, userFilter.getDescription());
-		assertEquals(owner, userFilter.getOwner());
-		assertEquals(projectId, userFilter.getProject().getId());
-		assertEquals(Launch.class, userFilter.getTargetClass().getClassObject());
-		assertThat(userFilter.getFilterCondition()).containsExactlyInAnyOrder(FilterCondition.builder().eq("name", "value").build());
-		final FilterSort filterSort = new FilterSort();
-		filterSort.setDirection(Sort.Direction.DESC);
-		filterSort.setField("column");
-		assertThat(userFilter.getFilterSorts()).containsExactlyInAnyOrder(filterSort);
-	}
+    assertEquals(name, userFilter.getName());
+    assertEquals(description, userFilter.getDescription());
+    assertEquals(owner, userFilter.getOwner());
+    assertEquals(projectId, userFilter.getProject().getId());
+    assertEquals(Launch.class, userFilter.getTargetClass().getClassObject());
+    assertThat(userFilter.getFilterCondition()).containsExactlyInAnyOrder(
+        FilterCondition.builder().eq("name", "value").build());
+    final FilterSort filterSort = new FilterSort();
+    filterSort.setDirection(Sort.Direction.DESC);
+    filterSort.setField("column");
+    assertThat(userFilter.getFilterSorts()).containsExactlyInAnyOrder(filterSort);
+  }
 }
\ No newline at end of file
diff --git a/src/test/java/com/epam/ta/reportportal/ws/converter/builders/WidgetBuilderTest.java b/src/test/java/com/epam/ta/reportportal/ws/converter/builders/WidgetBuilderTest.java
index 4b5a540c3a..347a0bb953 100644
--- a/src/test/java/com/epam/ta/reportportal/ws/converter/builders/WidgetBuilderTest.java
+++ b/src/test/java/com/epam/ta/reportportal/ws/converter/builders/WidgetBuilderTest.java
@@ -16,74 +16,77 @@
 
 package com.epam.ta.reportportal.ws.converter.builders;
 
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
 import com.epam.ta.reportportal.entity.filter.UserFilter;
 import com.epam.ta.reportportal.entity.widget.Widget;
-import com.epam.ta.reportportal.ws.model.widget.ContentParameters;
-import com.epam.ta.reportportal.ws.model.widget.WidgetPreviewRQ;
-import com.epam.ta.reportportal.ws.model.widget.WidgetRQ;
-import org.junit.jupiter.api.Test;
-
+import com.epam.ta.reportportal.model.widget.ContentParameters;
+import com.epam.ta.reportportal.model.widget.WidgetPreviewRQ;
+import com.epam.ta.reportportal.model.widget.WidgetRQ;
 import java.util.AbstractMap;
 import java.util.Collections;
 import java.util.HashMap;
-
-import static org.assertj.core.api.Assertions.assertThat;
-import static org.junit.jupiter.api.Assertions.assertEquals;
+import org.junit.jupiter.api.Test;
 
 /**
  * @author <a href="mailto:ihar_kahadouski@epam.com">Ihar Kahadouski</a>
  */
 class WidgetBuilderTest {
 
-	@Test
-	void widgetBuilderTest() {
-		final WidgetRQ widgetRQ = new WidgetRQ();
-		final String name = "name";
-		widgetRQ.setName(name);
-		final String description = "description";
-		widgetRQ.setDescription(description);
-		final boolean share = true;
-		final String widgetType = "oldLineChart";
-		widgetRQ.setWidgetType(widgetType);
-		final ContentParameters contentParameters = new ContentParameters();
-		contentParameters.setContentFields(Collections.singletonList("contentField"));
-		contentParameters.setItemsCount(10);
-		final HashMap<String, Object> widgetOptions = new HashMap<>();
-		widgetOptions.put("param", "val");
-		contentParameters.setWidgetOptions(widgetOptions);
-		widgetRQ.setContentParameters(contentParameters);
-		final String owner = "owner";
-		final UserFilter userFilter = new UserFilter();
-		userFilter.setId(1L);
+  @Test
+  void widgetBuilderTest() {
+    final WidgetRQ widgetRQ = new WidgetRQ();
+    final String name = "name";
+    widgetRQ.setName(name);
+    final String description = "description";
+    widgetRQ.setDescription(description);
+    final boolean share = true;
+    final String widgetType = "oldLineChart";
+    widgetRQ.setWidgetType(widgetType);
+    final ContentParameters contentParameters = new ContentParameters();
+    contentParameters.setContentFields(Collections.singletonList("contentField"));
+    contentParameters.setItemsCount(10);
+    final HashMap<String, Object> widgetOptions = new HashMap<>();
+    widgetOptions.put("param", "val");
+    contentParameters.setWidgetOptions(widgetOptions);
+    widgetRQ.setContentParameters(contentParameters);
+    final String owner = "owner";
+    final UserFilter userFilter = new UserFilter();
+    userFilter.setId(1L);
 
-		final Widget widget = new WidgetBuilder().addWidgetRq(widgetRQ).addFilters(Collections.singletonList(userFilter)).addOwner(owner).get();
+    final Widget widget =
+        new WidgetBuilder().addWidgetRq(widgetRQ).addFilters(Collections.singletonList(userFilter))
+            .addOwner(owner).get();
 
-		assertEquals(name, widget.getName());
-		assertEquals(description, widget.getDescription());
-		assertEquals(owner, widget.getOwner());
-		assertEquals(widgetType, widget.getWidgetType());
-		assertThat(widget.getFilters()).containsExactly(userFilter);
-		assertThat(widget.getContentFields()).containsExactly("contentField");
-		assertThat(widget.getWidgetOptions().getOptions()).containsExactly(new AbstractMap.SimpleEntry<>("param", "val"));
-	}
+    assertEquals(name, widget.getName());
+    assertEquals(description, widget.getDescription());
+    assertEquals(owner, widget.getOwner());
+    assertEquals(widgetType, widget.getWidgetType());
+    assertThat(widget.getFilters()).containsExactly(userFilter);
+    assertThat(widget.getContentFields()).containsExactly("contentField");
+    assertThat(widget.getWidgetOptions().getOptions()).containsExactly(
+        new AbstractMap.SimpleEntry<>("param", "val"));
+  }
 
-	@Test
-	void addWidgetPreviewRqTest() {
-		final WidgetPreviewRQ previewRQ = new WidgetPreviewRQ();
-		final ContentParameters contentParameters = new ContentParameters();
-		contentParameters.setContentFields(Collections.singletonList("contentField"));
-		contentParameters.setItemsCount(10);
-		final HashMap<String, Object> widgetOptions = new HashMap<>();
-		widgetOptions.put("param", "val");
-		contentParameters.setWidgetOptions(widgetOptions);
-		previewRQ.setContentParameters(contentParameters);
-		final String widgetType = "oldLineChart";
-		previewRQ.setWidgetType(widgetType);
+  @Test
+  void addWidgetPreviewRqTest() {
+    final WidgetPreviewRQ previewRQ = new WidgetPreviewRQ();
+    final ContentParameters contentParameters = new ContentParameters();
+    contentParameters.setContentFields(Collections.singletonList("contentField"));
+    contentParameters.setItemsCount(10);
+    final HashMap<String, Object> widgetOptions = new HashMap<>();
+    widgetOptions.put("param", "val");
+    contentParameters.setWidgetOptions(widgetOptions);
+    previewRQ.setContentParameters(contentParameters);
+    final String widgetType = "oldLineChart";
+    previewRQ.setWidgetType(widgetType);
 
-		final Widget widget = new WidgetBuilder(new Widget()).addWidgetPreviewRq(previewRQ).get();
+    final Widget widget = new WidgetBuilder(new Widget()).addWidgetPreviewRq(previewRQ).get();
 
-		assertEquals(widgetType, widget.getWidgetType());
-		assertThat(widget.getContentFields()).containsExactly("contentField");
-		assertThat(widget.getWidgetOptions().getOptions()).containsExactly(new AbstractMap.SimpleEntry<>("param", "val"));
-	}
+    assertEquals(widgetType, widget.getWidgetType());
+    assertThat(widget.getContentFields()).containsExactly("contentField");
+    assertThat(widget.getWidgetOptions().getOptions()).containsExactly(
+        new AbstractMap.SimpleEntry<>("param", "val"));
+  }
 }
\ No newline at end of file
diff --git a/src/test/java/com/epam/ta/reportportal/ws/converter/converters/DashboardConverterTest.java b/src/test/java/com/epam/ta/reportportal/ws/converter/converters/DashboardConverterTest.java
index f013410764..34b38f36d0 100644
--- a/src/test/java/com/epam/ta/reportportal/ws/converter/converters/DashboardConverterTest.java
+++ b/src/test/java/com/epam/ta/reportportal/ws/converter/converters/DashboardConverterTest.java
@@ -16,79 +16,80 @@
 
 package com.epam.ta.reportportal.ws.converter.converters;
 
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+
 import com.epam.ta.reportportal.entity.dashboard.Dashboard;
 import com.epam.ta.reportportal.entity.dashboard.DashboardWidget;
 import com.epam.ta.reportportal.entity.dashboard.DashboardWidgetId;
 import com.epam.ta.reportportal.entity.project.Project;
 import com.epam.ta.reportportal.entity.widget.Widget;
-import com.epam.ta.reportportal.ws.model.activity.DashboardActivityResource;
-import com.epam.ta.reportportal.ws.model.dashboard.DashboardResource;
-import org.junit.jupiter.api.Test;
-
+import com.epam.ta.reportportal.model.activity.DashboardActivityResource;
+import com.epam.ta.reportportal.model.dashboard.DashboardResource;
 import java.time.LocalDateTime;
-
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertThrows;
+import org.junit.jupiter.api.Test;
 
 /**
  * @author <a href="mailto:ihar_kahadouski@epam.com">Ihar Kahadouski</a>
  */
 class DashboardConverterTest {
 
-	@Test
-	void toResourceNullTest() {
-		assertThrows(NullPointerException.class, () -> DashboardConverter.TO_RESOURCE.apply(null));
-	}
+  @Test
+  void toResourceNullTest() {
+    assertThrows(NullPointerException.class, () -> DashboardConverter.TO_RESOURCE.apply(null));
+  }
 
-	@Test
-	void toActivityResourceNullTest() {
-		assertThrows(NullPointerException.class, () -> DashboardConverter.TO_ACTIVITY_RESOURCE.apply(null));
-	}
+  @Test
+  void toActivityResourceNullTest() {
+    assertThrows(
+        NullPointerException.class, () -> DashboardConverter.TO_ACTIVITY_RESOURCE.apply(null));
+  }
 
-	@Test
-	void toActivityResource() {
-		final Dashboard dashboard = getDashboard();
-		final DashboardActivityResource activityResource = DashboardConverter.TO_ACTIVITY_RESOURCE.apply(dashboard);
+  @Test
+  void toActivityResource() {
+    final Dashboard dashboard = getDashboard();
+    final DashboardActivityResource activityResource =
+        DashboardConverter.TO_ACTIVITY_RESOURCE.apply(dashboard);
 
-		assertEquals(activityResource.getId(), dashboard.getId());
-		assertEquals(activityResource.getName(), dashboard.getName());
-		assertEquals(activityResource.getDescription(), dashboard.getDescription());
-		assertEquals(activityResource.getProjectId(), dashboard.getProject().getId());
-	}
+    assertEquals(activityResource.getId(), dashboard.getId());
+    assertEquals(activityResource.getName(), dashboard.getName());
+    assertEquals(activityResource.getDescription(), dashboard.getDescription());
+    assertEquals(activityResource.getProjectId(), dashboard.getProject().getId());
+  }
 
-	@Test
-	void toResource() {
-		final Dashboard dashboard = getDashboard();
-		final DashboardResource resource = DashboardConverter.TO_RESOURCE.apply(dashboard);
+  @Test
+  void toResource() {
+    final Dashboard dashboard = getDashboard();
+    final DashboardResource resource = DashboardConverter.TO_RESOURCE.apply(dashboard);
 
-		assertEquals(resource.getDashboardId(), dashboard.getId());
-		assertEquals(resource.getName(), dashboard.getName());
-		assertEquals(resource.getDescription(), dashboard.getDescription());
-		assertEquals(resource.getOwner(), dashboard.getOwner());
-		assertEquals(resource.getWidgets().size(), dashboard.getDashboardWidgets().size());
-	}
+    assertEquals(resource.getDashboardId(), dashboard.getId());
+    assertEquals(resource.getName(), dashboard.getName());
+    assertEquals(resource.getDescription(), dashboard.getDescription());
+    assertEquals(resource.getOwner(), dashboard.getOwner());
+    assertEquals(resource.getWidgets().size(), dashboard.getDashboardWidgets().size());
+  }
 
-	private static Dashboard getDashboard() {
-		Dashboard dashboard = new Dashboard();
-		dashboard.setId(1L);
-		dashboard.setName("name");
-		dashboard.setDescription("description");
-		dashboard.setCreationDate(LocalDateTime.now());
-		dashboard.setOwner("owner");
-		final Project project = new Project();
-		project.setId(2L);
-		dashboard.setProject(project);
-		final DashboardWidget dashboardWidget = new DashboardWidget();
-		dashboardWidget.setId(new DashboardWidgetId(1L, 3L));
-		dashboardWidget.setPositionY(2);
-		dashboardWidget.setPositionX(3);
-		dashboardWidget.setWidth(5);
-		dashboardWidget.setHeight(6);
-		dashboardWidget.setWidgetName("widgetName");
-		dashboardWidget.setDashboard(dashboard);
-		final Widget widget = new Widget();
-		dashboardWidget.setWidget(widget);
-		dashboard.addWidget(dashboardWidget);
-		return dashboard;
-	}
+  private static Dashboard getDashboard() {
+    Dashboard dashboard = new Dashboard();
+    dashboard.setId(1L);
+    dashboard.setName("name");
+    dashboard.setDescription("description");
+    dashboard.setCreationDate(LocalDateTime.now());
+    dashboard.setOwner("owner");
+    final Project project = new Project();
+    project.setId(2L);
+    dashboard.setProject(project);
+    final DashboardWidget dashboardWidget = new DashboardWidget();
+    dashboardWidget.setId(new DashboardWidgetId(1L, 3L));
+    dashboardWidget.setPositionY(2);
+    dashboardWidget.setPositionX(3);
+    dashboardWidget.setWidth(5);
+    dashboardWidget.setHeight(6);
+    dashboardWidget.setWidgetName("widgetName");
+    dashboardWidget.setDashboard(dashboard);
+    final Widget widget = new Widget();
+    dashboardWidget.setWidget(widget);
+    dashboard.addWidget(dashboardWidget);
+    return dashboard;
+  }
 }
\ No newline at end of file
diff --git a/src/test/java/com/epam/ta/reportportal/ws/converter/converters/IntegrationConverterTest.java b/src/test/java/com/epam/ta/reportportal/ws/converter/converters/IntegrationConverterTest.java
index 114abaebb4..3244b13f58 100644
--- a/src/test/java/com/epam/ta/reportportal/ws/converter/converters/IntegrationConverterTest.java
+++ b/src/test/java/com/epam/ta/reportportal/ws/converter/converters/IntegrationConverterTest.java
@@ -25,9 +25,9 @@
 import com.epam.ta.reportportal.entity.integration.IntegrationParams;
 import com.epam.ta.reportportal.entity.integration.IntegrationType;
 import com.epam.ta.reportportal.entity.project.Project;
-import com.epam.ta.reportportal.ws.model.activity.IntegrationActivityResource;
-import com.epam.ta.reportportal.ws.model.integration.IntegrationResource;
-import com.epam.ta.reportportal.ws.model.integration.IntegrationTypeResource;
+import com.epam.ta.reportportal.model.activity.IntegrationActivityResource;
+import com.epam.ta.reportportal.model.integration.IntegrationResource;
+import com.epam.ta.reportportal.model.integration.IntegrationTypeResource;
 import com.google.common.collect.Sets;
 import java.sql.Date;
 import java.time.LocalDateTime;
@@ -43,35 +43,39 @@ class IntegrationConverterTest {
   @Test
   void toResource() {
     final Integration integration = getIntegration();
-    final IntegrationResource resource = IntegrationConverter.TO_INTEGRATION_RESOURCE.apply(
-        integration);
+    final IntegrationResource resource =
+        IntegrationConverter.TO_INTEGRATION_RESOURCE.apply(integration);
 
     assertEquals(resource.getCreationDate(),
-        Date.from(integration.getCreationDate().atZone(ZoneId.of("UTC")).toInstant()));
+        Date.from(integration.getCreationDate().atZone(ZoneId.of("UTC")).toInstant())
+    );
     assertEquals(resource.getEnabled(), integration.isEnabled());
     assertEquals(resource.getId(), integration.getId());
     assertEquals(resource.getProjectId(), integration.getProject().getId());
 
     assertThat(resource.getIntegrationParams()).containsOnlyKeys("param1", "param2", "nullParam",
-        null);
+        null
+    );
     assertThat(resource.getIntegrationParams()).doesNotContainKey("accessToken");
     assertThat(resource.getIntegrationParams()).containsValues("qwerty", "asdfgh", "value", null);
 
     final IntegrationTypeResource integrationTypeResource = resource.getIntegrationType();
 
     assertEquals(integrationTypeResource.getAuthFlow().name(),
-        integration.getType().getAuthFlow().name());
+        integration.getType().getAuthFlow().name()
+    );
     assertEquals(integrationTypeResource.getId(), integration.getType().getId());
     assertEquals(integrationTypeResource.getName(), integration.getType().getName());
     assertEquals(integrationTypeResource.getGroupType(),
-        integration.getType().getIntegrationGroup().name());
+        integration.getType().getIntegrationGroup().name()
+    );
   }
 
   @Test
   void toActivityResource() {
     final Integration integration = getIntegration();
-    final IntegrationActivityResource resource = IntegrationConverter.TO_ACTIVITY_RESOURCE.apply(
-        integration);
+    final IntegrationActivityResource resource =
+        IntegrationConverter.TO_ACTIVITY_RESOURCE.apply(integration);
 
     assertEquals(resource.getId(), integration.getId());
     assertEquals(resource.getProjectId(), integration.getProject().getId());
diff --git a/src/test/java/com/epam/ta/reportportal/ws/converter/converters/LogConverterTest.java b/src/test/java/com/epam/ta/reportportal/ws/converter/converters/LogConverterTest.java
index 33d700039e..f808ce0abd 100644
--- a/src/test/java/com/epam/ta/reportportal/ws/converter/converters/LogConverterTest.java
+++ b/src/test/java/com/epam/ta/reportportal/ws/converter/converters/LogConverterTest.java
@@ -22,7 +22,7 @@
 import com.epam.ta.reportportal.entity.enums.LogLevel;
 import com.epam.ta.reportportal.entity.item.TestItem;
 import com.epam.ta.reportportal.entity.log.LogFull;
-import com.epam.ta.reportportal.ws.model.log.LogResource;
+import com.epam.ta.reportportal.model.log.LogResource;
 import java.time.LocalDateTime;
 import java.time.ZoneId;
 import java.util.Date;
@@ -62,8 +62,10 @@ void toResource() {
     assertEquals(resource.getUuid(), logFull.getUuid());
     assertEquals(resource.getMessage(), logFull.getLogMessage());
     assertEquals(resource.getLevel(), LogLevel.toLevel(logFull.getLogLevel()).toString());
-    assertEquals(resource.getLogTime(),
-        Date.from(logFull.getLogTime().atZone(ZoneId.of("UTC")).toInstant()));
+    assertEquals(
+        resource.getLogTime(),
+        Date.from(logFull.getLogTime().atZone(ZoneId.of("UTC")).toInstant())
+    );
     assertEquals(resource.getItemId(), logFull.getTestItem().getItemId());
 
     final LogResource.BinaryContent binaryContent = resource.getBinaryContent();
diff --git a/src/test/java/com/epam/ta/reportportal/ws/converter/converters/NotificationConfigConverterTest.java b/src/test/java/com/epam/ta/reportportal/ws/converter/converters/NotificationConfigConverterTest.java
index b8aa512b05..9557281dea 100644
--- a/src/test/java/com/epam/ta/reportportal/ws/converter/converters/NotificationConfigConverterTest.java
+++ b/src/test/java/com/epam/ta/reportportal/ws/converter/converters/NotificationConfigConverterTest.java
@@ -16,110 +16,107 @@
 
 package com.epam.ta.reportportal.ws.converter.converters;
 
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+
 import com.epam.ta.reportportal.entity.enums.LogicalOperator;
 import com.epam.ta.reportportal.entity.enums.SendCase;
 import com.epam.ta.reportportal.entity.project.email.LaunchAttributeRule;
 import com.epam.ta.reportportal.entity.project.email.SenderCase;
+import com.epam.ta.reportportal.model.project.email.SenderCaseDTO;
 import com.epam.ta.reportportal.ws.model.attribute.ItemAttributeResource;
-import com.epam.ta.reportportal.ws.model.project.email.SenderCaseDTO;
 import com.google.common.collect.Sets;
-import org.junit.jupiter.api.Test;
-
 import java.util.Arrays;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
-
-import static org.assertj.core.api.Assertions.assertThat;
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertThrows;
+import org.junit.jupiter.api.Test;
 
 /**
  * @author <a href="mailto:ihar_kahadouski@epam.com">Ihar Kahadouski</a>
  */
 class NotificationConfigConverterTest {
 
-	@Test
-	void toCaseModelNullTest() {
-		assertThrows(NullPointerException.class, () -> NotificationConfigConverter.TO_CASE_MODEL.apply(null));
-	}
-
-	@Test
-	void toResource() {
-		final Set<SenderCase> senderCases = getSenderCases();
-		List<SenderCaseDTO> resources = NotificationConfigConverter.TO_RESOURCE.apply(senderCases);
-
-		assertEquals(resources.size(), senderCases.size());
-	}
-
-	@Test
-	void toCaseResource() {
-		final SenderCase senderCase = getCase();
-		final SenderCaseDTO senderCaseDTO = NotificationConfigConverter.TO_CASE_RESOURCE.apply(senderCase);
-
-		assertThat(senderCaseDTO.getRecipients()).containsExactlyInAnyOrderElementsOf(senderCase.getRecipients());
-		//		assertThat(senderCaseDTO.getAttributes()).containsExactlyInAnyOrderElementsOf(senderCase.getLaunchAttributeRules());
-		assertThat(senderCaseDTO.getLaunchNames()).containsExactlyInAnyOrderElementsOf(senderCase.getLaunchNames());
-		assertEquals(senderCaseDTO.getSendCase(), senderCase.getSendCase().getCaseString());
-	}
-
-	@Test
-	void toCaseModel() {
-		final SenderCaseDTO caseDTO = getCaseDTO();
-		final SenderCase senderCase = NotificationConfigConverter.TO_CASE_MODEL.apply(caseDTO);
-
-		assertThat(senderCase.getRecipients()).containsExactlyInAnyOrderElementsOf(caseDTO.getRecipients());
-		assertThat(senderCase.getLaunchNames()).containsExactlyInAnyOrderElementsOf(caseDTO.getLaunchNames());
-		//		assertThat(senderCase.getLaunchAttributes()).containsExactlyInAnyOrderElementsOf(caseDTO.getAttributes());
-		assertEquals(senderCase.getSendCase().getCaseString(), caseDTO.getSendCase());
-		assertEquals(senderCase.isEnabled(), caseDTO.isEnabled());
-	}
-
-	private static Set<SenderCase> getSenderCases() {
-		Set<SenderCase> senderCases = new HashSet<>();
-		senderCases.add(getCase());
-		final LaunchAttributeRule launchAttributeRule = new LaunchAttributeRule();
-		launchAttributeRule.setId(1L);
-		launchAttributeRule.setKey("key");
-		launchAttributeRule.setValue("value");
-		senderCases.add(new SenderCase(
-				Sets.newHashSet("recipent3", "recipient8"),
-				Sets.newHashSet("launch1", "launch5", "launch10"),
-				Sets.newHashSet(launchAttributeRule),
-				SendCase.ALWAYS,
-				true,
-				LogicalOperator.AND
-		));
-		return senderCases;
-	}
-
-	private static SenderCase getCase() {
-		final LaunchAttributeRule launchAttributeRule = new LaunchAttributeRule();
-		launchAttributeRule.setId(2L);
-		launchAttributeRule.setKey("key1");
-		launchAttributeRule.setValue("value1");
-		return new SenderCase(
-				Sets.newHashSet("recipent1", "recipient2"),
-				Sets.newHashSet("launch1", "launch2", "launch3"),
-				Sets.newHashSet(launchAttributeRule),
-				SendCase.MORE_10,
-				true,
-				LogicalOperator.AND
-		);
-	}
-
-	private static SenderCaseDTO getCaseDTO() {
-		SenderCaseDTO senderCaseDTO = new SenderCaseDTO();
-		senderCaseDTO.setRecipients(Arrays.asList("recipient1", "recipient2"));
-		senderCaseDTO.setLaunchNames(Arrays.asList("launch1", "launch2"));
-		final ItemAttributeResource launchAttribute = new ItemAttributeResource();
-		launchAttribute.setKey("key");
-		launchAttribute.setValue("val");
-		senderCaseDTO.setAttributes(Sets.newHashSet(launchAttribute));
-		senderCaseDTO.setSendCase("always");
-		senderCaseDTO.setEnabled(true);
-		senderCaseDTO.setAttributesOperator(LogicalOperator.AND.getOperator());
-		return senderCaseDTO;
-	}
+  @Test
+  void toCaseModelNullTest() {
+    assertThrows(
+        NullPointerException.class, () -> NotificationConfigConverter.TO_CASE_MODEL.apply(null));
+  }
+
+  @Test
+  void toResource() {
+    final Set<SenderCase> senderCases = getSenderCases();
+    List<SenderCaseDTO> resources = NotificationConfigConverter.TO_RESOURCE.apply(senderCases);
+
+    assertEquals(resources.size(), senderCases.size());
+  }
+
+  @Test
+  void toCaseResource() {
+    final SenderCase senderCase = getCase();
+    final SenderCaseDTO senderCaseDTO =
+        NotificationConfigConverter.TO_CASE_RESOURCE.apply(senderCase);
+
+    assertThat(senderCaseDTO.getRecipients()).containsExactlyInAnyOrderElementsOf(
+        senderCase.getRecipients());
+    //		assertThat(senderCaseDTO.getAttributes()).containsExactlyInAnyOrderElementsOf(senderCase.getLaunchAttributeRules());
+    assertThat(senderCaseDTO.getLaunchNames()).containsExactlyInAnyOrderElementsOf(
+        senderCase.getLaunchNames());
+    assertEquals(senderCaseDTO.getSendCase(), senderCase.getSendCase().getCaseString());
+  }
+
+  @Test
+  void toCaseModel() {
+    final SenderCaseDTO caseDTO = getCaseDTO();
+    final SenderCase senderCase = NotificationConfigConverter.TO_CASE_MODEL.apply(caseDTO);
+
+    assertThat(senderCase.getRecipients()).containsExactlyInAnyOrderElementsOf(
+        caseDTO.getRecipients());
+    assertThat(senderCase.getLaunchNames()).containsExactlyInAnyOrderElementsOf(
+        caseDTO.getLaunchNames());
+    //		assertThat(senderCase.getLaunchAttributes()).containsExactlyInAnyOrderElementsOf(caseDTO.getAttributes());
+    assertEquals(senderCase.getSendCase().getCaseString(), caseDTO.getSendCase());
+    assertEquals(senderCase.isEnabled(), caseDTO.isEnabled());
+  }
+
+  private static Set<SenderCase> getSenderCases() {
+    Set<SenderCase> senderCases = new HashSet<>();
+    senderCases.add(getCase());
+    final LaunchAttributeRule launchAttributeRule = new LaunchAttributeRule();
+    launchAttributeRule.setId(1L);
+    launchAttributeRule.setKey("key");
+    launchAttributeRule.setValue("value");
+    senderCases.add(new SenderCase(Sets.newHashSet("recipent3", "recipient8"),
+        Sets.newHashSet("launch1", "launch5", "launch10"), Sets.newHashSet(launchAttributeRule),
+        SendCase.ALWAYS, true, LogicalOperator.AND
+    ));
+    return senderCases;
+  }
+
+  private static SenderCase getCase() {
+    final LaunchAttributeRule launchAttributeRule = new LaunchAttributeRule();
+    launchAttributeRule.setId(2L);
+    launchAttributeRule.setKey("key1");
+    launchAttributeRule.setValue("value1");
+    return new SenderCase(Sets.newHashSet("recipent1", "recipient2"),
+        Sets.newHashSet("launch1", "launch2", "launch3"), Sets.newHashSet(launchAttributeRule),
+        SendCase.MORE_10, true, LogicalOperator.AND
+    );
+  }
+
+  private static SenderCaseDTO getCaseDTO() {
+    SenderCaseDTO senderCaseDTO = new SenderCaseDTO();
+    senderCaseDTO.setRecipients(Arrays.asList("recipient1", "recipient2"));
+    senderCaseDTO.setLaunchNames(Arrays.asList("launch1", "launch2"));
+    final ItemAttributeResource launchAttribute = new ItemAttributeResource();
+    launchAttribute.setKey("key");
+    launchAttribute.setValue("val");
+    senderCaseDTO.setAttributes(Sets.newHashSet(launchAttribute));
+    senderCaseDTO.setSendCase("always");
+    senderCaseDTO.setEnabled(true);
+    senderCaseDTO.setAttributesOperator(LogicalOperator.AND.getOperator());
+    return senderCaseDTO;
+  }
 
 }
\ No newline at end of file
diff --git a/src/test/java/com/epam/ta/reportportal/ws/converter/converters/PatternTemplateConverterTest.java b/src/test/java/com/epam/ta/reportportal/ws/converter/converters/PatternTemplateConverterTest.java
index f97b2dbb7e..1cd49588c5 100644
--- a/src/test/java/com/epam/ta/reportportal/ws/converter/converters/PatternTemplateConverterTest.java
+++ b/src/test/java/com/epam/ta/reportportal/ws/converter/converters/PatternTemplateConverterTest.java
@@ -20,8 +20,8 @@
 
 import com.epam.ta.reportportal.entity.pattern.PatternTemplate;
 import com.epam.ta.reportportal.entity.pattern.PatternTemplateType;
-import com.epam.ta.reportportal.ws.model.activity.PatternTemplateActivityResource;
-import com.epam.ta.reportportal.ws.model.project.config.pattern.PatternTemplateResource;
+import com.epam.ta.reportportal.model.activity.PatternTemplateActivityResource;
+import com.epam.ta.reportportal.model.project.config.pattern.PatternTemplateResource;
 import org.junit.jupiter.api.Test;
 
 /**
@@ -48,8 +48,8 @@ public void toActivityResourceTest() {
 
     PatternTemplate patternTemplate = get();
 
-    PatternTemplateActivityResource resource = PatternTemplateConverter.TO_ACTIVITY_RESOURCE.apply(
-        patternTemplate);
+    PatternTemplateActivityResource resource =
+        PatternTemplateConverter.TO_ACTIVITY_RESOURCE.apply(patternTemplate);
 
     assertEquals(patternTemplate.getId(), resource.getId());
     assertEquals(patternTemplate.getProjectId(), resource.getProjectId());
diff --git a/src/test/java/com/epam/ta/reportportal/ws/converter/converters/ProjectActivityConverterTest.java b/src/test/java/com/epam/ta/reportportal/ws/converter/converters/ProjectActivityConverterTest.java
index 05a4dfb394..b327307386 100644
--- a/src/test/java/com/epam/ta/reportportal/ws/converter/converters/ProjectActivityConverterTest.java
+++ b/src/test/java/com/epam/ta/reportportal/ws/converter/converters/ProjectActivityConverterTest.java
@@ -22,7 +22,7 @@
 import com.epam.ta.reportportal.entity.attribute.Attribute;
 import com.epam.ta.reportportal.entity.project.Project;
 import com.epam.ta.reportportal.entity.project.ProjectAttribute;
-import com.epam.ta.reportportal.ws.model.activity.ProjectAttributesActivityResource;
+import com.epam.ta.reportportal.model.activity.ProjectAttributesActivityResource;
 import com.google.common.collect.Sets;
 import org.junit.jupiter.api.Test;
 
@@ -34,8 +34,8 @@ class ProjectActivityConverterTest {
   @Test
   void toActivityResource() {
     final Project project = getProject();
-    final ProjectAttributesActivityResource resource = ProjectActivityConverter.TO_ACTIVITY_RESOURCE.apply(
-        project);
+    final ProjectAttributesActivityResource resource =
+        ProjectActivityConverter.TO_ACTIVITY_RESOURCE.apply(project);
 
     assertEquals(resource.getProjectId(), project.getId());
     assertEquals(resource.getProjectName(), project.getName());
@@ -51,8 +51,8 @@ private static Project getProject() {
     final Attribute attribute = new Attribute();
     attribute.setId(2L);
     attribute.setName("attr.lol");
-    final ProjectAttribute projectAttribute = new ProjectAttribute().withProject(project)
-        .withValue("value").withAttribute(attribute);
+    final ProjectAttribute projectAttribute =
+        new ProjectAttribute().withProject(project).withValue("value").withAttribute(attribute);
     project.setProjectAttributes(Sets.newHashSet(projectAttribute));
     return project;
   }
diff --git a/src/test/java/com/epam/ta/reportportal/ws/converter/converters/RestorePasswordBidConverterTest.java b/src/test/java/com/epam/ta/reportportal/ws/converter/converters/RestorePasswordBidConverterTest.java
index 6d4bdd0f36..be482e52aa 100644
--- a/src/test/java/com/epam/ta/reportportal/ws/converter/converters/RestorePasswordBidConverterTest.java
+++ b/src/test/java/com/epam/ta/reportportal/ws/converter/converters/RestorePasswordBidConverterTest.java
@@ -20,7 +20,7 @@
 import static org.junit.jupiter.api.Assertions.assertNotNull;
 
 import com.epam.ta.reportportal.entity.user.RestorePasswordBid;
-import com.epam.ta.reportportal.ws.model.user.RestorePasswordRQ;
+import com.epam.ta.reportportal.model.user.RestorePasswordRQ;
 import org.junit.jupiter.api.Test;
 
 /**
diff --git a/src/test/java/com/epam/ta/reportportal/ws/converter/converters/TestItemConverterTest.java b/src/test/java/com/epam/ta/reportportal/ws/converter/converters/TestItemConverterTest.java
index 3d1a8139c6..a00ac34a87 100644
--- a/src/test/java/com/epam/ta/reportportal/ws/converter/converters/TestItemConverterTest.java
+++ b/src/test/java/com/epam/ta/reportportal/ws/converter/converters/TestItemConverterTest.java
@@ -35,8 +35,8 @@
 import com.epam.ta.reportportal.entity.launch.Launch;
 import com.epam.ta.reportportal.entity.statistics.Statistics;
 import com.epam.ta.reportportal.entity.statistics.StatisticsField;
-import com.epam.ta.reportportal.ws.model.TestItemResource;
-import com.epam.ta.reportportal.ws.model.activity.TestItemActivityResource;
+import com.epam.ta.reportportal.model.TestItemResource;
+import com.epam.ta.reportportal.model.activity.TestItemActivityResource;
 import com.google.common.collect.Sets;
 import java.time.LocalDateTime;
 import java.time.ZoneId;
@@ -52,7 +52,8 @@ class TestItemConverterTest {
   @Test
   void toActivityResourceNullTest() {
     assertThrows(NullPointerException.class,
-        () -> TestItemConverter.TO_ACTIVITY_RESOURCE.apply(null, null));
+        () -> TestItemConverter.TO_ACTIVITY_RESOURCE.apply(null, null)
+    );
   }
 
   @Test
@@ -63,30 +64,30 @@ void toResourceNullTest() {
   @Test
   void toActivityResource() {
     final TestItem item = getItem(true);
-    final TestItemActivityResource activityResource = TestItemConverter.TO_ACTIVITY_RESOURCE.apply(
-        item, 4L);
+    final TestItemActivityResource activityResource =
+        TestItemConverter.TO_ACTIVITY_RESOURCE.apply(item, 4L);
 
     assertEquals(activityResource.getId(), item.getItemId());
     assertEquals(activityResource.getName(), item.getName());
     assertEquals((long) activityResource.getProjectId(), 4L);
     assertEquals(activityResource.getIssueDescription(),
-        item.getItemResults().getIssue().getIssueDescription());
+        item.getItemResults().getIssue().getIssueDescription()
+    );
     assertEquals(activityResource.getIssueTypeLongName(),
-        item.getItemResults().getIssue().getIssueType().getLongName());
+        item.getItemResults().getIssue().getIssueType().getLongName()
+    );
     assertEquals(activityResource.getStatus(), item.getItemResults().getStatus().name());
-    assertEquals(
-        activityResource.getTickets(),
-        item.getItemResults()
-            .getIssue()
-            .getTickets()
-            .stream()
+    assertEquals(activityResource.getTickets(),
+        item.getItemResults().getIssue().getTickets().stream()
             .map(it -> it.getTicketId().concat(":").concat(it.getUrl()))
             .collect(Collectors.joining(", "))
     );
     assertEquals(activityResource.isIgnoreAnalyzer(),
-        item.getItemResults().getIssue().getIgnoreAnalyzer());
+        item.getItemResults().getIssue().getIgnoreAnalyzer()
+    );
     assertEquals(activityResource.isAutoAnalyzed(),
-        item.getItemResults().getIssue().getAutoAnalyzed());
+        item.getItemResults().getIssue().getAutoAnalyzed()
+    );
   }
 
   @Test
@@ -104,29 +105,30 @@ void toResource() {
     assertEquals(resource.getStatus(), item.getItemResults().getStatus().name());
     assertEquals(resource.getType(), item.getType().name());
     assertEquals(resource.getStartTime(),
-        Date.from(item.getStartTime().atZone(ZoneId.of("UTC")).toInstant()));
+        Date.from(item.getStartTime().atZone(ZoneId.of("UTC")).toInstant())
+    );
     assertEquals(resource.getEndTime(),
-        Date.from(item.getItemResults().getEndTime().atZone(ZoneId.of("UTC")).toInstant()));
+        Date.from(item.getItemResults().getEndTime().atZone(ZoneId.of("UTC")).toInstant())
+    );
     assertEquals(resource.getUniqueId(), item.getUniqueId());
-    assertThat(resource.getAttributes()
-        .stream()
-        .map(ItemAttributeConverter.FROM_RESOURCE)
+    assertThat(resource.getAttributes().stream().map(ItemAttributeConverter.FROM_RESOURCE)
         .collect(Collectors.toSet())).containsExactlyElementsOf(item.getAttributes());
-    assertThat(resource.getParameters()
-        .stream()
-        .map(ParametersConverter.TO_MODEL)
+    assertThat(resource.getParameters().stream().map(ParametersConverter.TO_MODEL)
         .collect(Collectors.toSet())).containsExactlyElementsOf(item.getParameters());
     assertThat(resource.getStatisticsResource()).isEqualToComparingFieldByField(
-        StatisticsConverter.TO_RESOURCE.apply(item.getItemResults()
-            .getStatistics()));
+        StatisticsConverter.TO_RESOURCE.apply(item.getItemResults().getStatistics()));
     assertEquals(resource.getIssue().getComment(),
-        item.getItemResults().getIssue().getIssueDescription());
+        item.getItemResults().getIssue().getIssueDescription()
+    );
     assertEquals(resource.getIssue().getAutoAnalyzed(),
-        item.getItemResults().getIssue().getAutoAnalyzed());
+        item.getItemResults().getIssue().getAutoAnalyzed()
+    );
     assertEquals(resource.getIssue().getIssueType(),
-        item.getItemResults().getIssue().getIssueType().getLocator());
+        item.getItemResults().getIssue().getIssueType().getLocator()
+    );
     assertEquals(resource.getIssue().getIgnoreAnalyzer(),
-        item.getItemResults().getIssue().getIgnoreAnalyzer());
+        item.getItemResults().getIssue().getIgnoreAnalyzer()
+    );
   }
 
   @Test
@@ -144,21 +146,18 @@ void toResourceWithoutIssue() {
     assertEquals(resource.getStatus(), item.getItemResults().getStatus().name());
     assertEquals(resource.getType(), item.getType().name());
     assertEquals(resource.getStartTime(),
-        Date.from(item.getStartTime().atZone(ZoneId.of("UTC")).toInstant()));
+        Date.from(item.getStartTime().atZone(ZoneId.of("UTC")).toInstant())
+    );
     assertEquals(resource.getEndTime(),
-        Date.from(item.getItemResults().getEndTime().atZone(ZoneId.of("UTC")).toInstant()));
+        Date.from(item.getItemResults().getEndTime().atZone(ZoneId.of("UTC")).toInstant())
+    );
     assertEquals(resource.getUniqueId(), item.getUniqueId());
-    assertThat(resource.getAttributes()
-        .stream()
-        .map(ItemAttributeConverter.FROM_RESOURCE)
+    assertThat(resource.getAttributes().stream().map(ItemAttributeConverter.FROM_RESOURCE)
         .collect(Collectors.toSet())).containsExactlyElementsOf(item.getAttributes());
-    assertThat(resource.getParameters()
-        .stream()
-        .map(ParametersConverter.TO_MODEL)
+    assertThat(resource.getParameters().stream().map(ParametersConverter.TO_MODEL)
         .collect(Collectors.toSet())).containsExactlyElementsOf(item.getParameters());
     assertThat(resource.getStatisticsResource()).isEqualToComparingFieldByField(
-        StatisticsConverter.TO_RESOURCE.apply(item.getItemResults()
-            .getStatistics()));
+        StatisticsConverter.TO_RESOURCE.apply(item.getItemResults().getStatistics()));
     assertNull(resource.getIssue());
   }
 
@@ -177,7 +176,8 @@ private TestItem getItem(boolean hasIssue) {
     parameter.setValue("value");
     item.setParameters(Sets.newHashSet(parameter));
     item.setAttributes(Sets.newHashSet(new ItemAttribute("key1", "value1", false),
-        new ItemAttribute("key2", "value2", false)));
+        new ItemAttribute("key2", "value2", false)
+    ));
     final Launch launch = new Launch();
     launch.setProjectId(4L);
     launch.setId(2L);
@@ -194,7 +194,8 @@ private TestItem getItem(boolean hasIssue) {
       issue.setIssueId(3L);
       issue.setIssueType(
           new IssueType(new IssueGroup(TestItemIssueGroup.PRODUCT_BUG), "locator", "long name",
-              "SNA", "color"));
+              "SNA", "color"
+          ));
       issue.setIgnoreAnalyzer(false);
       issue.setAutoAnalyzed(false);
       issue.setIssueDescription("issue description");
diff --git a/src/test/java/com/epam/ta/reportportal/ws/converter/converters/UserConverterTest.java b/src/test/java/com/epam/ta/reportportal/ws/converter/converters/UserConverterTest.java
index 459b8ed93b..9cc250ff48 100644
--- a/src/test/java/com/epam/ta/reportportal/ws/converter/converters/UserConverterTest.java
+++ b/src/test/java/com/epam/ta/reportportal/ws/converter/converters/UserConverterTest.java
@@ -27,8 +27,8 @@
 import com.epam.ta.reportportal.entity.user.User;
 import com.epam.ta.reportportal.entity.user.UserRole;
 import com.epam.ta.reportportal.entity.user.UserType;
-import com.epam.ta.reportportal.ws.model.activity.UserActivityResource;
-import com.epam.ta.reportportal.ws.model.user.UserResource;
+import com.epam.ta.reportportal.model.activity.UserActivityResource;
+import com.epam.ta.reportportal.model.user.UserResource;
 import com.google.common.collect.Sets;
 import java.util.HashMap;
 import org.junit.jupiter.api.Test;
@@ -38,63 +38,65 @@
  */
 class UserConverterTest {
 
-	@Test
-	void toResource() {
-		final User user = getUser();
-		final UserResource resource = UserConverter.TO_RESOURCE.apply(user);
+  @Test
+  void toResource() {
+    final User user = getUser();
+    final UserResource resource = UserConverter.TO_RESOURCE.apply(user);
 
-		assertEquals(resource.getEmail(), user.getEmail());
-		assertEquals(resource.getFullName(), user.getFullName());
-		assertEquals(resource.getUserId(), user.getLogin());
-		assertEquals(resource.getUserRole(), user.getRole().name());
-		assertEquals(resource.getAccountType(), user.getUserType().name());
-		assertEquals(resource.getPhotoId(), user.getAttachment());
-		assertThat((HashMap<String, Object>) resource.getMetadata()).containsAllEntriesOf(getMetadata());
-		assertThat(resource.getAssignedProjects()).containsKeys("project1", "project2");
-	}
+    assertEquals(resource.getEmail(), user.getEmail());
+    assertEquals(resource.getFullName(), user.getFullName());
+    assertEquals(resource.getUserId(), user.getLogin());
+    assertEquals(resource.getUserRole(), user.getRole().name());
+    assertEquals(resource.getAccountType(), user.getUserType().name());
+    assertEquals(resource.getPhotoId(), user.getAttachment());
+    assertThat((HashMap<String, Object>) resource.getMetadata()).containsAllEntriesOf(
+        getMetadata());
+    assertThat(resource.getAssignedProjects()).containsKeys("project1", "project2");
+  }
 
-	@Test
-	void toActivityResource() {
-		final User user = getUser();
-		final Long projectId = 2L;
-		final UserActivityResource resource = UserConverter.TO_ACTIVITY_RESOURCE.apply(user, projectId);
+  @Test
+  void toActivityResource() {
+    final User user = getUser();
+    final Long projectId = 2L;
+    final UserActivityResource resource = UserConverter.TO_ACTIVITY_RESOURCE.apply(user, projectId);
 
-		assertEquals(resource.getId(), user.getId());
-		assertEquals(resource.getFullName(), user.getLogin());
-		assertEquals(resource.getDefaultProjectId(), projectId);
-	}
+    assertEquals(resource.getId(), user.getId());
+    assertEquals(resource.getFullName(), user.getLogin());
+    assertEquals(resource.getDefaultProjectId(), projectId);
+  }
 
-	private static User getUser() {
-		final User user = new User();
-		user.setLogin("login");
-		user.setUserType(UserType.INTERNAL);
-		user.setRole(UserRole.USER);
-		user.setAttachment("attachmentId");
-		user.setEmail("example@domain.com");
-		user.setFullName("full name");
-		user.setId(1L);
-		user.setAttachmentThumbnail("thumbnailId");
-		user.setExpired(false);
-		final HashMap<String, Object> metadata = getMetadata();
-		user.setMetadata(new Metadata(metadata));
-		final Project project1 = new Project();
-		project1.setName("project1");
-		project1.setProjectType(ProjectType.INTERNAL);
-		final ProjectUser projectUser1 = new ProjectUser().withProject(project1).withProjectRole(ProjectRole.MEMBER).withUser(user);
-		final Project project2 = new Project();
-		project2.setName("project2");
-		project2.setProjectType(ProjectType.INTERNAL);
-		final ProjectUser projectUser2 = new ProjectUser().withProject(project2)
-				.withProjectRole(ProjectRole.PROJECT_MANAGER)
-				.withUser(user);
-		user.setProjects(Sets.newHashSet(projectUser1, projectUser2));
-		return user;
-	}
+  private static User getUser() {
+    final User user = new User();
+    user.setLogin("login");
+    user.setUserType(UserType.INTERNAL);
+    user.setRole(UserRole.USER);
+    user.setAttachment("attachmentId");
+    user.setEmail("example@domain.com");
+    user.setFullName("full name");
+    user.setId(1L);
+    user.setAttachmentThumbnail("thumbnailId");
+    user.setExpired(false);
+    final HashMap<String, Object> metadata = getMetadata();
+    user.setMetadata(new Metadata(metadata));
+    final Project project1 = new Project();
+    project1.setName("project1");
+    project1.setProjectType(ProjectType.INTERNAL);
+    final ProjectUser projectUser1 =
+        new ProjectUser().withProject(project1).withProjectRole(ProjectRole.MEMBER).withUser(user);
+    final Project project2 = new Project();
+    project2.setName("project2");
+    project2.setProjectType(ProjectType.INTERNAL);
+    final ProjectUser projectUser2 =
+        new ProjectUser().withProject(project2).withProjectRole(ProjectRole.PROJECT_MANAGER)
+            .withUser(user);
+    user.setProjects(Sets.newHashSet(projectUser1, projectUser2));
+    return user;
+  }
 
-	private static HashMap<String, Object> getMetadata() {
-		final HashMap<String, Object> metadata = new HashMap<>();
-		metadata.put("key1", "value1");
-		metadata.put("key2", "value2");
-		return metadata;
-	}
+  private static HashMap<String, Object> getMetadata() {
+    final HashMap<String, Object> metadata = new HashMap<>();
+    metadata.put("key1", "value1");
+    metadata.put("key2", "value2");
+    return metadata;
+  }
 }
\ No newline at end of file
diff --git a/src/test/java/com/epam/ta/reportportal/ws/converter/converters/UserCreationBidConverterTest.java b/src/test/java/com/epam/ta/reportportal/ws/converter/converters/UserCreationBidConverterTest.java
index b1b0935fdc..797ad0f883 100644
--- a/src/test/java/com/epam/ta/reportportal/ws/converter/converters/UserCreationBidConverterTest.java
+++ b/src/test/java/com/epam/ta/reportportal/ws/converter/converters/UserCreationBidConverterTest.java
@@ -21,7 +21,7 @@
 
 import com.epam.ta.reportportal.entity.project.Project;
 import com.epam.ta.reportportal.entity.user.UserCreationBid;
-import com.epam.ta.reportportal.ws.model.user.CreateUserRQ;
+import com.epam.ta.reportportal.model.user.CreateUserRQ;
 import java.time.LocalDateTime;
 import java.time.ZoneId;
 import java.util.Date;
diff --git a/src/test/java/com/epam/ta/reportportal/ws/converter/converters/WidgetConverterTest.java b/src/test/java/com/epam/ta/reportportal/ws/converter/converters/WidgetConverterTest.java
index 2804bb5490..419224a044 100644
--- a/src/test/java/com/epam/ta/reportportal/ws/converter/converters/WidgetConverterTest.java
+++ b/src/test/java/com/epam/ta/reportportal/ws/converter/converters/WidgetConverterTest.java
@@ -16,6 +16,11 @@
 
 package com.epam.ta.reportportal.ws.converter.converters;
 
+import static com.epam.ta.reportportal.commons.querygen.constant.GeneralCriteriaConstant.CRITERIA_LAUNCH_ID;
+import static org.assertj.core.api.Java6Assertions.assertThat;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
 import com.epam.ta.reportportal.commons.querygen.FilterCondition;
 import com.epam.ta.reportportal.entity.dashboard.Dashboard;
 import com.epam.ta.reportportal.entity.dashboard.DashboardWidget;
@@ -26,146 +31,150 @@
 import com.epam.ta.reportportal.entity.project.Project;
 import com.epam.ta.reportportal.entity.widget.Widget;
 import com.epam.ta.reportportal.entity.widget.WidgetOptions;
-import com.epam.ta.reportportal.ws.model.Position;
-import com.epam.ta.reportportal.ws.model.Size;
-import com.epam.ta.reportportal.ws.model.activity.WidgetActivityResource;
-import com.epam.ta.reportportal.ws.model.dashboard.DashboardResource;
-import com.epam.ta.reportportal.ws.model.widget.WidgetResource;
+import com.epam.ta.reportportal.model.Position;
+import com.epam.ta.reportportal.model.Size;
+import com.epam.ta.reportportal.model.activity.WidgetActivityResource;
+import com.epam.ta.reportportal.model.dashboard.DashboardResource;
+import com.epam.ta.reportportal.model.widget.WidgetResource;
 import com.google.common.collect.Sets;
-import org.junit.jupiter.api.Test;
-import org.springframework.data.domain.Sort;
-
 import java.util.HashMap;
 import java.util.Map;
-
-import static com.epam.ta.reportportal.commons.querygen.constant.GeneralCriteriaConstant.CRITERIA_LAUNCH_ID;
-import static org.assertj.core.api.Java6Assertions.assertThat;
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertTrue;
+import org.junit.jupiter.api.Test;
+import org.springframework.data.domain.Sort;
 
 /**
  * @author <a href="mailto:ihar_kahadouski@epam.com">Ihar Kahadouski</a>
  */
 class WidgetConverterTest {
 
-	@Test
-	void toWidgetResource() {
-		final Widget widget = getWidget();
-		final WidgetResource resource = WidgetConverter.TO_WIDGET_RESOURCE.apply(widget);
-		assertEquals(resource.getName(), widget.getName());
-		assertEquals(resource.getWidgetId(), widget.getId());
-		assertEquals(resource.getWidgetType(), widget.getWidgetType());
-		assertEquals(resource.getDescription(), widget.getDescription());
-		assertEquals(resource.getOwner(), widget.getOwner());
-		assertEquals(resource.getContentParameters().getItemsCount(), widget.getItemsCount());
-		assertThat(resource.getContentParameters().getContentFields()).containsExactlyElementsOf(widget.getContentFields());
-		assertThat(resource.getContentParameters().getWidgetOptions()).containsAllEntriesOf(widget.getWidgetOptions().getOptions());
-		assertThat(resource.getAppliedFilters()).hasSize(1);
-	}
-
-	@Test
-	void toActivityResource() {
-		final Widget widget = getWidget();
-		final WidgetActivityResource resource = WidgetConverter.TO_ACTIVITY_RESOURCE.apply(widget);
-		assertEquals(resource.getId(), widget.getId());
-		assertEquals(resource.getName(), widget.getName());
-		assertEquals(resource.getProjectId(), widget.getProject().getId());
-		assertEquals(resource.getDescription(), widget.getDescription());
-		assertEquals(resource.getItemsCount(), widget.getItemsCount());
-		assertEquals(resource.getContentFields(), widget.getContentFields());
-		assertThat(resource.getWidgetOptions()).containsAllEntriesOf(widget.getWidgetOptions().getOptions());
-	}
-
-	@Test
-	void toObjectModel() {
-		final DashboardWidget dashboardWidget = getDashboardWIdget();
-		final DashboardResource.WidgetObjectModel widgetObjectModel = WidgetConverter.TO_OBJECT_MODEL.apply(dashboardWidget);
-
-		assertEquals(widgetObjectModel.getWidgetId(), dashboardWidget.getId().getWidgetId());
-		assertEquals(widgetObjectModel.getWidgetPosition().getX(), dashboardWidget.getPositionX());
-		assertEquals(widgetObjectModel.getWidgetPosition().getY(), dashboardWidget.getPositionY());
-		assertEquals(widgetObjectModel.getWidgetSize().getHeight(), dashboardWidget.getHeight());
-		assertEquals(widgetObjectModel.getWidgetSize().getWidth(), dashboardWidget.getWidth());
-		assertEquals(dashboardWidget.getWidget().getWidgetOptions().getOptions(), widgetObjectModel.getWidgetOptions());
-	}
-
-	@Test
-	void toDashboardWidget() {
-		final DashboardResource.WidgetObjectModel widgetObjectModel = getWidgetObjectModel();
-		final Dashboard dashboard = new Dashboard();
-		dashboard.setId(2L);
-		dashboard.setName("name");
-		final Widget widget = new Widget();
-		widget.setName("name");
-		widget.setOwner("default");
-
-		final DashboardWidget dashboardWidget = WidgetConverter.toDashboardWidget(widgetObjectModel, dashboard, widget, true);
-
-		assertThat(dashboardWidget.getDashboard()).isEqualToComparingFieldByField(dashboard);
-		assertThat(dashboardWidget.getWidget()).isEqualToComparingFieldByField(widget);
-		assertEquals(dashboardWidget.getHeight(), widgetObjectModel.getWidgetSize().getHeight());
-		assertEquals(dashboardWidget.getWidth(), widgetObjectModel.getWidgetSize().getWidth());
-		assertEquals(dashboardWidget.getPositionX(), widgetObjectModel.getWidgetPosition().getX());
-		assertEquals(dashboardWidget.getPositionY(), widgetObjectModel.getWidgetPosition().getY());
-		assertEquals(dashboardWidget.getWidgetName(), widget.getName());
-		assertEquals("default", dashboardWidget.getWidgetOwner());
-		assertTrue(dashboardWidget.isCreatedOn());
-	}
-
-	private Widget getWidget() {
-		final Widget widget = new Widget();
-		widget.setDescription("description");
-		widget.setItemsCount(10);
-		widget.setWidgetType("widgetType");
-		widget.setName("name");
-		final Project project = new Project();
-		project.setId(3L);
-		widget.setProject(project);
-		final WidgetOptions widgetOptions = new WidgetOptions();
-		final HashMap<String, Object> options = new HashMap<>();
-		options.put("option1", "val1");
-		options.put("option2", "val2");
-		widgetOptions.setOptions(options);
-		widget.setWidgetOptions(widgetOptions);
-		final UserFilter filter = new UserFilter();
-		filter.setId(1L);
-		filter.setOwner("owner");
-		filter.setName("name");
-		filter.setTargetClass(ObjectType.Launch);
-		filter.setDescription("filter description");
-		filter.setFilterCondition(Sets.newHashSet(FilterCondition.builder().eq(CRITERIA_LAUNCH_ID, "100").build()));
-		widget.setFilters(Sets.newHashSet(filter));
-		final FilterSort filterSort = new FilterSort();
-		filterSort.setField("name");
-		filterSort.setDirection(Sort.Direction.ASC);
-		filterSort.setId(2L);
-		filter.setFilterSorts(Sets.newHashSet(filterSort));
-		return widget;
-	}
-
-	private static DashboardWidget getDashboardWIdget() {
-		final DashboardWidget dashboardWidget = new DashboardWidget();
-		final Widget widget = new Widget();
-		widget.setId(1L);
-		widget.setWidgetOptions(new WidgetOptions(Map.of("hello", "world")));
-		dashboardWidget.setWidget(widget);
-		final Dashboard dashboard = new Dashboard();
-		dashboard.setId(2L);
-		dashboardWidget.setId(new DashboardWidgetId(dashboard.getId(), widget.getId()));
-		dashboardWidget.setDashboard(dashboard);
-		dashboardWidget.setPositionX(2);
-		dashboardWidget.setPositionY(4);
-		dashboardWidget.setHeight(5);
-		dashboardWidget.setWidth(6);
-		return dashboardWidget;
-	}
-
-	private static DashboardResource.WidgetObjectModel getWidgetObjectModel() {
-		final DashboardResource.WidgetObjectModel widgetObjectModel = new DashboardResource.WidgetObjectModel();
-		widgetObjectModel.setWidgetId(1L);
-		widgetObjectModel.setWidgetPosition(new Position(3, 5));
-		widgetObjectModel.setWidgetSize(new Size(4, 8));
-		return widgetObjectModel;
-	}
+  @Test
+  void toWidgetResource() {
+    final Widget widget = getWidget();
+    final WidgetResource resource = WidgetConverter.TO_WIDGET_RESOURCE.apply(widget);
+    assertEquals(resource.getName(), widget.getName());
+    assertEquals(resource.getWidgetId(), widget.getId());
+    assertEquals(resource.getWidgetType(), widget.getWidgetType());
+    assertEquals(resource.getDescription(), widget.getDescription());
+    assertEquals(resource.getOwner(), widget.getOwner());
+    assertEquals(resource.getContentParameters().getItemsCount(), widget.getItemsCount());
+    assertThat(resource.getContentParameters().getContentFields()).containsExactlyElementsOf(
+        widget.getContentFields());
+    assertThat(resource.getContentParameters().getWidgetOptions()).containsAllEntriesOf(
+        widget.getWidgetOptions().getOptions());
+    assertThat(resource.getAppliedFilters()).hasSize(1);
+  }
+
+  @Test
+  void toActivityResource() {
+    final Widget widget = getWidget();
+    final WidgetActivityResource resource = WidgetConverter.TO_ACTIVITY_RESOURCE.apply(widget);
+    assertEquals(resource.getId(), widget.getId());
+    assertEquals(resource.getName(), widget.getName());
+    assertEquals(resource.getProjectId(), widget.getProject().getId());
+    assertEquals(resource.getDescription(), widget.getDescription());
+    assertEquals(resource.getItemsCount(), widget.getItemsCount());
+    assertEquals(resource.getContentFields(), widget.getContentFields());
+    assertThat(resource.getWidgetOptions()).containsAllEntriesOf(
+        widget.getWidgetOptions().getOptions());
+  }
+
+  @Test
+  void toObjectModel() {
+    final DashboardWidget dashboardWidget = getDashboardWIdget();
+    final DashboardResource.WidgetObjectModel widgetObjectModel =
+        WidgetConverter.TO_OBJECT_MODEL.apply(dashboardWidget);
+
+    assertEquals(widgetObjectModel.getWidgetId(), dashboardWidget.getId().getWidgetId());
+    assertEquals(widgetObjectModel.getWidgetPosition().getX(), dashboardWidget.getPositionX());
+    assertEquals(widgetObjectModel.getWidgetPosition().getY(), dashboardWidget.getPositionY());
+    assertEquals(widgetObjectModel.getWidgetSize().getHeight(), dashboardWidget.getHeight());
+    assertEquals(widgetObjectModel.getWidgetSize().getWidth(), dashboardWidget.getWidth());
+    assertEquals(
+        dashboardWidget.getWidget().getWidgetOptions().getOptions(),
+        widgetObjectModel.getWidgetOptions()
+    );
+  }
+
+  @Test
+  void toDashboardWidget() {
+    final DashboardResource.WidgetObjectModel widgetObjectModel = getWidgetObjectModel();
+    final Dashboard dashboard = new Dashboard();
+    dashboard.setId(2L);
+    dashboard.setName("name");
+    final Widget widget = new Widget();
+    widget.setName("name");
+    widget.setOwner("default");
+
+    final DashboardWidget dashboardWidget =
+        WidgetConverter.toDashboardWidget(widgetObjectModel, dashboard, widget, true);
+
+    assertThat(dashboardWidget.getDashboard()).isEqualToComparingFieldByField(dashboard);
+    assertThat(dashboardWidget.getWidget()).isEqualToComparingFieldByField(widget);
+    assertEquals(dashboardWidget.getHeight(), widgetObjectModel.getWidgetSize().getHeight());
+    assertEquals(dashboardWidget.getWidth(), widgetObjectModel.getWidgetSize().getWidth());
+    assertEquals(dashboardWidget.getPositionX(), widgetObjectModel.getWidgetPosition().getX());
+    assertEquals(dashboardWidget.getPositionY(), widgetObjectModel.getWidgetPosition().getY());
+    assertEquals(dashboardWidget.getWidgetName(), widget.getName());
+    assertEquals("default", dashboardWidget.getWidgetOwner());
+    assertTrue(dashboardWidget.isCreatedOn());
+  }
+
+  private Widget getWidget() {
+    final Widget widget = new Widget();
+    widget.setDescription("description");
+    widget.setItemsCount(10);
+    widget.setWidgetType("widgetType");
+    widget.setName("name");
+    final Project project = new Project();
+    project.setId(3L);
+    widget.setProject(project);
+    final WidgetOptions widgetOptions = new WidgetOptions();
+    final HashMap<String, Object> options = new HashMap<>();
+    options.put("option1", "val1");
+    options.put("option2", "val2");
+    widgetOptions.setOptions(options);
+    widget.setWidgetOptions(widgetOptions);
+    final UserFilter filter = new UserFilter();
+    filter.setId(1L);
+    filter.setOwner("owner");
+    filter.setName("name");
+    filter.setTargetClass(ObjectType.Launch);
+    filter.setDescription("filter description");
+    filter.setFilterCondition(
+        Sets.newHashSet(FilterCondition.builder().eq(CRITERIA_LAUNCH_ID, "100").build()));
+    widget.setFilters(Sets.newHashSet(filter));
+    final FilterSort filterSort = new FilterSort();
+    filterSort.setField("name");
+    filterSort.setDirection(Sort.Direction.ASC);
+    filterSort.setId(2L);
+    filter.setFilterSorts(Sets.newHashSet(filterSort));
+    return widget;
+  }
+
+  private static DashboardWidget getDashboardWIdget() {
+    final DashboardWidget dashboardWidget = new DashboardWidget();
+    final Widget widget = new Widget();
+    widget.setId(1L);
+    widget.setWidgetOptions(new WidgetOptions(Map.of("hello", "world")));
+    dashboardWidget.setWidget(widget);
+    final Dashboard dashboard = new Dashboard();
+    dashboard.setId(2L);
+    dashboardWidget.setId(new DashboardWidgetId(dashboard.getId(), widget.getId()));
+    dashboardWidget.setDashboard(dashboard);
+    dashboardWidget.setPositionX(2);
+    dashboardWidget.setPositionY(4);
+    dashboardWidget.setHeight(5);
+    dashboardWidget.setWidth(6);
+    return dashboardWidget;
+  }
+
+  private static DashboardResource.WidgetObjectModel getWidgetObjectModel() {
+    final DashboardResource.WidgetObjectModel widgetObjectModel =
+        new DashboardResource.WidgetObjectModel();
+    widgetObjectModel.setWidgetId(1L);
+    widgetObjectModel.setWidgetPosition(new Position(3, 5));
+    widgetObjectModel.setWidgetSize(new Size(4, 8));
+    return widgetObjectModel;
+  }
 
 }
\ No newline at end of file
diff --git a/src/test/java/com/epam/ta/reportportal/ws/validation/JaskonRequiredPropertiesValidatorTest.java b/src/test/java/com/epam/ta/reportportal/ws/validation/JaskonRequiredPropertiesValidatorTest.java
index 2d5b6e21c4..8959e8c6fa 100644
--- a/src/test/java/com/epam/ta/reportportal/ws/validation/JaskonRequiredPropertiesValidatorTest.java
+++ b/src/test/java/com/epam/ta/reportportal/ws/validation/JaskonRequiredPropertiesValidatorTest.java
@@ -21,9 +21,9 @@
 import static org.hamcrest.Matchers.not;
 import static org.hamcrest.Matchers.nullValue;
 
+import com.epam.ta.reportportal.model.issue.IssueDefinition;
 import com.epam.ta.reportportal.ws.model.FinishTestItemRQ;
 import com.epam.ta.reportportal.ws.model.issue.Issue;
-import com.epam.ta.reportportal.ws.model.issue.IssueDefinition;
 import com.epam.ta.reportportal.ws.model.launch.StartLaunchRQ;
 import java.util.Calendar;
 import java.util.Collections;
diff --git a/src/test/java/com/epam/ta/reportportal/ws/validation/PageTest.java b/src/test/java/com/epam/ta/reportportal/ws/validation/PageTest.java
new file mode 100644
index 0000000000..4219ccc390
--- /dev/null
+++ b/src/test/java/com/epam/ta/reportportal/ws/validation/PageTest.java
@@ -0,0 +1,47 @@
+package com.epam.ta.reportportal.ws.validation;
+
+import com.epam.ta.reportportal.model.Page;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.*;
+
+/**
+ * Tests for {@link Page.PageMetadata}
+ * Initially grabbed from Spring's <a href="https://github.com/spring-projects/spring-hateoas/blob/642b6736764068ffeee38379629db5fc15cf927d/src/test/java/org/springframework/hateoas/PagedResourcesUnitTest.java">PagedResourcesUnitTest.java</a>
+ *
+ * @author Andrei Varabyeu
+ */
+public class PageTest {
+
+    private static final Page.PageMetadata METADATA = new Page.PageMetadata(10, 1, 200);
+
+    @Test
+    public void preventsNegativePageSize() {
+        assertThrows(IllegalArgumentException.class, () -> new Page.PageMetadata(-1, 0, 0));
+    }
+
+    @Test
+    public void preventsNegativePageNumber() {
+        assertThrows(IllegalArgumentException.class, () -> new Page.PageMetadata(0, -1, 0));
+    }
+
+    @Test
+    public void preventsNegativeTotalElements() {
+        assertThrows(IllegalArgumentException.class, () -> new Page.PageMetadata(0, 0, -1));
+    }
+
+    @Test
+    public void preventsNegativeTotalPages() {
+        assertThrows(IllegalArgumentException.class, () -> new Page.PageMetadata(0, 0, 0, -1));
+    }
+
+    @Test
+    public void allowsOneIndexedPages() {
+        assertDoesNotThrow(() -> new Page.PageMetadata(10, 1, 0));
+    }
+
+    @Test
+    public void calculatesTotalPagesCorrectly() {
+        assertEquals(4L, new Page.PageMetadata(5, 0, 16).getTotalPages());
+    }
+}
\ No newline at end of file
diff --git a/src/test/java/com/epam/ta/reportportal/ws/validation/TicketsValidationTest.java b/src/test/java/com/epam/ta/reportportal/ws/validation/TicketsValidationTest.java
new file mode 100644
index 0000000000..b3a0da045f
--- /dev/null
+++ b/src/test/java/com/epam/ta/reportportal/ws/validation/TicketsValidationTest.java
@@ -0,0 +1,128 @@
+package com.epam.ta.reportportal.ws.validation;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+import com.epam.ta.reportportal.model.item.LinkExternalIssueRQ;
+import com.epam.ta.reportportal.ws.model.FinishTestItemRQ;
+import com.epam.ta.reportportal.ws.model.issue.Issue;
+import com.google.common.collect.Lists;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.HashSet;
+import java.util.Set;
+import javax.validation.ConstraintViolation;
+import javax.validation.Validation;
+import javax.validation.Validator;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+
+/**
+ * @author <a href="mailto:pavel_bortnik@epam.com">Pavel Bortnik</a>
+ */
+public class TicketsValidationTest {
+
+  private static Validator validator;
+
+  @BeforeAll
+  public static void init() {
+    validator = Validation.buildDefaultValidatorFactory().getValidator();
+  }
+
+  @Test
+  public void finishIncorrectTicket() {
+    FinishTestItemRQ finishTestItem = getFinishTestItem();
+
+    Issue issue = new Issue();
+    issue.setIssueType("ti001");
+
+    Set<Issue.ExternalSystemIssue> tickets = new HashSet<>();
+    tickets.add(new Issue.ExternalSystemIssue());
+    issue.setExternalSystemIssues(tickets);
+
+    finishTestItem.setIssue(issue);
+
+    Set<ConstraintViolation<FinishTestItemRQ>> validate = validator.validate(finishTestItem);
+
+    assertEquals(validate.size(), 4);
+    validate.forEach(it -> assertEquals(it.getMessage(), "must not be blank"));
+  }
+
+  @Test
+  public void finishWithCorrectTicket() {
+    FinishTestItemRQ finishTestItem = getFinishTestItem();
+
+    Issue issue = new Issue();
+    issue.setIssueType("ti001");
+
+    Set<Issue.ExternalSystemIssue> tickets = new HashSet<>();
+    Issue.ExternalSystemIssue ticket = new Issue.ExternalSystemIssue();
+    ticket.setTicketId("1234");
+    ticket.setBtsUrl("btsUrl");
+    ticket.setBtsProject("btsProject");
+    ticket.setUrl("btsProject");
+    tickets.add(ticket);
+    issue.setExternalSystemIssues(tickets);
+
+    finishTestItem.setIssue(issue);
+
+    Set<ConstraintViolation<FinishTestItemRQ>> validate = validator.validate(finishTestItem);
+
+    assertTrue(validate.isEmpty());
+  }
+
+  @Test
+  public void linkEmptyCollections() {
+    final LinkExternalIssueRQ linkExternalIssueRQ = new LinkExternalIssueRQ();
+    linkExternalIssueRQ.setTestItemIds(new ArrayList<>());
+    linkExternalIssueRQ.setIssues(new ArrayList<>());
+    Set<ConstraintViolation<LinkExternalIssueRQ>> validate =
+        validator.validate(linkExternalIssueRQ);
+
+    assertEquals(validate.size(), 2);
+    validate.forEach(it -> assertEquals(it.getMessage(), "must not be empty"));
+  }
+
+  @Test
+  public void linkIncorrectTicket() {
+    LinkExternalIssueRQ linkExternalIssueRQ = new LinkExternalIssueRQ();
+    linkExternalIssueRQ.setTestItemIds(Lists.newArrayList(1L));
+
+    Issue.ExternalSystemIssue ticket = new Issue.ExternalSystemIssue();
+    linkExternalIssueRQ.setIssues(Lists.newArrayList(ticket));
+
+    Set<ConstraintViolation<LinkExternalIssueRQ>> validate =
+        validator.validate(linkExternalIssueRQ);
+
+    System.out.println();
+
+    assertEquals(validate.size(), 4);
+    validate.forEach(it -> assertEquals(it.getMessage(), "must not be blank"));
+  }
+
+  @Test
+  public void linkWithCorrectTicket() {
+    LinkExternalIssueRQ linkExternalIssueRQ = new LinkExternalIssueRQ();
+    linkExternalIssueRQ.setTestItemIds(Lists.newArrayList(1L));
+
+    Issue.ExternalSystemIssue ticket = new Issue.ExternalSystemIssue();
+    ticket.setTicketId("1234");
+    ticket.setBtsUrl("btsUrl");
+    ticket.setBtsProject("btsProject");
+    ticket.setUrl("btsProject");
+    linkExternalIssueRQ.setIssues(Lists.newArrayList(ticket));
+
+    Set<ConstraintViolation<LinkExternalIssueRQ>> validate =
+        validator.validate(linkExternalIssueRQ);
+
+    assertTrue(validate.isEmpty());
+  }
+
+  private FinishTestItemRQ getFinishTestItem() {
+    FinishTestItemRQ finishTestItemRQ = new FinishTestItemRQ();
+    finishTestItemRQ.setStatus("PASSED");
+    finishTestItemRQ.setEndTime(new Date());
+    return finishTestItemRQ;
+  }
+
+}
diff --git a/src/test/java/com/epam/ta/reportportal/ws/validation/WidgetRqValidatorTest.java b/src/test/java/com/epam/ta/reportportal/ws/validation/WidgetRqValidatorTest.java
new file mode 100644
index 0000000000..0e7132f779
--- /dev/null
+++ b/src/test/java/com/epam/ta/reportportal/ws/validation/WidgetRqValidatorTest.java
@@ -0,0 +1,76 @@
+package com.epam.ta.reportportal.ws.validation;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+import com.epam.ta.reportportal.model.widget.ContentParameters;
+import com.epam.ta.reportportal.model.widget.MaterializedWidgetType;
+import com.epam.ta.reportportal.model.widget.WidgetRQ;
+import com.epam.ta.reportportal.ws.model.ValidationConstraints;
+import java.util.Collections;
+import java.util.Set;
+import javax.validation.ConstraintViolation;
+import javax.validation.Validation;
+import javax.validation.Validator;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+
+/**
+ * @author <a href="mailto:pavel_bortnik@epam.com">Pavel Bortnik</a>
+ */
+public class WidgetRqValidatorTest {
+
+  private static Validator validator;
+
+  @BeforeAll
+  public static void init() {
+    validator = Validation.buildDefaultValidatorFactory().getValidator();
+  }
+
+  @Test
+  public void validWidgetRQ() {
+    WidgetRQ widgetRQ = basicWidgetRq();
+    final Set<ConstraintViolation<WidgetRQ>> validate = validator.validate(widgetRQ);
+    assertTrue(validate.isEmpty());
+  }
+
+  @Test
+  public void invalidLimitWidgetRQ() {
+    WidgetRQ widgetRQ = basicWidgetRq();
+    widgetRQ.getContentParameters().setItemsCount(601);
+    final Set<ConstraintViolation<WidgetRQ>> validate = validator.validate(widgetRQ);
+    assertEquals(1, validate.size());
+    assertEquals(
+        "Widget item limit size must be between " + ValidationConstraints.MIN_WIDGET_LIMIT + " and "
+            + ValidationConstraints.MAX_WIDGET_LIMIT,
+        validate.stream().findFirst().get().getMessage()
+    );
+  }
+
+  @Test
+  public void validLimitMaterializedView() {
+    WidgetRQ widgetRQ = basicWidgetRq();
+    widgetRQ.setWidgetType(MaterializedWidgetType.COMPONENT_HEALTH_CHECK_TABLE.getType());
+    widgetRQ.getContentParameters().setItemsCount(601);
+    Set<ConstraintViolation<WidgetRQ>> validate = validator.validate(widgetRQ);
+    assertTrue(validate.isEmpty());
+  }
+
+  private WidgetRQ basicWidgetRq() {
+    WidgetRQ widgetRQ = new WidgetRQ();
+    widgetRQ.setName("testWidget");
+    widgetRQ.setWidgetType("componentHealthCheck");
+    widgetRQ.setFilterIds(Collections.emptyList());
+    widgetRQ.setDescription("testDescription");
+
+    ContentParameters contentParameters = new ContentParameters();
+    contentParameters.setContentFields(Collections.emptyList());
+    contentParameters.setItemsCount(100);
+    contentParameters.setWidgetOptions(Collections.emptyMap());
+
+    widgetRQ.setContentParameters(contentParameters);
+
+    return widgetRQ;
+  }
+
+}

From 8a05252acf73c4cc6d5d6dd0938552ecae4416fe Mon Sep 17 00:00:00 2001
From: Ivan Kustau <86599591+IvanKustau@users.noreply.github.com>
Date: Thu, 1 Feb 2024 11:02:04 +0300
Subject: [PATCH 12/24] EPMRPP-88831 || Add starttime for test suite (#1920)

---
 .../core/imprt/impl/junit/XunitImportHandler.java         | 8 +++++++-
 .../core/imprt/impl/junit/XunitImportHandlerTest.java     | 2 ++
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/src/main/java/com/epam/ta/reportportal/core/imprt/impl/junit/XunitImportHandler.java b/src/main/java/com/epam/ta/reportportal/core/imprt/impl/junit/XunitImportHandler.java
index 441878fd08..db64665f31 100644
--- a/src/main/java/com/epam/ta/reportportal/core/imprt/impl/junit/XunitImportHandler.java
+++ b/src/main/java/com/epam/ta/reportportal/core/imprt/impl/junit/XunitImportHandler.java
@@ -115,6 +115,7 @@ public void startElement(String uri, String localName, String qName, Attributes
       case TESTSUITE:
         if (itemUuids.isEmpty()) {
           startRootItem(attributes.getValue(XunitReportTag.ATTR_NAME.getValue()),
+              attributes.getValue(XunitReportTag.START_TIME.getValue()),
               attributes.getValue(XunitReportTag.TIMESTAMP.getValue()),
               attributes.getValue(XunitReportTag.ATTR_TIME.getValue())
           );
@@ -186,12 +187,17 @@ public void characters(char[] ch, int start, int length) {
     }
   }
 
-  private void startRootItem(String name, String timestamp, String duration) {
+  private void startRootItem(String name, String startTime, String timestamp, String duration) {
     if (null != timestamp) {
       startItemTime = parseTimeStamp(timestamp);
       if (startSuiteTime.isAfter(startItemTime)) {
         startSuiteTime = LocalDateTime.of(startItemTime.toLocalDate(), startItemTime.toLocalTime());
       }
+    } else if (null != startTime) {
+      startItemTime = parseTimeStamp(startTime);
+      if (startSuiteTime.isAfter(startItemTime)) {
+        startSuiteTime = LocalDateTime.of(startItemTime.toLocalDate(), startItemTime.toLocalTime());
+      }
     } else {
       startItemTime = LocalDateTime.now();
       startSuiteTime = LocalDateTime.now();
diff --git a/src/test/java/com/epam/ta/reportportal/core/imprt/impl/junit/XunitImportHandlerTest.java b/src/test/java/com/epam/ta/reportportal/core/imprt/impl/junit/XunitImportHandlerTest.java
index 522fc7eefd..994a21c599 100644
--- a/src/test/java/com/epam/ta/reportportal/core/imprt/impl/junit/XunitImportHandlerTest.java
+++ b/src/test/java/com/epam/ta/reportportal/core/imprt/impl/junit/XunitImportHandlerTest.java
@@ -99,6 +99,7 @@ public void whenStartElement_andQnameIsTestSuite_andItemUuidsAreEmpty_andStartTi
     Attributes attributes = mock(Attributes.class);
     when(attributes.getValue(XunitReportTag.ATTR_NAME.getValue())).thenReturn(ATTR_NAME);
     when(attributes.getValue(XunitReportTag.TIMESTAMP.getValue())).thenReturn(TIMESTAMP);
+    when(attributes.getValue(XunitReportTag.START_TIME.getValue())).thenReturn(TIMESTAMP);
 
     LocalDateTime startSuiteTime =
         LocalDateTime.ofInstant(Instant.ofEpochMilli(Long.parseLong(suiteTimestamp)),
@@ -136,6 +137,7 @@ public void whenStartElement_andQnameIsTestSuite_andItemUuidsAreEmpty_andStartTi
     Attributes attributes = mock(Attributes.class);
     when(attributes.getValue(XunitReportTag.ATTR_NAME.getValue())).thenReturn(ATTR_NAME);
     when(attributes.getValue(XunitReportTag.TIMESTAMP.getValue())).thenReturn(ISO_DATE);
+    when(attributes.getValue(XunitReportTag.START_TIME.getValue())).thenReturn(ISO_DATE);
 
     DateTimeFormatter formatter =
         new DateTimeFormatterBuilder().appendOptional(DateTimeFormatter.RFC_1123_DATE_TIME)

From 50f0733ccbfeed47e74978770e3e708deb0d16f9 Mon Sep 17 00:00:00 2001
From: Andrei Piankouski <andrei_piankouski@epam.com>
Date: Mon, 5 Feb 2024 13:22:16 +0300
Subject: [PATCH 13/24] Update models

---
 build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.gradle b/build.gradle
index cbdacc8a27..693542e907 100644
--- a/build.gradle
+++ b/build.gradle
@@ -74,7 +74,7 @@ dependencies {
         implementation 'com.github.reportportal:commons-events:e337f8b7be'
         implementation 'com.github.reportportal:commons-dao:458b67ab61'
         implementation 'com.github.reportportal:commons-rules:42d4dd5634'
-        implementation 'com.github.reportportal:commons-model:5739c3c347'
+        implementation 'com.github.reportportal:commons-model:c800793'
         implementation 'com.github.reportportal:commons:07566b8e'
         implementation 'com.github.reportportal:commons-fonts:d6e62dd'
         implementation 'com.github.reportportal:plugin-api:0ccfed880c'

From 72877af3cc22cedfc2b8bf3df53b8ea81be837d2 Mon Sep 17 00:00:00 2001
From: Andrei Piankouski <andrei_piankouski@epam.com>
Date: Mon, 12 Feb 2024 15:52:55 +0300
Subject: [PATCH 14/24] EPMRPP-82701 || Update Search configs and naming

---
 build.gradle                                              | 2 +-
 docker-compose.yml                                        | 8 ++++----
 .../epam/ta/reportportal/core/log/ElasticLogService.java  | 2 +-
 src/main/resources/application-elastic.yaml               | 2 +-
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/build.gradle b/build.gradle
index 693542e907..84c4a26131 100644
--- a/build.gradle
+++ b/build.gradle
@@ -72,7 +72,7 @@ dependencies {
         implementation 'com.epam.reportportal:plugin-api'
     } else {
         implementation 'com.github.reportportal:commons-events:e337f8b7be'
-        implementation 'com.github.reportportal:commons-dao:458b67ab61'
+        implementation 'com.github.reportportal:commons-dao:b299f80'
         implementation 'com.github.reportportal:commons-rules:42d4dd5634'
         implementation 'com.github.reportportal:commons-model:c800793'
         implementation 'com.github.reportportal:commons:07566b8e'
diff --git a/docker-compose.yml b/docker-compose.yml
index ee9e4e2b8d..e23d9c8c6f 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -24,11 +24,11 @@ services:
     ports:
       - "5432:5432"
 
-  elastic:
-    image: docker.elastic.co/elasticsearch/elasticsearch-oss:7.3.0
+  opensearch:
+    image: opensearchproject/opensearch:2.11.0
     restart: always
     volumes:
-      - elastic:/usr/share/elasticsearch/data
+      - opensearch:/usr/share/opensearch/data
     environment:
       - "bootstrap.memory_lock=true"
       - "discovery.type=single-node"
@@ -77,5 +77,5 @@ services:
 
 volumes:
   reportportal-database:
-  elastic:
+  opensearch:
   minio:
\ No newline at end of file
diff --git a/src/main/java/com/epam/ta/reportportal/core/log/ElasticLogService.java b/src/main/java/com/epam/ta/reportportal/core/log/ElasticLogService.java
index c836c6d521..afa2e92f3a 100644
--- a/src/main/java/com/epam/ta/reportportal/core/log/ElasticLogService.java
+++ b/src/main/java/com/epam/ta/reportportal/core/log/ElasticLogService.java
@@ -39,7 +39,7 @@
 
 @Primary
 @Service
-@ConditionalOnProperty(prefix = "rp.elasticsearch", name = "host")
+@ConditionalOnProperty(prefix = "rp.searchengine", name = "host")
 public class ElasticLogService implements LogService {
 
   private final AmqpTemplate amqpTemplate;
diff --git a/src/main/resources/application-elastic.yaml b/src/main/resources/application-elastic.yaml
index 359c09f7a8..8e7bba8cf1 100644
--- a/src/main/resources/application-elastic.yaml
+++ b/src/main/resources/application-elastic.yaml
@@ -1,5 +1,5 @@
 rp:
-  elasticsearchLogmessage:
+  searchengine:
     host: elasticsearch
     port: 9200
     username:

From 14f9e0d88d0a7423120de75b459029e61b0fc178 Mon Sep 17 00:00:00 2001
From: Andrei Piankouski <andrei_piankouski@epam.com>
Date: Wed, 6 Dec 2023 17:46:35 +0300
Subject: [PATCH 15/24] EPMRPP-89261 || Migrate api service to springDoc

---
 build.gradle                                  |   4 +-
 .../reportportal/core/configs/MvcConfig.java  |   7 +
 .../core/configs/SpringDocConfiguration.java  | 116 +++++++
 .../core/configs/Swagger2Configuration.java   | 304 ------------------
 .../demodata/DemoDataController.java          |   6 +-
 .../model/ActivityEventResource.java          |  23 +-
 .../ta/reportportal/model/SearchCriteria.java |   9 +-
 .../model/dashboard/CreateDashboardRQ.java    |   8 +-
 .../model/dashboard/DashboardResource.java    |   7 +-
 .../model/dashboard/UpdateDashboardRQ.java    |   5 +-
 .../model/filter/UpdateUserFilterRQ.java      |  11 +-
 .../model/issue/IssueDefinition.java          |   5 +-
 .../model/item/LinkExternalIssueRQ.java       |   4 +-
 .../model/launch/AnalyzeLaunchRQ.java         |  10 +-
 .../model/launch/LaunchImportRQ.java          |  47 ++-
 .../model/launch/MergeLaunchesRQ.java         |  13 +-
 .../model/launch/UpdateLaunchRQ.java          |   4 +-
 .../model/log/GetLogsUnderRq.java             |   4 +-
 .../reportportal/model/log/LogResource.java   |   4 +-
 .../reportportal/model/log/SearchLogRq.java   |   4 +-
 .../model/project/CreateProjectRQ.java        |   7 +-
 .../model/project/DeleteProjectRQ.java        |   5 +-
 .../model/project/UnassignUsersRQ.java        |   5 +-
 .../project/config/CreateIssueSubTypeRQ.java  |  11 +-
 .../project/config/UpdateIssueSubTypeRQ.java  |   5 +-
 .../config/UpdateOneIssueSubTypeRQ.java       |   7 +-
 .../model/project/email/SenderCaseDTO.java    |   6 +-
 .../reportportal/model/user/CreateUserRQ.java |   9 +-
 .../model/user/CreateUserRQConfirm.java       |  11 +-
 .../model/user/CreateUserRQFull.java          |  17 +-
 .../model/user/ResetPasswordRQ.java           |   7 +-
 .../model/user/RestorePasswordRQ.java         |   5 +-
 .../model/widget/WidgetPreviewRQ.java         |   4 +-
 .../reportportal/model/widget/WidgetRQ.java   |   4 +-
 .../model/widget/WidgetResource.java          |   4 +-
 .../ws/controller/ActivityController.java     |   6 +-
 .../controller/ActivityEventController.java   |   8 +-
 .../BugTrackingSystemController.java          |  16 +-
 .../ws/controller/DashboardController.java    |  18 +-
 .../controller/DeprecatedUserController.java  |  53 +--
 .../ws/controller/FileStorageController.java  |  14 +-
 .../ws/controller/IntegrationController.java  |  38 +--
 .../ws/controller/InternalApiController.java  |  48 ---
 .../ws/controller/LaunchAsyncController.java  |  16 +-
 .../ws/controller/LaunchController.java       |  71 ++--
 .../ws/controller/LogAsyncController.java     |  12 +-
 .../ws/controller/LogController.java          |  34 +-
 .../ws/controller/OnboardingController.java   |   6 +-
 .../ws/controller/PluginController.java       |  14 +-
 .../ws/controller/PluginPublicController.java |  10 +-
 .../ws/controller/ProjectController.java      |  39 +--
 .../controller/ProjectSettingsController.java |  26 +-
 .../ws/controller/SettingsController.java     |   8 +-
 .../controller/TestItemAsyncController.java   |  10 +-
 .../ws/controller/TestItemController.java     |  58 ++--
 .../ws/controller/UserController.java         |  43 +--
 .../ws/controller/UserFilterController.java   |  20 +-
 .../ws/controller/WidgetController.java       |  16 +-
 src/main/resources/application.properties     |   1 +
 src/main/resources/application.yaml           |   8 +-
 60 files changed, 587 insertions(+), 708 deletions(-)
 create mode 100644 src/main/java/com/epam/ta/reportportal/core/configs/SpringDocConfiguration.java
 delete mode 100644 src/main/java/com/epam/ta/reportportal/core/configs/Swagger2Configuration.java
 delete mode 100644 src/main/java/com/epam/ta/reportportal/ws/controller/InternalApiController.java

diff --git a/build.gradle b/build.gradle
index 84c4a26131..82ea4feb07 100644
--- a/build.gradle
+++ b/build.gradle
@@ -74,7 +74,7 @@ dependencies {
         implementation 'com.github.reportportal:commons-events:e337f8b7be'
         implementation 'com.github.reportportal:commons-dao:b299f80'
         implementation 'com.github.reportportal:commons-rules:42d4dd5634'
-        implementation 'com.github.reportportal:commons-model:c800793'
+        implementation 'com.github.reportportal:commons-model:541f2a4'
         implementation 'com.github.reportportal:commons:07566b8e'
         implementation 'com.github.reportportal:commons-fonts:d6e62dd'
         implementation 'com.github.reportportal:plugin-api:0ccfed880c'
@@ -112,7 +112,7 @@ dependencies {
     implementation 'com.lowagie:itext:2.1.7.js7'
     // JasperReport's export to XLS uses Apache POI
     implementation 'org.apache.poi:poi:5.2.3'
-    implementation 'io.springfox:springfox-swagger2:2.9.2'
+    implementation 'org.springdoc:springdoc-openapi-ui:1.7.0'
     implementation 'com.google.code.gson:gson:2.8.9'
 
 
diff --git a/src/main/java/com/epam/ta/reportportal/core/configs/MvcConfig.java b/src/main/java/com/epam/ta/reportportal/core/configs/MvcConfig.java
index 2d084bd336..15f1c18c83 100644
--- a/src/main/java/com/epam/ta/reportportal/core/configs/MvcConfig.java
+++ b/src/main/java/com/epam/ta/reportportal/core/configs/MvcConfig.java
@@ -45,6 +45,7 @@
 import org.springframework.core.Ordered;
 import org.springframework.core.annotation.Order;
 import org.springframework.http.MediaType;
+import org.springframework.http.converter.ByteArrayHttpMessageConverter;
 import org.springframework.http.converter.HttpMessageConverter;
 import org.springframework.http.converter.StringHttpMessageConverter;
 import org.springframework.http.converter.json.MappingJackson2HttpMessageConverter;
@@ -120,6 +121,7 @@ public void addArgumentResolvers(List<HandlerMethodArgumentResolver> argumentRes
   @Override
   public void configureMessageConverters(List<HttpMessageConverter<?>> converters) {
     converters.clear();
+    converters.add(byteArrayConverter());
     converters.add(jsonConverter());
     converters.add(openMetricsTextStringConverter());
     converters.add(stringConverter());
@@ -179,6 +181,11 @@ public StringHttpMessageConverter openMetricsTextStringConverter() {
     return converter;
   }
 
+  @Bean
+  public ByteArrayHttpMessageConverter byteArrayConverter() {
+    return new ByteArrayHttpMessageConverter();
+  }
+
   @Bean
   HttpMessageConverters httpMessageConverters() {
     return new HttpMessageConverters(converters);
diff --git a/src/main/java/com/epam/ta/reportportal/core/configs/SpringDocConfiguration.java b/src/main/java/com/epam/ta/reportportal/core/configs/SpringDocConfiguration.java
new file mode 100644
index 0000000000..53eac08095
--- /dev/null
+++ b/src/main/java/com/epam/ta/reportportal/core/configs/SpringDocConfiguration.java
@@ -0,0 +1,116 @@
+/*
+ * Copyright 2023 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.ta.reportportal.core.configs;
+
+import com.epam.ta.reportportal.commons.ReportPortalUser;
+import com.epam.ta.reportportal.commons.querygen.Filter;
+import com.epam.ta.reportportal.commons.querygen.Queryable;
+import com.epam.ta.reportportal.entity.user.UserRole;
+import io.swagger.v3.oas.models.Components;
+import io.swagger.v3.oas.models.OpenAPI;
+import io.swagger.v3.oas.models.info.Contact;
+import io.swagger.v3.oas.models.info.Info;
+import io.swagger.v3.oas.models.info.License;
+import io.swagger.v3.oas.models.media.Schema;
+import io.swagger.v3.oas.models.security.SecurityRequirement;
+import io.swagger.v3.oas.models.security.SecurityScheme;
+import io.swagger.v3.oas.models.servers.Server;
+import io.swagger.v3.oas.models.tags.Tag;
+import java.util.Comparator;
+import java.util.List;
+import java.util.Map;
+import java.util.TreeMap;
+import java.util.stream.Collectors;
+import javax.servlet.ServletContext;
+import org.springdoc.core.SpringDocUtils;
+import org.springdoc.core.customizers.OpenApiCustomiser;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.ComponentScan;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.security.core.annotation.AuthenticationPrincipal;
+
+/**
+ * @author <a href="mailto:andrei_piankouski@epam.com">Andrei Piankouski</a>
+ */
+@Configuration
+@ComponentScan(basePackages = "com.epam.ta.reportportal.ws.controller")
+public class SpringDocConfiguration {
+
+  static {
+    SpringDocUtils.getConfig().addAnnotationsToIgnore(AuthenticationPrincipal.class);
+    SpringDocUtils.getConfig().addRequestWrapperToIgnore(Filter.class, Queryable.class,
+        ReportPortalUser.class, UserRole.class);
+    SpringDocUtils.getConfig().replaceWithClass(org.springframework.data.domain.Pageable.class,
+        org.springdoc.core.converters.models.Pageable.class);
+  }
+
+  @Autowired
+  private ServletContext servletContext;
+
+  @Value("${spring.application.name}")
+  private String applicationName;
+
+  @Value("${info.build.version}")
+  private String buildVersion;
+
+  @Bean
+  public OpenAPI openAPI() {
+    final String securitySchemeName = "bearerAuth";
+    return new OpenAPI()
+        .info(new Info().title("Report Portal")
+            .description("Report Portal API documentation")
+            .version(buildVersion)
+            .contact(new Contact()
+                .name("Support")
+                .email("support@reportportal.io")
+            )
+            .license(new License().name("Apache 2.0")
+                .url("http://www.apache.org/licenses/LICENSE-2.0")))
+        .addSecurityItem(new SecurityRequirement().addList(securitySchemeName))
+        .components(
+            new Components()
+                .addSecuritySchemes(securitySchemeName,
+                    new SecurityScheme()
+                        .name(securitySchemeName)
+                        .type(SecurityScheme.Type.HTTP)
+                        .scheme("bearer")
+                        .bearerFormat("JWT")
+                )
+        )
+        .addServersItem(new Server().url("/" + applicationName));
+  }
+
+  @Bean
+  public OpenApiCustomiser sortSchemasAlphabetically() {
+    return openApi -> {
+      Map<String, Schema> schemas = openApi.getComponents().getSchemas();
+      openApi.getComponents().setSchemas(new TreeMap<>(schemas));
+    };
+  }
+
+  @Bean
+  public OpenApiCustomiser sortTagsAlphabetically() {
+    return openApi -> {
+      List<Tag> sortedTags = openApi.getTags().stream()
+          .sorted(Comparator.comparing(Tag::getName))
+          .collect(Collectors.toList());
+      openApi.setTags(sortedTags);
+    };
+  }
+}
diff --git a/src/main/java/com/epam/ta/reportportal/core/configs/Swagger2Configuration.java b/src/main/java/com/epam/ta/reportportal/core/configs/Swagger2Configuration.java
deleted file mode 100644
index 82271717dc..0000000000
--- a/src/main/java/com/epam/ta/reportportal/core/configs/Swagger2Configuration.java
+++ /dev/null
@@ -1,304 +0,0 @@
-/*
- * 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.ta.reportportal.core.configs;
-
-import static com.epam.ta.reportportal.commons.querygen.constant.ProjectCriteriaConstant.CRITERIA_PROJECT_ATTRIBUTE_NAME;
-import static com.google.common.base.Predicates.not;
-import static com.google.common.base.Predicates.or;
-import static com.google.common.collect.Lists.newArrayList;
-import static springfox.documentation.builders.RequestHandlerSelectors.basePackage;
-import static springfox.documentation.spi.schema.contexts.ModelContext.inputParam;
-
-import com.epam.ta.reportportal.commons.ReportPortalUser;
-import com.epam.ta.reportportal.commons.querygen.CriteriaHolder;
-import com.epam.ta.reportportal.commons.querygen.Filter;
-import com.epam.ta.reportportal.commons.querygen.FilterTarget;
-import com.epam.ta.reportportal.commons.querygen.Queryable;
-import com.epam.ta.reportportal.core.statistics.StatisticsHelper;
-import com.epam.ta.reportportal.entity.item.TestItem;
-import com.epam.ta.reportportal.entity.launch.Launch;
-import com.epam.ta.reportportal.entity.user.UserRole;
-import com.epam.ta.reportportal.ws.resolver.FilterFor;
-import com.fasterxml.classmate.ResolvedType;
-import com.fasterxml.classmate.TypeResolver;
-import com.google.common.collect.ImmutableSet;
-import com.google.common.collect.Lists;
-import java.sql.Timestamp;
-import java.util.Collections;
-import java.util.Date;
-import java.util.List;
-import java.util.Set;
-import java.util.function.Function;
-import java.util.stream.Collectors;
-import javax.servlet.ServletContext;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.ComponentScan;
-import org.springframework.context.annotation.Conditional;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.data.domain.Pageable;
-import org.springframework.stereotype.Component;
-import springfox.documentation.PathProvider;
-import springfox.documentation.builders.ParameterBuilder;
-import springfox.documentation.schema.ModelReference;
-import springfox.documentation.schema.ResolvedTypes;
-import springfox.documentation.schema.TypeNameExtractor;
-import springfox.documentation.service.ApiInfo;
-import springfox.documentation.service.Contact;
-import springfox.documentation.service.Parameter;
-import springfox.documentation.service.ResolvedMethodParameter;
-import springfox.documentation.spi.DocumentationType;
-import springfox.documentation.spi.schema.contexts.ModelContext;
-import springfox.documentation.spi.service.OperationBuilderPlugin;
-import springfox.documentation.spi.service.contexts.OperationContext;
-import springfox.documentation.spi.service.contexts.ParameterContext;
-import springfox.documentation.spring.web.paths.RelativePathProvider;
-import springfox.documentation.spring.web.plugins.Docket;
-import springfox.documentation.swagger.web.UiConfiguration;
-import springfox.documentation.swagger.web.UiConfigurationBuilder;
-import springfox.documentation.swagger2.annotations.EnableSwagger2;
-
-/**
- * SWAGGER 2.0 UI page configuration for Report Portal application
- *
- * @author dzmitry_kavalets
- * @author Andrei_Ramanchuk
- * @author Andrei Varabyeu
- */
-@Configuration
-@Conditional(Conditions.NotTestCondition.class)
-@EnableSwagger2
-@ComponentScan(basePackages = "com.epam.ta.reportportal.ws.controller")
-public class Swagger2Configuration {
-
-  private static final Set<String> hiddenParams = ImmutableSet.<String>builder()
-      .add(CRITERIA_PROJECT_ATTRIBUTE_NAME).build();
-
-  @Autowired
-  private ServletContext servletContext;
-
-  @Value("${spring.application.name}")
-  private String applicationName;
-
-  @Value("${info.build.version}")
-  private String buildVersion;
-
-	@Bean
-	public Docket docket() {
-		/* For more information see default params at {@link ApiInfo} */
-		ApiInfo rpInfo = new ApiInfo(
-				"Report Portal",
-				"Report Portal API documentation",
-				buildVersion,
-				null,
-				new Contact("Support", null, "Support Report Portal <support@reportportal.io>"),
-				"Apache 2.0",
-				"http://www.apache.org/licenses/LICENSE-2.0",
-				Collections.emptyList()
-		);
-
-    // @formatter:off
-    Docket rpDocket = new Docket(DocumentationType.SWAGGER_2)
-        .ignoredParameterTypes(ReportPortalUser.class, Filter.class, Queryable.class,
-            Pageable.class, UserRole.class)
-        .pathProvider(rpPathProvider())
-        .useDefaultResponseMessages(false)
-        /* remove default endpoints from listing */
-        .select().apis(not(or(
-            basePackage("org.springframework.boot"),
-            basePackage("org.springframework.cloud"))))
-        .build();
-    //@formatter:on
-
-    rpDocket.apiInfo(rpInfo);
-    return rpDocket;
-  }
-
-  @Bean
-  public PathProvider rpPathProvider() {
-    return new RelativePathProvider(servletContext) {
-      @Override
-      public String getApplicationBasePath() {
-        if (super.getApplicationBasePath().contains(applicationName)) {
-          return super.getApplicationBasePath();
-        }
-        return "/" + applicationName + super.getApplicationBasePath();
-      }
-    };
-  }
-
-  @Bean
-  OperationPageableParameterReader pageableParameterBuilderPlugin(TypeNameExtractor nameExtractor,
-      TypeResolver resolver) {
-    return new OperationPageableParameterReader(nameExtractor, resolver);
-  }
-
-  @Bean
-  public UiConfiguration uiConfig() {
-    return UiConfigurationBuilder.builder().build();
-  }
-
-  @Component
-  public class OperationPageableParameterReader implements OperationBuilderPlugin {
-
-    private final TypeNameExtractor nameExtractor;
-    private final TypeResolver resolver;
-
-    private final ResolvedType pageableType;
-    private final ResolvedType filterType;
-
-    @Autowired
-    public OperationPageableParameterReader(TypeNameExtractor nameExtractor,
-        TypeResolver resolver) {
-      this.nameExtractor = nameExtractor;
-      this.resolver = resolver;
-      this.pageableType = resolver.resolve(Pageable.class);
-      this.filterType = resolver.resolve(Filter.class);
-    }
-
-    @Override
-    public void apply(OperationContext context) {
-      List<ResolvedMethodParameter> methodParameters = context.getParameters();
-      List<Parameter> parameters = newArrayList();
-
-      for (ResolvedMethodParameter methodParameter : methodParameters) {
-        ResolvedType resolvedType = methodParameter.getParameterType();
-        ParameterContext parameterContext = new ParameterContext(
-            methodParameter,
-            new ParameterBuilder(),
-            context.getDocumentationContext(),
-            context.getGenericsNamingStrategy(),
-            context
-        );
-        Function<ResolvedType, ? extends ModelReference> factory = createModelRefFactory(
-            parameterContext);
-        ModelReference stringModel = factory.apply(resolver.resolve(List.class, String.class));
-
-        if (pageableType.equals(resolvedType)) {
-
-          ModelReference intModel = factory.apply(resolver.resolve(Integer.TYPE));
-
-          parameters.add(new ParameterBuilder().parameterType("query")
-              .name("page.page")
-              .modelRef(intModel)
-              .description("Results page you want to retrieve (0..N)")
-              .build());
-          parameters.add(new ParameterBuilder().parameterType("query")
-              .name("page.size")
-              .modelRef(intModel)
-              .description("Number of records per page")
-              .build());
-          parameters.add(new ParameterBuilder().parameterType("query")
-              .name("page.sort")
-              .modelRef(stringModel)
-              .allowMultiple(true)
-              .description("Sorting criteria in the format: property, (asc|desc). "
-                  + "Default sort order is ascending. "
-                  + "Multiple sort criteria are supported.")
-              .build());
-          context.operationBuilder().parameters(parameters);
-
-        } else if (filterType.equals(resolvedType)) {
-          FilterFor filterClass = methodParameter.findAnnotation(FilterFor.class).get();
-
-          List<Parameter> defaultParams = Lists.newArrayList();
-          if (filterClass.value() == TestItem.class || filterClass.value() == Launch.class) {
-            defaultParams = StatisticsHelper.defaultStatisticsFields()
-                .map(it -> buildParameters(parameterContext, factory, it))
-                .collect(Collectors.toList());
-          }
-
-          List<CriteriaHolder> criteriaList = FilterTarget.findByClass(filterClass.value())
-              .getCriteriaHolders();
-          List<Parameter> params = criteriaList.stream()
-              .filter(ch -> !hiddenParams.contains(ch.getFilterCriteria()))
-              .map(it -> buildParameters(parameterContext, factory, it))
-              /* if type is not a collection and first letter is not capital (all known to swagger types start from lower case) */
-              .filter(p -> !(null == p.getModelRef().getItemType() && Character.isUpperCase(
-                  p.getModelRef()
-                      .getType()
-                      .toCharArray()[0])))
-              .collect(Collectors.toList());
-
-          params.addAll(defaultParams);
-          context.operationBuilder().parameters(params);
-        }
-      }
-    }
-
-    private Parameter buildParameters(ParameterContext parameterContext,
-        Function<ResolvedType, ? extends ModelReference> factory,
-        CriteriaHolder criteriaHolder) {
-      return parameterContext.parameterBuilder()
-          .parameterType("query")
-          .name("filter.eq." + criteriaHolder.getFilterCriteria())
-          .allowMultiple(true)
-          .modelRef(factory.apply(resolver.resolve(
-              criteriaHolder.getDataType() == Timestamp.class ? Date.class
-                  : criteriaHolder.getDataType())))
-          .description("Filters by '" + criteriaHolder.getFilterCriteria() + "'")
-          .build();
-    }
-
-    private Parameter buildParameters(ParameterContext parameterContext,
-        Function<ResolvedType, ? extends ModelReference> factory,
-        String parameter) {
-      return parameterContext.parameterBuilder()
-          .parameterType("query")
-          .name("filter.eq." + parameter)
-          .allowMultiple(true)
-          .modelRef(factory.apply(resolver.resolve(Long.class)))
-          .description("Filters by '" + parameter + "'")
-          .build();
-    }
-
-    @Override
-    public boolean supports(DocumentationType delimiter) {
-      return true;
-    }
-
-    private Function<ResolvedType, ? extends ModelReference> createModelRefFactory(
-        ParameterContext context) {
-      ModelContext modelContext = inputParam(
-          Docket.DEFAULT_GROUP_NAME,
-          context.resolvedMethodParameter().getParameterType().getErasedType(),
-          context.getDocumentationType(),
-          context.getAlternateTypeProvider(),
-          context.getGenericNamingStrategy(),
-          context.getIgnorableParameterTypes()
-      );
-      return ResolvedTypes.modelRefFactory(modelContext, nameExtractor);
-    }
-  }
-
-  @SuppressWarnings("unused")
-  private static class RPPathProvider extends RelativePathProvider {
-
-    private String gatewayPath;
-
-    RPPathProvider(ServletContext servletContext, String gatewayPath) {
-      super(servletContext);
-      this.gatewayPath = gatewayPath;
-    }
-
-    @Override
-    protected String applicationPath() {
-      return "/" + gatewayPath + super.applicationPath();
-    }
-  }
-}
diff --git a/src/main/java/com/epam/ta/reportportal/demodata/DemoDataController.java b/src/main/java/com/epam/ta/reportportal/demodata/DemoDataController.java
index 123cdfa3f1..437e0a86f6 100644
--- a/src/main/java/com/epam/ta/reportportal/demodata/DemoDataController.java
+++ b/src/main/java/com/epam/ta/reportportal/demodata/DemoDataController.java
@@ -21,7 +21,8 @@
 import com.epam.ta.reportportal.demodata.model.DemoDataRs;
 import com.epam.ta.reportportal.demodata.service.DemoDataService;
 import com.epam.ta.reportportal.util.ProjectExtractor;
-import io.swagger.annotations.ApiOperation;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.tags.Tag;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.security.core.annotation.AuthenticationPrincipal;
 import org.springframework.validation.annotation.Validated;
@@ -35,6 +36,7 @@
 @RestController
 @RequestMapping("/v1/demo/{projectName}")
 @PreAuthorize(PROJECT_MANAGER)
+@Tag(name = "demo-data-controller", description = "Demo Data Controller")
 class DemoDataController {
 
 	private final DemoDataService demoDataService;
@@ -47,7 +49,7 @@ class DemoDataController {
 	}
 
 	@PostMapping("/generate")
-	@ApiOperation(value = "generate")
+	@Operation(summary =  "generate")
 	public DemoDataRs generate(@PathVariable String projectName, @Validated @RequestBody DemoDataRq demoDataRq,
 			@AuthenticationPrincipal ReportPortalUser user) {
 		return demoDataService.generate(demoDataRq, projectExtractor.extractProjectDetailsAdmin(user, projectName), user);
diff --git a/src/main/java/com/epam/ta/reportportal/model/ActivityEventResource.java b/src/main/java/com/epam/ta/reportportal/model/ActivityEventResource.java
index 1997defaa8..58755680f3 100644
--- a/src/main/java/com/epam/ta/reportportal/model/ActivityEventResource.java
+++ b/src/main/java/com/epam/ta/reportportal/model/ActivityEventResource.java
@@ -20,7 +20,8 @@
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonInclude.Include;
 import com.fasterxml.jackson.annotation.JsonProperty;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
+import io.swagger.v3.oas.annotations.media.Schema.RequiredMode;
 import java.util.Date;
 import javax.validation.constraints.NotNull;
 import lombok.Builder;
@@ -42,7 +43,7 @@ public class ActivityEventResource {
 
   @NotNull
   @JsonProperty(value = "id", required = true)
-  @ApiModelProperty(required = true)
+  @Schema(requiredMode = RequiredMode.REQUIRED)
   private Long id;
 
   @NotNull
@@ -52,44 +53,44 @@ public class ActivityEventResource {
 
   @NotNull
   @JsonProperty(value = "event_name", required = true)
-  @ApiModelProperty(required = true)
+  @Schema(requiredMode = RequiredMode.REQUIRED)
   private String eventName;
 
   @JsonProperty(value = "object_id")
-  @ApiModelProperty(required = true)
+  @Schema(requiredMode = RequiredMode.REQUIRED)
   private Long objectId;
 
   @NotNull
   @JsonProperty(value = "object_name", required = true)
-  @ApiModelProperty(required = true)
+  @Schema(requiredMode = RequiredMode.REQUIRED)
   private String objectName;
 
   @NotNull
   @JsonProperty(value = "object_type", required = true)
-  @ApiModelProperty(required = true)
+  @Schema(requiredMode = RequiredMode.REQUIRED)
   private String objectType;
 
   @JsonProperty(value = "project_id")
-  @ApiModelProperty(required = true)
+  @Schema(requiredMode = RequiredMode.REQUIRED)
   private Long projectId;
 
   @JsonProperty(value = "project_name")
-  @ApiModelProperty(required = true)
+  @Schema(requiredMode = RequiredMode.REQUIRED)
   private String projectName;
 
   @NotNull
   @JsonProperty(value = "subject_name", required = true)
-  @ApiModelProperty(required = true)
+  @Schema(requiredMode = RequiredMode.REQUIRED)
   private String subjectName;
 
   @NotNull
   @JsonProperty(value = "subject_type", required = true)
-  @ApiModelProperty(required = true)
+  @Schema(requiredMode = RequiredMode.REQUIRED)
   private String subjectType;
 
   @NotNull
   @JsonProperty(value = "subject_id", required = true)
-  @ApiModelProperty(required = true)
+  @Schema(requiredMode = RequiredMode.REQUIRED)
   private String subjectId;
 
   @JsonProperty(value = "details")
diff --git a/src/main/java/com/epam/ta/reportportal/model/SearchCriteria.java b/src/main/java/com/epam/ta/reportportal/model/SearchCriteria.java
index 685062a432..f0be5091ea 100644
--- a/src/main/java/com/epam/ta/reportportal/model/SearchCriteria.java
+++ b/src/main/java/com/epam/ta/reportportal/model/SearchCriteria.java
@@ -19,7 +19,8 @@
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonInclude.Include;
 import com.fasterxml.jackson.annotation.JsonProperty;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
+import io.swagger.v3.oas.annotations.media.Schema.RequiredMode;
 import java.util.Objects;
 import javax.validation.constraints.NotNull;
 
@@ -33,16 +34,16 @@ public class SearchCriteria {
 
   @NotNull
   @JsonProperty(value = "filter_key", required = true)
-  @ApiModelProperty(required = true)
+  @Schema(requiredMode = RequiredMode.REQUIRED)
   private String filterKey;
 
   @JsonProperty(value = "operation")
-  @ApiModelProperty(allowableValues = "EQ, NE, CNT, NON_CNT, BTW, IN")
+  @Schema(allowableValues = "EQ, NE, CNT, NON_CNT, BTW, IN")
   private String operation;
 
   @NotNull
   @JsonProperty(value = "value", required = true)
-  @ApiModelProperty(required = true)
+  @Schema(requiredMode = RequiredMode.REQUIRED)
   private String value;
 
   public SearchCriteria() {
diff --git a/src/main/java/com/epam/ta/reportportal/model/dashboard/CreateDashboardRQ.java b/src/main/java/com/epam/ta/reportportal/model/dashboard/CreateDashboardRQ.java
index f770456896..0981c51257 100644
--- a/src/main/java/com/epam/ta/reportportal/model/dashboard/CreateDashboardRQ.java
+++ b/src/main/java/com/epam/ta/reportportal/model/dashboard/CreateDashboardRQ.java
@@ -22,8 +22,8 @@
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonInclude.Include;
 import com.fasterxml.jackson.annotation.JsonProperty;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
+import io.swagger.v3.oas.annotations.media.Schema.RequiredMode;
 
 /**
  * Domain object for creating dashboards.
@@ -31,12 +31,12 @@
  * @author Aliaksei_Makayed
  */
 @JsonInclude(Include.NON_NULL)
-@ApiModel
+@Schema
 public class CreateDashboardRQ extends BaseEntityRQ {
 
   @NotBlankWithSize(min = ValidationConstraints.MIN_NAME_LENGTH, max = ValidationConstraints.MAX_DASHBOARD_NAME_LENGTH)
   @JsonProperty(value = "name", required = true)
-  @ApiModelProperty(required = true)
+  @Schema(requiredMode = RequiredMode.REQUIRED)
   private String name;
 
   public String getName() {
diff --git a/src/main/java/com/epam/ta/reportportal/model/dashboard/DashboardResource.java b/src/main/java/com/epam/ta/reportportal/model/dashboard/DashboardResource.java
index 3c100a2e8e..944643c093 100644
--- a/src/main/java/com/epam/ta/reportportal/model/dashboard/DashboardResource.java
+++ b/src/main/java/com/epam/ta/reportportal/model/dashboard/DashboardResource.java
@@ -22,7 +22,8 @@
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonInclude.Include;
 import com.fasterxml.jackson.annotation.JsonProperty;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
+import io.swagger.v3.oas.annotations.media.Schema.RequiredMode;
 import java.util.List;
 import java.util.Map;
 import javax.validation.constraints.NotBlank;
@@ -40,13 +41,13 @@ public class DashboardResource extends OwnedResource {
 
 	@NotNull
 	@JsonProperty(value = "id", required = true)
-	@ApiModelProperty(required = true)
+	@Schema(requiredMode = RequiredMode.REQUIRED)
 	private Long dashboardId;
 
 	@NotBlank
 	@Size(min = ValidationConstraints.MIN_NAME_LENGTH, max = ValidationConstraints.MAX_DASHBOARD_NAME_LENGTH)
 	@JsonProperty(value = "name", required = true)
-	@ApiModelProperty(required = true)
+	@Schema(requiredMode = RequiredMode.REQUIRED)
 	private String name;
 
 	@JsonProperty(value = "widgets")
diff --git a/src/main/java/com/epam/ta/reportportal/model/dashboard/UpdateDashboardRQ.java b/src/main/java/com/epam/ta/reportportal/model/dashboard/UpdateDashboardRQ.java
index cea6643035..16b206cf95 100644
--- a/src/main/java/com/epam/ta/reportportal/model/dashboard/UpdateDashboardRQ.java
+++ b/src/main/java/com/epam/ta/reportportal/model/dashboard/UpdateDashboardRQ.java
@@ -22,7 +22,8 @@
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonInclude.Include;
 import com.fasterxml.jackson.annotation.JsonProperty;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
+import io.swagger.v3.oas.annotations.media.Schema.RequiredMode;
 import java.util.List;
 import javax.validation.Valid;
 
@@ -36,7 +37,7 @@ public class UpdateDashboardRQ extends BaseEntityRQ {
 
 	@NotBlankWithSize(min = ValidationConstraints.MIN_NAME_LENGTH, max = ValidationConstraints.MAX_DASHBOARD_NAME_LENGTH)
 	@JsonProperty(value = "name", required = true)
-	@ApiModelProperty(required = true)
+	@Schema(requiredMode = RequiredMode.REQUIRED)
 	private String name;
 
 	@Valid
diff --git a/src/main/java/com/epam/ta/reportportal/model/filter/UpdateUserFilterRQ.java b/src/main/java/com/epam/ta/reportportal/model/filter/UpdateUserFilterRQ.java
index bb2f2905e1..ae422a7f70 100644
--- a/src/main/java/com/epam/ta/reportportal/model/filter/UpdateUserFilterRQ.java
+++ b/src/main/java/com/epam/ta/reportportal/model/filter/UpdateUserFilterRQ.java
@@ -28,7 +28,8 @@
 import com.fasterxml.jackson.annotation.JsonInclude.Include;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
+import io.swagger.v3.oas.annotations.media.Schema.RequiredMode;
 import java.util.LinkedHashSet;
 import java.util.List;
 import java.util.Set;
@@ -47,13 +48,13 @@ public class UpdateUserFilterRQ extends BaseEntityRQ {
 
   @NotBlankWithSize(min = MIN_NAME_LENGTH, max = MAX_USER_FILTER_NAME_LENGTH)
   @JsonProperty(value = "name", required = true)
-  @ApiModelProperty(required = true)
+  @Schema(requiredMode = RequiredMode.REQUIRED)
   private String name;
 
   @NotBlank
   @JsonProperty(value = "type", required = true)
   @In(allowedValues = { "launch", "testItem", "log" })
-  @ApiModelProperty(required = true, allowableValues = "launch, testitem, log")
+  @Schema(required = true, allowableValues = "launch, testitem, log")
   private String objectType;
 
   @Valid
@@ -61,14 +62,14 @@ public class UpdateUserFilterRQ extends BaseEntityRQ {
   @Size(min = MIN_COLLECTION_SIZE, max = MAX_NUMBER_OF_FILTER_ENTITIES)
   @JsonProperty(value = "conditions", required = true)
   @JsonDeserialize(as = LinkedHashSet.class)
-  @ApiModelProperty(required = true)
+  @Schema(requiredMode = RequiredMode.REQUIRED)
   private Set<UserFilterCondition> conditions;
 
   @Valid
   @NotNull
   @Size(min = MIN_COLLECTION_SIZE)
   @JsonProperty(value = "orders", required = true)
-  @ApiModelProperty(required = true)
+  @Schema(requiredMode = RequiredMode.REQUIRED)
   private List<Order> orders;
 
   public String getName() {
diff --git a/src/main/java/com/epam/ta/reportportal/model/issue/IssueDefinition.java b/src/main/java/com/epam/ta/reportportal/model/issue/IssueDefinition.java
index c02a8c4ab4..bc45ea21d9 100644
--- a/src/main/java/com/epam/ta/reportportal/model/issue/IssueDefinition.java
+++ b/src/main/java/com/epam/ta/reportportal/model/issue/IssueDefinition.java
@@ -20,7 +20,8 @@
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonInclude.Include;
 import com.fasterxml.jackson.annotation.JsonProperty;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
+import io.swagger.v3.oas.annotations.media.Schema.RequiredMode;
 import javax.validation.Valid;
 import javax.validation.constraints.NotNull;
 
@@ -35,7 +36,7 @@ public class IssueDefinition {
 
 	@NotNull
 	@JsonProperty(value = "testItemId", required = true)
-	@ApiModelProperty(required = true)
+	@Schema(requiredMode = RequiredMode.REQUIRED)
 	private Long id;
 
 	@NotNull
diff --git a/src/main/java/com/epam/ta/reportportal/model/item/LinkExternalIssueRQ.java b/src/main/java/com/epam/ta/reportportal/model/item/LinkExternalIssueRQ.java
index 7b82954281..28678ca930 100644
--- a/src/main/java/com/epam/ta/reportportal/model/item/LinkExternalIssueRQ.java
+++ b/src/main/java/com/epam/ta/reportportal/model/item/LinkExternalIssueRQ.java
@@ -19,7 +19,7 @@
 import com.epam.ta.reportportal.ws.model.issue.Issue;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
 import java.util.List;
 import javax.validation.Valid;
 import javax.validation.constraints.NotEmpty;
@@ -38,7 +38,7 @@ public class LinkExternalIssueRQ extends ExternalIssueRQ {
   @Valid
   @Size(max = 300)
   @JsonProperty(value = "issues")
-  @ApiModelProperty(reference = "Issue.ExternalSystemIssue")
+  @Schema(implementation = Issue.ExternalSystemIssue.class)
   private List<Issue.ExternalSystemIssue> issues;
 
   public void setIssues(List<Issue.ExternalSystemIssue> values) {
diff --git a/src/main/java/com/epam/ta/reportportal/model/launch/AnalyzeLaunchRQ.java b/src/main/java/com/epam/ta/reportportal/model/launch/AnalyzeLaunchRQ.java
index 849110b763..cc8ad497af 100644
--- a/src/main/java/com/epam/ta/reportportal/model/launch/AnalyzeLaunchRQ.java
+++ b/src/main/java/com/epam/ta/reportportal/model/launch/AnalyzeLaunchRQ.java
@@ -19,7 +19,7 @@
 import com.epam.ta.reportportal.ws.annotations.In;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
 import java.util.List;
 import javax.validation.constraints.NotNull;
 
@@ -31,25 +31,25 @@ public class AnalyzeLaunchRQ {
 
 	@NotNull
 	@JsonProperty(value = "launchId", required = true)
-	@ApiModelProperty
+	@Schema
 	private Long launchId;
 
 	@NotNull
 	@JsonProperty(value = "analyzerMode", required = true)
 	@In(allowedValues = { "all", "launch_name", "current_launch", "previous_launch", "current_and_the_same_name" })
-	@ApiModelProperty(allowableValues = "ALL, LAUNCH_NAME, CURRENT_LAUNCH, PREVIOUS_LAUNCH, CURRENT_AND_THE_SAME_NAME")
+	@Schema(allowableValues = "ALL, LAUNCH_NAME, CURRENT_LAUNCH, PREVIOUS_LAUNCH, CURRENT_AND_THE_SAME_NAME")
 	private String analyzerHistoryMode;
 
 	@NotNull
 	@JsonProperty(value = "analyzerTypeName", required = true)
 	@In(allowedValues = { "autoAnalyzer", "patternAnalyzer" })
-	@ApiModelProperty(allowableValues = "autoAnalyzer, patternAnalyzer")
+	@Schema(allowableValues = "autoAnalyzer, patternAnalyzer")
 	private String analyzerTypeName;
 
 	@NotNull
 	@JsonProperty(value = "analyzeItemsMode", required = true)
 	@In(allowedValues = { "to_investigate", "auto_analyzed", "manually_analyzed" })
-	@ApiModelProperty(allowableValues = "TO_INVESTIGATE, AUTO_ANALYZED, MANUALLY_ANALYZED")
+	@Schema(allowableValues = "TO_INVESTIGATE, AUTO_ANALYZED, MANUALLY_ANALYZED")
 	private List<String> analyzeItemsModes;
 
 	public Long getLaunchId() {
diff --git a/src/main/java/com/epam/ta/reportportal/model/launch/LaunchImportRQ.java b/src/main/java/com/epam/ta/reportportal/model/launch/LaunchImportRQ.java
index e4ad825353..a1da49a079 100644
--- a/src/main/java/com/epam/ta/reportportal/model/launch/LaunchImportRQ.java
+++ b/src/main/java/com/epam/ta/reportportal/model/launch/LaunchImportRQ.java
@@ -24,7 +24,7 @@
 import com.epam.ta.reportportal.ws.model.launch.Mode;
 import com.fasterxml.jackson.annotation.JsonAlias;
 import com.fasterxml.jackson.annotation.JsonProperty;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
 import java.util.Date;
 import java.util.Set;
 import javax.validation.Valid;
@@ -38,7 +38,7 @@
 public class LaunchImportRQ {
 
   @JsonProperty(value = "name")
-  @ApiModelProperty
+  @Schema
   @Size(min = MIN_LAUNCH_NAME_LENGTH, max = MAX_NAME_LENGTH)
   protected String name;
 
@@ -53,9 +53,50 @@ public class LaunchImportRQ {
 
   @JsonProperty
   @JsonAlias({ "startTime", "start_time" })
-  @ApiModelProperty
+  @Schema
   private Date startTime;
 
   @JsonProperty("mode")
   private Mode mode;
+
+  public String getName() {
+    return name;
+  }
+
+  public void setName(String name) {
+    this.name = name;
+  }
+
+  public String getDescription() {
+    return description;
+  }
+
+  public void setDescription(String description) {
+    this.description = description;
+  }
+
+  public Set<ItemAttributesRQ> getAttributes() {
+    return attributes;
+  }
+
+  public void setAttributes(
+      Set<ItemAttributesRQ> attributes) {
+    this.attributes = attributes;
+  }
+
+  public Date getStartTime() {
+    return startTime;
+  }
+
+  public void setStartTime(Date startTime) {
+    this.startTime = startTime;
+  }
+
+  public Mode getMode() {
+    return mode;
+  }
+
+  public void setMode(Mode mode) {
+    this.mode = mode;
+  }
 }
diff --git a/src/main/java/com/epam/ta/reportportal/model/launch/MergeLaunchesRQ.java b/src/main/java/com/epam/ta/reportportal/model/launch/MergeLaunchesRQ.java
index ed4f061701..1a052d15d7 100644
--- a/src/main/java/com/epam/ta/reportportal/model/launch/MergeLaunchesRQ.java
+++ b/src/main/java/com/epam/ta/reportportal/model/launch/MergeLaunchesRQ.java
@@ -25,7 +25,8 @@
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonInclude.Include;
 import com.fasterxml.jackson.annotation.JsonProperty;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
+import io.swagger.v3.oas.annotations.media.Schema.RequiredMode;
 import java.util.Date;
 import java.util.Set;
 import javax.validation.Valid;
@@ -38,7 +39,7 @@ public class MergeLaunchesRQ {
 
 	@NotBlankWithSize(min = ValidationConstraints.MIN_LAUNCH_NAME_LENGTH, max = ValidationConstraints.MAX_NAME_LENGTH)
 	@JsonProperty(value = "name", required = true)
-	@ApiModelProperty(required = true)
+	@Schema(requiredMode = RequiredMode.REQUIRED)
 	private String name;
 
 	@JsonProperty(value = "description")
@@ -50,7 +51,7 @@ public class MergeLaunchesRQ {
 	private Set<ItemAttributeResource> attributes;
 
 	@JsonProperty(value = "startTime")
-	@ApiModelProperty
+	@Schema
 	private Date startTime;
 
 	@JsonProperty("mode")
@@ -58,16 +59,16 @@ public class MergeLaunchesRQ {
 
 	@NotEmpty
 	@JsonProperty(value = "launches", required = true)
-	@ApiModelProperty(required = true)
+	@Schema(requiredMode = RequiredMode.REQUIRED)
 	private Set<Long> launches;
 
 	@JsonProperty(value = "endTime")
-	@ApiModelProperty
+	@Schema
 	private Date endTime;
 
 	@NotNull
 	@JsonProperty("mergeType")
-	@ApiModelProperty(allowableValues = "BASIC, DEEP")
+	@Schema(allowableValues = "BASIC, DEEP")
 	private String mergeStrategyType;
 
 	@JsonProperty(value = "extendSuitesDescription", required = true)
diff --git a/src/main/java/com/epam/ta/reportportal/model/launch/UpdateLaunchRQ.java b/src/main/java/com/epam/ta/reportportal/model/launch/UpdateLaunchRQ.java
index e8c6b34646..93a7b894e4 100644
--- a/src/main/java/com/epam/ta/reportportal/model/launch/UpdateLaunchRQ.java
+++ b/src/main/java/com/epam/ta/reportportal/model/launch/UpdateLaunchRQ.java
@@ -23,7 +23,7 @@
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonInclude.Include;
 import com.fasterxml.jackson.annotation.JsonProperty;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
 import java.util.Set;
 import javax.validation.Valid;
 import javax.validation.constraints.Size;
@@ -37,7 +37,7 @@
 public class UpdateLaunchRQ {
 
 	@JsonProperty("mode")
-	@ApiModelProperty(allowableValues = "DEFAULT, DEBUG")
+	@Schema(allowableValues = "DEFAULT, DEBUG")
 	private com.epam.ta.reportportal.ws.model.launch.Mode mode;
 
 	@JsonProperty("description")
diff --git a/src/main/java/com/epam/ta/reportportal/model/log/GetLogsUnderRq.java b/src/main/java/com/epam/ta/reportportal/model/log/GetLogsUnderRq.java
index bb849d5f5e..8f99ebdcb9 100644
--- a/src/main/java/com/epam/ta/reportportal/model/log/GetLogsUnderRq.java
+++ b/src/main/java/com/epam/ta/reportportal/model/log/GetLogsUnderRq.java
@@ -1,7 +1,7 @@
 package com.epam.ta.reportportal.model.log;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
 import java.util.List;
 import javax.validation.constraints.NotNull;
 
@@ -13,7 +13,7 @@ public class GetLogsUnderRq {
 
 	@NotNull
 	@JsonProperty(value = "logLevel")
-	@ApiModelProperty(allowableValues = "error, warn, info, debug, trace, fatal, unknown")
+	@Schema(allowableValues = "error, warn, info, debug, trace, fatal, unknown")
 	private String logLevel;
 
 	public GetLogsUnderRq() {
diff --git a/src/main/java/com/epam/ta/reportportal/model/log/LogResource.java b/src/main/java/com/epam/ta/reportportal/model/log/LogResource.java
index 9284cc95e6..b5b4655d58 100644
--- a/src/main/java/com/epam/ta/reportportal/model/log/LogResource.java
+++ b/src/main/java/com/epam/ta/reportportal/model/log/LogResource.java
@@ -19,7 +19,7 @@
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonInclude.Include;
 import com.fasterxml.jackson.annotation.JsonProperty;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
 import java.util.Date;
 import javax.validation.constraints.NotNull;
 
@@ -116,7 +116,7 @@ public String toString() {
 	private String thumbnail;
 
 	@JsonProperty(value = "level")
-	@ApiModelProperty(allowableValues = "error, warn, info, debug, trace, fatal, unknown")
+	@Schema(allowableValues = "error, warn, info, debug, trace, fatal, unknown")
 	private String level;
 
 	@JsonProperty(value = "itemId")
diff --git a/src/main/java/com/epam/ta/reportportal/model/log/SearchLogRq.java b/src/main/java/com/epam/ta/reportportal/model/log/SearchLogRq.java
index afadfd7a45..abce24c779 100644
--- a/src/main/java/com/epam/ta/reportportal/model/log/SearchLogRq.java
+++ b/src/main/java/com/epam/ta/reportportal/model/log/SearchLogRq.java
@@ -19,7 +19,7 @@
 import com.epam.ta.reportportal.ws.annotations.In;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
 import javax.validation.constraints.NotNull;
 
 /**
@@ -31,7 +31,7 @@ public class SearchLogRq {
 	@NotNull
 	@JsonProperty(value = "searchMode", required = true)
 	@In(allowedValues = { "launchName", "currentLaunch", "filer" })
-	@ApiModelProperty(allowableValues = "currentLaunch, launchName, filter")
+	@Schema(allowableValues = "currentLaunch, launchName, filter")
 	private String searchMode;
 
 	private Long filterId;
diff --git a/src/main/java/com/epam/ta/reportportal/model/project/CreateProjectRQ.java b/src/main/java/com/epam/ta/reportportal/model/project/CreateProjectRQ.java
index 43c511c17a..8d48eab4b5 100644
--- a/src/main/java/com/epam/ta/reportportal/model/project/CreateProjectRQ.java
+++ b/src/main/java/com/epam/ta/reportportal/model/project/CreateProjectRQ.java
@@ -23,7 +23,8 @@
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonInclude.Include;
 import com.fasterxml.jackson.annotation.JsonProperty;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
+import io.swagger.v3.oas.annotations.media.Schema.RequiredMode;
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.Pattern;
 import javax.validation.constraints.Size;
@@ -41,13 +42,13 @@ public class CreateProjectRQ {
 	@Pattern(regexp = PROJECT_NAME_REGEXP)
 	@Size(min = ValidationConstraints.MIN_NAME_LENGTH, max = ValidationConstraints.MAX_NAME_LENGTH)
 	@JsonProperty(value = "projectName", required = true)
-	@ApiModelProperty(required = true)
+	@Schema(requiredMode = RequiredMode.REQUIRED)
 	private String projectName;
 
 	@NotBlank
 	@JsonProperty(value = "entryType", required = true)
 	@In(allowedValues = "internal")
-	@ApiModelProperty(required = true, allowableValues = "INTERNAL")
+	@Schema(required = true, allowableValues = "INTERNAL")
 	private String entryType;
 
 	public String getProjectName() {
diff --git a/src/main/java/com/epam/ta/reportportal/model/project/DeleteProjectRQ.java b/src/main/java/com/epam/ta/reportportal/model/project/DeleteProjectRQ.java
index cb7777b33a..a11bd91491 100644
--- a/src/main/java/com/epam/ta/reportportal/model/project/DeleteProjectRQ.java
+++ b/src/main/java/com/epam/ta/reportportal/model/project/DeleteProjectRQ.java
@@ -21,7 +21,8 @@
 import com.epam.ta.reportportal.ws.model.ValidationConstraints;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
+import io.swagger.v3.oas.annotations.media.Schema.RequiredMode;
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.Pattern;
 import javax.validation.constraints.Size;
@@ -36,7 +37,7 @@ public class DeleteProjectRQ {
 	@JsonProperty(value = "projectName", required = true)
 	@Pattern(regexp = PROJECT_NAME_REGEXP)
 	@Size(min = ValidationConstraints.MIN_NAME_LENGTH, max = ValidationConstraints.MAX_NAME_LENGTH)
-	@ApiModelProperty(required = true)
+	@Schema(requiredMode = RequiredMode.REQUIRED)
 	private String projectName;
 
 	public String getProjectName() {
diff --git a/src/main/java/com/epam/ta/reportportal/model/project/UnassignUsersRQ.java b/src/main/java/com/epam/ta/reportportal/model/project/UnassignUsersRQ.java
index 8a64532c67..c15bc1c33f 100644
--- a/src/main/java/com/epam/ta/reportportal/model/project/UnassignUsersRQ.java
+++ b/src/main/java/com/epam/ta/reportportal/model/project/UnassignUsersRQ.java
@@ -19,7 +19,8 @@
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonInclude.Include;
 import com.fasterxml.jackson.annotation.JsonProperty;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
+import io.swagger.v3.oas.annotations.media.Schema.RequiredMode;
 import java.util.List;
 import javax.validation.constraints.NotEmpty;
 
@@ -33,7 +34,7 @@ public class UnassignUsersRQ {
 
 	@NotEmpty
 	@JsonProperty(value = "userNames", required = true)
-	@ApiModelProperty(required = true)
+	@Schema(requiredMode = RequiredMode.REQUIRED)
 	private List<String> usernames;
 
 	public void setUsernames(List<String> value) {
diff --git a/src/main/java/com/epam/ta/reportportal/model/project/config/CreateIssueSubTypeRQ.java b/src/main/java/com/epam/ta/reportportal/model/project/config/CreateIssueSubTypeRQ.java
index 07dea81248..4cc197956c 100644
--- a/src/main/java/com/epam/ta/reportportal/model/project/config/CreateIssueSubTypeRQ.java
+++ b/src/main/java/com/epam/ta/reportportal/model/project/config/CreateIssueSubTypeRQ.java
@@ -22,7 +22,8 @@
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonInclude.Include;
 import com.fasterxml.jackson.annotation.JsonProperty;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
+import io.swagger.v3.oas.annotations.media.Schema.RequiredMode;
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.Pattern;
 import javax.validation.constraints.Size;
@@ -37,25 +38,25 @@ public class CreateIssueSubTypeRQ {
 
 	@NotBlank
 	@JsonProperty(value = "typeRef", required = true)
-	@ApiModelProperty(required = true)
+	@Schema(requiredMode = RequiredMode.REQUIRED)
 	private String typeRef;
 
 	@NotBlank
 	@Size(min = ValidationConstraints.MIN_SUBTYPE_LONG_NAME, max = ValidationConstraints.MAX_SUBTYPE_LONG_NAME)
 	@JsonProperty(value = "longName", required = true)
-	@ApiModelProperty(required = true)
+	@Schema(requiredMode = RequiredMode.REQUIRED)
 	private String longName;
 
 	@NotBlank
 	@Size(min = ValidationConstraints.MIN_SUBTYPE_SHORT_NAME, max = ValidationConstraints.MAX_SUBTYPE_SHORT_NAME)
 	@JsonProperty(value = "shortName", required = true)
-	@ApiModelProperty(required = true)
+	@Schema(requiredMode = RequiredMode.REQUIRED)
 	private String shortName;
 
 	@NotBlank
 	@Pattern(regexp = HEX_COLOR_REGEXP)
 	@JsonProperty(value = "color", required = true)
-	@ApiModelProperty(required = true)
+	@Schema(requiredMode = RequiredMode.REQUIRED)
 	private String color;
 
 	public void setTypeRef(String typeRef) {
diff --git a/src/main/java/com/epam/ta/reportportal/model/project/config/UpdateIssueSubTypeRQ.java b/src/main/java/com/epam/ta/reportportal/model/project/config/UpdateIssueSubTypeRQ.java
index 53ffd5ff15..7e5b0f01f2 100644
--- a/src/main/java/com/epam/ta/reportportal/model/project/config/UpdateIssueSubTypeRQ.java
+++ b/src/main/java/com/epam/ta/reportportal/model/project/config/UpdateIssueSubTypeRQ.java
@@ -35,7 +35,8 @@
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonInclude.Include;
 import com.fasterxml.jackson.annotation.JsonProperty;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
+import io.swagger.v3.oas.annotations.media.Schema.RequiredMode;
 import java.util.List;
 import javax.validation.Valid;
 import javax.validation.constraints.NotEmpty;
@@ -51,7 +52,7 @@ public class UpdateIssueSubTypeRQ {
   @Valid
   @NotEmpty
   @JsonProperty(value = "ids", required = true)
-  @ApiModelProperty(required = true)
+  @Schema(requiredMode = RequiredMode.REQUIRED)
   private List<UpdateOneIssueSubTypeRQ> ids;
 
   public UpdateIssueSubTypeRQ() {
diff --git a/src/main/java/com/epam/ta/reportportal/model/project/config/UpdateOneIssueSubTypeRQ.java b/src/main/java/com/epam/ta/reportportal/model/project/config/UpdateOneIssueSubTypeRQ.java
index 20c5ed3e03..b15ce5403b 100644
--- a/src/main/java/com/epam/ta/reportportal/model/project/config/UpdateOneIssueSubTypeRQ.java
+++ b/src/main/java/com/epam/ta/reportportal/model/project/config/UpdateOneIssueSubTypeRQ.java
@@ -21,7 +21,8 @@
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonInclude.Include;
 import com.fasterxml.jackson.annotation.JsonProperty;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
+import io.swagger.v3.oas.annotations.media.Schema.RequiredMode;
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.Pattern;
 import javax.validation.constraints.Size;
@@ -36,12 +37,12 @@ public class UpdateOneIssueSubTypeRQ {
 
 	@NotBlank
 	@JsonProperty(value = "locator", required = true)
-	@ApiModelProperty(required = true)
+	@Schema(requiredMode = RequiredMode.REQUIRED)
 	private String locator;
 
 	@NotBlank
 	@JsonProperty(value = "typeRef", required = true)
-	@ApiModelProperty(required = true)
+	@Schema(requiredMode = RequiredMode.REQUIRED)
 	private String typeRef;
 
 	@NotBlank
diff --git a/src/main/java/com/epam/ta/reportportal/model/project/email/SenderCaseDTO.java b/src/main/java/com/epam/ta/reportportal/model/project/email/SenderCaseDTO.java
index fcd8572337..89ed310df9 100644
--- a/src/main/java/com/epam/ta/reportportal/model/project/email/SenderCaseDTO.java
+++ b/src/main/java/com/epam/ta/reportportal/model/project/email/SenderCaseDTO.java
@@ -22,7 +22,7 @@
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonInclude.Include;
 import com.fasterxml.jackson.annotation.JsonProperty;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
 import java.io.Serializable;
 import java.util.List;
 import java.util.Objects;
@@ -58,7 +58,7 @@ public class SenderCaseDTO implements Serializable {
 	@NotBlank
 	@JsonProperty(value = "sendCase")
 	@In(allowedValues = { "always", "failed", "toInvestigate", "more10", "more20", "more50" })
-	@ApiModelProperty(allowableValues = "ALWAYS, FAILED, MORE_10, MORE_20, MORE_50")
+	@Schema(allowableValues = "ALWAYS, FAILED, MORE_10, MORE_20, MORE_50")
 	private String sendCase;
 
 	@NotBlankStringCollection
@@ -75,7 +75,7 @@ public class SenderCaseDTO implements Serializable {
 	@NotBlank
 	@JsonProperty(value = "attributesOperator")
 	@In(allowedValues = { "and", "or" })
-	@ApiModelProperty(allowableValues = "AND, OR")
+	@Schema(allowableValues = "AND, OR")
 	private String attributesOperator;
 
 	public SenderCaseDTO() {
diff --git a/src/main/java/com/epam/ta/reportportal/model/user/CreateUserRQ.java b/src/main/java/com/epam/ta/reportportal/model/user/CreateUserRQ.java
index 4865906963..69bf6932a7 100644
--- a/src/main/java/com/epam/ta/reportportal/model/user/CreateUserRQ.java
+++ b/src/main/java/com/epam/ta/reportportal/model/user/CreateUserRQ.java
@@ -20,7 +20,8 @@
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonInclude.Include;
 import com.fasterxml.jackson.annotation.JsonProperty;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
+import io.swagger.v3.oas.annotations.media.Schema.RequiredMode;
 import javax.validation.constraints.NotBlank;
 
 /**
@@ -33,18 +34,18 @@ public class CreateUserRQ {
 
 	@NotBlank
 	@JsonProperty(value = "email", required = true)
-	@ApiModelProperty(required = true)
+	@Schema(requiredMode = RequiredMode.REQUIRED)
 	private String email;
 
 	@NotBlank
 	@JsonProperty(value = "role", required = true)
 	@In(allowedValues = { "operator", "customer", "member", "project_manager" })
-	@ApiModelProperty(required = true)
+	@Schema(requiredMode = RequiredMode.REQUIRED)
 	private String role;
 
 	@NotBlank
 	@JsonProperty(value = "defaultProject", required = true)
-	@ApiModelProperty(required = true)
+	@Schema(requiredMode = RequiredMode.REQUIRED)
 	private String defaultProject;
 
 	public String getEmail() {
diff --git a/src/main/java/com/epam/ta/reportportal/model/user/CreateUserRQConfirm.java b/src/main/java/com/epam/ta/reportportal/model/user/CreateUserRQConfirm.java
index a664b0f0c6..f5b0778a42 100644
--- a/src/main/java/com/epam/ta/reportportal/model/user/CreateUserRQConfirm.java
+++ b/src/main/java/com/epam/ta/reportportal/model/user/CreateUserRQConfirm.java
@@ -20,7 +20,8 @@
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonInclude.Include;
 import com.fasterxml.jackson.annotation.JsonProperty;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
+import io.swagger.v3.oas.annotations.media.Schema.RequiredMode;
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.Pattern;
 import javax.validation.constraints.Size;
@@ -37,25 +38,25 @@ public class CreateUserRQConfirm {
 	@Pattern(regexp = "[a-zA-Z0-9-_.]+")
 	@Size(min = ValidationConstraints.MIN_LOGIN_LENGTH, max = ValidationConstraints.MAX_LOGIN_LENGTH)
 	@JsonProperty(value = "login", required = true)
-	@ApiModelProperty(required = true)
+	@Schema(requiredMode = RequiredMode.REQUIRED)
 	private String login;
 
 	@NotBlank
 	@Size(min = ValidationConstraints.MIN_PASSWORD_LENGTH, max = ValidationConstraints.MAX_PASSWORD_LENGTH)
 	@JsonProperty(value = "password", required = true)
-	@ApiModelProperty(required = true)
+	@Schema(requiredMode = RequiredMode.REQUIRED)
 	private String password;
 
 	@NotBlank
 	@Pattern(regexp = "[\\pL0-9-_ \\.]+")
 	@Size(min = ValidationConstraints.MIN_USER_NAME_LENGTH, max = ValidationConstraints.MAX_USER_NAME_LENGTH)
 	@JsonProperty(value = "fullName", required = true)
-	@ApiModelProperty(required = true)
+	@Schema(requiredMode = RequiredMode.REQUIRED)
 	private String fullName;
 
 	@NotBlank
 	@JsonProperty(value = "email", required = true)
-	@ApiModelProperty(required = true)
+	@Schema(requiredMode = RequiredMode.REQUIRED)
 	private String email;
 
 	public void setLogin(String value) {
diff --git a/src/main/java/com/epam/ta/reportportal/model/user/CreateUserRQFull.java b/src/main/java/com/epam/ta/reportportal/model/user/CreateUserRQFull.java
index 36f30d779c..b8df47c607 100644
--- a/src/main/java/com/epam/ta/reportportal/model/user/CreateUserRQFull.java
+++ b/src/main/java/com/epam/ta/reportportal/model/user/CreateUserRQFull.java
@@ -21,7 +21,8 @@
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonInclude.Include;
 import com.fasterxml.jackson.annotation.JsonProperty;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
+import io.swagger.v3.oas.annotations.media.Schema.RequiredMode;
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotNull;
 import javax.validation.constraints.Pattern;
@@ -39,42 +40,42 @@ public class CreateUserRQFull {
 	@Pattern(regexp = "[a-zA-Z0-9-_.]+")
 	@Size(min = ValidationConstraints.MIN_LOGIN_LENGTH, max = ValidationConstraints.MAX_LOGIN_LENGTH)
 	@JsonProperty(value = "login", required = true)
-	@ApiModelProperty(required = true)
+	@Schema(requiredMode = RequiredMode.REQUIRED)
 	private String login;
 
 	@NotBlank
 	@Size(min = ValidationConstraints.MIN_PASSWORD_LENGTH, max = ValidationConstraints.MAX_PASSWORD_LENGTH)
 	@JsonProperty(value = "password", required = true)
-	@ApiModelProperty(required = true)
+	@Schema(requiredMode = RequiredMode.REQUIRED)
 	private String password;
 
 	@NotBlank
 	@Pattern(regexp = "[\\pL0-9-_ \\.]+")
 	@Size(min = ValidationConstraints.MIN_USER_NAME_LENGTH, max = ValidationConstraints.MAX_USER_NAME_LENGTH)
 	@JsonProperty(value = "fullName", required = true)
-	@ApiModelProperty(required = true)
+	@Schema(requiredMode = RequiredMode.REQUIRED)
 	private String fullName;
 
 	@NotBlank
 	@JsonProperty(value = "email", required = true)
-	@ApiModelProperty(required = true)
+	@Schema(requiredMode = RequiredMode.REQUIRED)
 	private String email;
 
 	@NotNull
 	@JsonProperty(value = "accountRole", required = true)
 	@In(allowedValues = { "user", "administrator" })
-	@ApiModelProperty(required = true, allowableValues = "USER, ADMINISTRATOR")
+	@Schema(required = true, allowableValues = "USER, ADMINISTRATOR")
 	private String accountRole;
 
 	@NotNull
 	@JsonProperty(value = "projectRole", required = true)
 	@In(allowedValues = { "operator", "customer", "member", "project_manager" })
-	@ApiModelProperty(required = true, allowableValues = "CUSTOMER, MEMBER, LEAD, PROJECT_MANAGER")
+	@Schema(required = true, allowableValues = "CUSTOMER, MEMBER, LEAD, PROJECT_MANAGER")
 	private String projectRole;
 
 	@NotBlank
 	@JsonProperty(value = "defaultProject", required = true)
-	@ApiModelProperty(required = true)
+	@Schema(requiredMode = RequiredMode.REQUIRED)
 	private String defaultProject;
 
 	public void setLogin(String value) {
diff --git a/src/main/java/com/epam/ta/reportportal/model/user/ResetPasswordRQ.java b/src/main/java/com/epam/ta/reportportal/model/user/ResetPasswordRQ.java
index 4e5addde48..6e58be026f 100644
--- a/src/main/java/com/epam/ta/reportportal/model/user/ResetPasswordRQ.java
+++ b/src/main/java/com/epam/ta/reportportal/model/user/ResetPasswordRQ.java
@@ -19,7 +19,8 @@
 import com.epam.ta.reportportal.ws.model.ValidationConstraints;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
+import io.swagger.v3.oas.annotations.media.Schema.RequiredMode;
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.Size;
 
@@ -32,12 +33,12 @@ public class ResetPasswordRQ {
 	@NotBlank
 	@Size(min = ValidationConstraints.MIN_PASSWORD_LENGTH, max = ValidationConstraints.MAX_PASSWORD_LENGTH)
 	@JsonProperty(value = "password")
-	@ApiModelProperty(required = true)
+	@Schema(requiredMode = RequiredMode.REQUIRED)
 	private String password;
 
 	@NotBlank
 	@JsonProperty(value = "uuid")
-	@ApiModelProperty(required = true)
+	@Schema(requiredMode = RequiredMode.REQUIRED)
 	private String uuid;
 
 	public String getPassword() {
diff --git a/src/main/java/com/epam/ta/reportportal/model/user/RestorePasswordRQ.java b/src/main/java/com/epam/ta/reportportal/model/user/RestorePasswordRQ.java
index 8707e8756a..1b6dca8689 100644
--- a/src/main/java/com/epam/ta/reportportal/model/user/RestorePasswordRQ.java
+++ b/src/main/java/com/epam/ta/reportportal/model/user/RestorePasswordRQ.java
@@ -18,7 +18,8 @@
 
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
+import io.swagger.v3.oas.annotations.media.Schema.RequiredMode;
 import javax.validation.constraints.NotBlank;
 
 /**
@@ -29,7 +30,7 @@ public class RestorePasswordRQ {
 
 	@NotBlank
 	@JsonProperty(value = "email")
-	@ApiModelProperty(required = true)
+	@Schema(requiredMode = RequiredMode.REQUIRED)
 	private String email;
 
 	public String getEmail() {
diff --git a/src/main/java/com/epam/ta/reportportal/model/widget/WidgetPreviewRQ.java b/src/main/java/com/epam/ta/reportportal/model/widget/WidgetPreviewRQ.java
index fb350436bb..c5a0a5b62a 100644
--- a/src/main/java/com/epam/ta/reportportal/model/widget/WidgetPreviewRQ.java
+++ b/src/main/java/com/epam/ta/reportportal/model/widget/WidgetPreviewRQ.java
@@ -20,7 +20,7 @@
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonInclude.Include;
 import com.fasterxml.jackson.annotation.JsonProperty;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
 import java.util.List;
 import javax.validation.Valid;
 import javax.validation.constraints.NotNull;
@@ -41,7 +41,7 @@ public class WidgetPreviewRQ {
       "activityStream", "launchesComparisonChart", "launchesDurationChart", "launchesTable",
       "topTestCases", "flakyTestCases", "passingRateSummary", "passingRatePerLaunch",
       "productStatus", "mostTimeConsuming", "cumulative" })
-  @ApiModelProperty(required = true, allowableValues =
+  @Schema(required = true, allowableValues =
       "oldLineChart, investigatedTrend, launchStatistics, statisticTrend,"
           + " casesTrend, notPassed, overallStatistics, uniqueBugTable, bugTrend, activityStream, launchesComparisonChart,"
           + " launchesDurationChart, launchesTable, topTestCases, flakyTestCases, passingRateSummary, passingRatePerLaunch,"
diff --git a/src/main/java/com/epam/ta/reportportal/model/widget/WidgetRQ.java b/src/main/java/com/epam/ta/reportportal/model/widget/WidgetRQ.java
index fe4aeda894..b05059a328 100644
--- a/src/main/java/com/epam/ta/reportportal/model/widget/WidgetRQ.java
+++ b/src/main/java/com/epam/ta/reportportal/model/widget/WidgetRQ.java
@@ -24,7 +24,7 @@
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonInclude.Include;
 import com.fasterxml.jackson.annotation.JsonProperty;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
 import java.util.List;
 import javax.validation.Valid;
 import javax.validation.constraints.NotNull;
@@ -51,7 +51,7 @@ public class WidgetRQ extends BaseEntityRQ {
       "topTestCases", "flakyTestCases", "passingRateSummary", "passingRatePerLaunch",
       "productStatus", "mostTimeConsuming", "cumulative", "topPatternTemplates",
       "componentHealthCheck", "componentHealthCheckTable" })
-  @ApiModelProperty(required = true, allowableValues =
+  @Schema(required = true, allowableValues =
       "oldLineChart, investigatedTrend, launchStatistics, statisticTrend,"
           + " casesTrend, notPassed, overallStatistics, uniqueBugTable, bugTrend, activityStream, launchesComparisonChart,"
           + " launchesDurationChart, launchesTable, topTestCases, flakyTestCases, passingRateSummary, passingRatePerLaunch,"
diff --git a/src/main/java/com/epam/ta/reportportal/model/widget/WidgetResource.java b/src/main/java/com/epam/ta/reportportal/model/widget/WidgetResource.java
index 11d6f9fb0a..1231be11ff 100644
--- a/src/main/java/com/epam/ta/reportportal/model/widget/WidgetResource.java
+++ b/src/main/java/com/epam/ta/reportportal/model/widget/WidgetResource.java
@@ -20,7 +20,7 @@
 import com.epam.ta.reportportal.ws.model.OwnedResource;
 import com.epam.ta.reportportal.ws.model.ValidationConstraints;
 import com.fasterxml.jackson.annotation.JsonProperty;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
 import java.util.List;
 import java.util.Map;
 import javax.validation.Valid;
@@ -44,7 +44,7 @@ public class WidgetResource extends OwnedResource {
 
   @NotNull
   @JsonProperty(value = "widgetType", required = true)
-  @ApiModelProperty(required = true, allowableValues =
+  @Schema(required = true, allowableValues =
       "oldLineChart, investigatedTrend, launchStatistics, statisticTrend,"
           + " casesTrend, notPassed, overallStatistics, uniqueBugTable, bugTrend, activityStream, launchesComparisonChart,"
           + " launchesDurationChart, launchesTable, topTestCases, flakyTestCases, passingRateSummary, passingRatePerLaunch,"
diff --git a/src/main/java/com/epam/ta/reportportal/ws/controller/ActivityController.java b/src/main/java/com/epam/ta/reportportal/ws/controller/ActivityController.java
index 20a093a88d..7f7f600246 100644
--- a/src/main/java/com/epam/ta/reportportal/ws/controller/ActivityController.java
+++ b/src/main/java/com/epam/ta/reportportal/ws/controller/ActivityController.java
@@ -29,7 +29,8 @@
  import com.epam.ta.reportportal.ws.model.ActivityResource;
  import com.epam.ta.reportportal.ws.resolver.FilterFor;
  import com.epam.ta.reportportal.ws.resolver.SortFor;
- import io.swagger.annotations.ApiOperation;
+ import io.swagger.v3.oas.annotations.Operation;
+ import io.swagger.v3.oas.annotations.tags.Tag;
  import org.springframework.beans.factory.annotation.Autowired;
  import org.springframework.data.domain.Pageable;
  import org.springframework.security.access.prepost.PreAuthorize;
@@ -48,6 +49,7 @@
  @RequestMapping("/v1/{projectName}/activity")
  @Transactional(readOnly = true)
  @PreAuthorize(ASSIGNED_TO_PROJECT)
+ @Tag(name = "activity-controller", description = "Activity Controller")
  public class ActivityController {
 
    private final ActivityHandler activityHandler;
@@ -71,7 +73,7 @@ public ActivityResource getActivity(@PathVariable String projectName,
 
    @RequestMapping(value = "/item/{itemId}", method = RequestMethod.GET)
    @ResponseStatus(OK)
-   @ApiOperation("Get activities for test item")
+   @Operation(summary =  "Get activities for test item")
    public Iterable<ActivityEventResource> getTestItemActivities(@PathVariable String projectName,
        @PathVariable Long itemId, @FilterFor(Activity.class) Filter filter,
        @SortFor(Activity.class) Pageable pageable, @AuthenticationPrincipal ReportPortalUser user) {
diff --git a/src/main/java/com/epam/ta/reportportal/ws/controller/ActivityEventController.java b/src/main/java/com/epam/ta/reportportal/ws/controller/ActivityEventController.java
index 79931aa40d..276bb655fd 100644
--- a/src/main/java/com/epam/ta/reportportal/ws/controller/ActivityEventController.java
+++ b/src/main/java/com/epam/ta/reportportal/ws/controller/ActivityEventController.java
@@ -30,7 +30,8 @@
 import com.epam.ta.reportportal.model.SearchCriteriaRQ;
 import com.epam.ta.reportportal.util.ProjectExtractor;
 import com.epam.ta.reportportal.ws.resolver.FilterCriteriaResolver;
-import io.swagger.annotations.ApiOperation;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.tags.Tag;
 import java.util.List;
 import javax.validation.constraints.Max;
 import javax.validation.constraints.Min;
@@ -57,6 +58,7 @@
 @Validated
 @RestController
 @RequestMapping("/v1/activities")
+@Tag(name = "activity-event-controller", description = "Activity Event Controller")
 public class ActivityEventController {
 
   private final ActivityEventHandler activityEventHandler;
@@ -83,7 +85,7 @@ public ActivityEventController(ActivityEventHandler activityEventHandler,
    */
   @PreAuthorize(ADMIN_ONLY)
   @PostMapping("/searches")
-  @ApiOperation("Get activities by search criteria")
+  @Operation(summary = "Get activities by search criteria")
   public PagedResponse<ActivityEventResource> getActivities(
       @RequestParam @Min(0) @Max(300) int limit, @RequestParam @Min(0) int offset,
       @RequestParam Direction order, @RequestParam String sort,
@@ -101,7 +103,7 @@ public PagedResponse<ActivityEventResource> getActivities(
 
   @GetMapping("/{projectName}/subjectName")
   @PreAuthorize(ADMIN_ONLY)
-  @ApiOperation(value = "Load project activities subjectNames by filter", notes = "Only for current project")
+  @Operation(summary =  "Load project activities subjectNames by filter", description = "Only for current project")
   public List<String> getProjectSubjectName(@PathVariable String projectName,
       @RequestParam(FilterCriteriaResolver.DEFAULT_FILTER_PREFIX + Condition.CNT + "subjectName")
       String value, @AuthenticationPrincipal ReportPortalUser user) {
diff --git a/src/main/java/com/epam/ta/reportportal/ws/controller/BugTrackingSystemController.java b/src/main/java/com/epam/ta/reportportal/ws/controller/BugTrackingSystemController.java
index 82a0c12a6f..6de8f240a9 100644
--- a/src/main/java/com/epam/ta/reportportal/ws/controller/BugTrackingSystemController.java
+++ b/src/main/java/com/epam/ta/reportportal/ws/controller/BugTrackingSystemController.java
@@ -27,7 +27,8 @@
 import com.epam.ta.reportportal.ws.model.externalsystem.PostFormField;
 import com.epam.ta.reportportal.ws.model.externalsystem.PostTicketRQ;
 import com.epam.ta.reportportal.ws.model.externalsystem.Ticket;
-import io.swagger.annotations.ApiOperation;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.tags.Tag;
 import java.util.List;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpStatus;
@@ -52,6 +53,7 @@
  */
 @RestController
 @RequestMapping("/v1/bts")
+@Tag(name = "bug-tracking-system-controller", description = "Bug Tracking System Controller")
 public class BugTrackingSystemController {
 
   private final ProjectExtractor projectExtractor;
@@ -69,7 +71,7 @@ public BugTrackingSystemController(ProjectExtractor projectExtractor,
   @Transactional(readOnly = true)
   @GetMapping(value = "/{projectName}/{integrationId}/fields-set")
   @ResponseStatus(HttpStatus.OK)
-  @ApiOperation("Get list of fields required for posting ticket in concrete integration")
+  @Operation(summary = "Get list of fields required for posting ticket in concrete integration")
   @PreAuthorize(PROJECT_MANAGER)
   public List<PostFormField> getSetOfIntegrationSystemFields(
       @RequestParam(value = "issueType") String issuetype,
@@ -84,7 +86,7 @@ public List<PostFormField> getSetOfIntegrationSystemFields(
   @Transactional(readOnly = true)
   @GetMapping(value = "/{projectName}/{integrationId}/issue_types")
   @ResponseStatus(HttpStatus.OK)
-  @ApiOperation("Get list of allowable issue types for bug tracking system")
+  @Operation(summary = "Get list of allowable issue types for bug tracking system")
   @PreAuthorize(PROJECT_MANAGER)
   public List<String> getAllowableIssueTypes(@PathVariable String projectName,
       @PathVariable Long integrationId,
@@ -96,7 +98,7 @@ public List<String> getAllowableIssueTypes(@PathVariable String projectName,
   @Transactional(readOnly = true)
   @GetMapping(value = "/{integrationId}/fields-set")
   @ResponseStatus(HttpStatus.OK)
-  @ApiOperation("Get list of fields required for posting ticket")
+  @Operation(summary = "Get list of fields required for posting ticket")
   @PreAuthorize(ADMIN_ONLY)
   public List<PostFormField> getSetOfIntegrationSystemFields(
       @RequestParam(value = "issueType") String issueType,
@@ -107,7 +109,7 @@ public List<PostFormField> getSetOfIntegrationSystemFields(
   @Transactional(readOnly = true)
   @GetMapping(value = "/{integrationId}/issue_types")
   @ResponseStatus(HttpStatus.OK)
-  @ApiOperation("Get list of existed issue types in bts")
+  @Operation(summary = "Get list of existed issue types in bts")
   @PreAuthorize(ADMIN_ONLY)
   public List<String> getAllowableIssueTypes(@PathVariable Long integrationId,
       @AuthenticationPrincipal ReportPortalUser user) {
@@ -117,7 +119,7 @@ public List<String> getAllowableIssueTypes(@PathVariable Long integrationId,
   @Transactional
   @PostMapping(value = "/{projectName}/{integrationId}/ticket")
   @ResponseStatus(HttpStatus.CREATED)
-  @ApiOperation("Post ticket to the bts integration")
+  @Operation(summary = "Post ticket to the bts integration")
   public Ticket createIssue(@Validated @RequestBody PostTicketRQ ticketRQ,
       @PathVariable String projectName,
       @PathVariable Long integrationId, @AuthenticationPrincipal ReportPortalUser user) {
@@ -131,7 +133,7 @@ public Ticket createIssue(@Validated @RequestBody PostTicketRQ ticketRQ,
   @Transactional(readOnly = true)
   @GetMapping(value = "/{projectName}/ticket/{ticketId}")
   @ResponseStatus(HttpStatus.OK)
-  @ApiOperation("Get ticket from the bts integration")
+  @Operation(summary = "Get ticket from the bts integration")
   public Ticket getTicket(@PathVariable String ticketId, @PathVariable String projectName,
       @RequestParam(value = "btsUrl") String btsUrl,
       @RequestParam(value = "btsProject") String btsProject,
diff --git a/src/main/java/com/epam/ta/reportportal/ws/controller/DashboardController.java b/src/main/java/com/epam/ta/reportportal/ws/controller/DashboardController.java
index 3132b143ba..204b4bfc19 100644
--- a/src/main/java/com/epam/ta/reportportal/ws/controller/DashboardController.java
+++ b/src/main/java/com/epam/ta/reportportal/ws/controller/DashboardController.java
@@ -36,7 +36,8 @@
 import com.epam.ta.reportportal.ws.model.OperationCompletionRS;
 import com.epam.ta.reportportal.ws.resolver.FilterFor;
 import com.epam.ta.reportportal.ws.resolver.SortFor;
-import io.swagger.annotations.ApiOperation;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.tags.Tag;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.Pageable;
 import org.springframework.security.access.prepost.PreAuthorize;
@@ -59,6 +60,7 @@
 @RestController
 @PreAuthorize(ASSIGNED_TO_PROJECT)
 @RequestMapping("/v1/{projectName}/dashboard")
+@Tag(name = "dashboard-controller", description = "Dashboard Controller")
 public class DashboardController {
 
   private final ProjectExtractor projectExtractor;
@@ -81,7 +83,7 @@ public DashboardController(ProjectExtractor projectExtractor,
   @Transactional
   @PostMapping
   @ResponseStatus(CREATED)
-  @ApiOperation("Create dashboard for specified project")
+  @Operation(summary = "Create dashboard for specified project")
   public EntryCreatedRS createDashboard(@PathVariable String projectName,
       @RequestBody @Validated CreateDashboardRQ createRQ,
       @AuthenticationPrincipal ReportPortalUser user) {
@@ -92,7 +94,7 @@ public EntryCreatedRS createDashboard(@PathVariable String projectName,
   @Transactional(readOnly = true)
   @GetMapping
   @ResponseStatus(OK)
-  @ApiOperation("Get all permitted dashboard resources for specified project")
+  @Operation(summary = "Get all permitted dashboard resources for specified project")
   public Iterable<DashboardResource> getAllDashboards(@PathVariable String projectName,
       @SortFor(Dashboard.class) Pageable pageable, @FilterFor(Dashboard.class) Filter filter,
       @AuthenticationPrincipal ReportPortalUser user) {
@@ -103,7 +105,7 @@ public Iterable<DashboardResource> getAllDashboards(@PathVariable String project
   @Transactional
   @PutMapping("/{dashboardId}/add")
   @ResponseStatus(OK)
-  @ApiOperation("Add widget to specified dashboard")
+  @Operation(summary = "Add widget to specified dashboard")
   public OperationCompletionRS addWidget(@PathVariable String projectName,
       @PathVariable Long dashboardId, @RequestBody @Validated AddWidgetRq addWidgetRq,
       @AuthenticationPrincipal ReportPortalUser user) {
@@ -114,7 +116,7 @@ public OperationCompletionRS addWidget(@PathVariable String projectName,
   @Transactional
   @DeleteMapping("/{dashboardId}/{widgetId}")
   @ResponseStatus(OK)
-  @ApiOperation("Remove widget from specified dashboard")
+  @Operation(summary = "Remove widget from specified dashboard")
   public OperationCompletionRS removeWidget(@PathVariable String projectName,
       @PathVariable Long dashboardId, @PathVariable Long widgetId,
       @AuthenticationPrincipal ReportPortalUser user) {
@@ -125,7 +127,7 @@ public OperationCompletionRS removeWidget(@PathVariable String projectName,
   @Transactional
   @PutMapping(value = "/{dashboardId}")
   @ResponseStatus(OK)
-  @ApiOperation("Update specified dashboard for specified project")
+  @Operation(summary = "Update specified dashboard for specified project")
   public OperationCompletionRS updateDashboard(@PathVariable String projectName,
       @PathVariable Long dashboardId, @RequestBody @Validated UpdateDashboardRQ updateRQ,
       @AuthenticationPrincipal ReportPortalUser user) {
@@ -136,7 +138,7 @@ public OperationCompletionRS updateDashboard(@PathVariable String projectName,
   @Transactional
   @DeleteMapping(value = "/{dashboardId}")
   @ResponseStatus(OK)
-  @ApiOperation("Delete specified dashboard by ID for specified project")
+  @Operation(summary = "Delete specified dashboard by ID for specified project")
   public OperationCompletionRS deleteDashboard(@PathVariable String projectName,
       @PathVariable Long dashboardId, @AuthenticationPrincipal ReportPortalUser user) {
     return deleteDashboardHandler.deleteDashboard(
@@ -146,7 +148,7 @@ public OperationCompletionRS deleteDashboard(@PathVariable String projectName,
   @Transactional
   @GetMapping(value = "/{dashboardId}")
   @ResponseStatus(OK)
-  @ApiOperation("Get specified dashboard by ID for specified project")
+  @Operation(summary = "Get specified dashboard by ID for specified project")
   public DashboardResource getDashboard(@PathVariable String projectName,
       @PathVariable Long dashboardId, @AuthenticationPrincipal ReportPortalUser user) {
     return getDashboardHandler.getDashboard(
diff --git a/src/main/java/com/epam/ta/reportportal/ws/controller/DeprecatedUserController.java b/src/main/java/com/epam/ta/reportportal/ws/controller/DeprecatedUserController.java
index e5de7fc2bf..a9add062ff 100644
--- a/src/main/java/com/epam/ta/reportportal/ws/controller/DeprecatedUserController.java
+++ b/src/main/java/com/epam/ta/reportportal/ws/controller/DeprecatedUserController.java
@@ -39,9 +39,10 @@
 import com.epam.ta.reportportal.ws.resolver.FilterFor;
 import com.epam.ta.reportportal.ws.resolver.ResponseView;
 import com.epam.ta.reportportal.ws.resolver.SortFor;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.ApiParam;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.media.Schema;
+import io.swagger.v3.oas.annotations.tags.Tag;
 import java.util.Map;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
@@ -67,7 +68,7 @@
 @RestController
 @RequestMapping("/v1/user")
 @Deprecated
-@Api(tags = "deprecated-user-controller", hidden = false, description = "Deprecated UserController")
+@Tag(name = "deprecated-user-controller", description = "Deprecated User Controller")
 public class DeprecatedUserController extends UserController {
 
   @Autowired
@@ -85,7 +86,7 @@ public DeprecatedUserController(CreateUserHandler createUserMessageHandler,
   @PostMapping
   @ResponseStatus(CREATED)
   @PreAuthorize(ADMIN_ONLY)
-  @ApiOperation(value = "Create specified user (DEPRECATED)", notes = "Allowable only for users with administrator role")
+  @Operation(summary =  "Create specified user (DEPRECATED)", description = "Allowable only for users with administrator role")
   public CreateUserRS createUserByAdmin(@RequestBody @Validated CreateUserRQFull rq,
       @AuthenticationPrincipal ReportPortalUser currentUser, HttpServletRequest request) {
     return super.createUserByAdmin(rq, currentUser, request);
@@ -95,7 +96,7 @@ public CreateUserRS createUserByAdmin(@RequestBody @Validated CreateUserRQFull r
   @PostMapping(value = "/bid")
   @ResponseStatus(CREATED)
   @PreAuthorize("(hasPermission(#createUserRQ.getDefaultProject(), 'projectManagerPermission')) || hasRole('ADMINISTRATOR')")
-  @ApiOperation("Register invitation for user who will be created (DEPRECATED)")
+  @Operation(summary = "Register invitation for user who will be created (DEPRECATED)")
   public CreateUserBidRS createUserBid(@RequestBody @Validated CreateUserRQ createUserRQ,
       @AuthenticationPrincipal ReportPortalUser currentUser, HttpServletRequest request) {
     return super.createUserBid(createUserRQ, currentUser, request);
@@ -103,7 +104,7 @@ public CreateUserBidRS createUserBid(@RequestBody @Validated CreateUserRQ create
 
   @PostMapping(value = "/registration")
   @ResponseStatus(CREATED)
-  @ApiOperation("Activate invitation and create user in system (DEPRECATED)")
+  @Operation(summary = "Activate invitation and create user in system (DEPRECATED)")
   public CreateUserRS createUser(@RequestBody @Validated CreateUserRQConfirm request,
       @RequestParam(value = "uuid") String uuid) {
     return super.createUser(request, uuid);
@@ -111,13 +112,13 @@ public CreateUserRS createUser(@RequestBody @Validated CreateUserRQConfirm reque
 
   @Transactional(readOnly = true)
   @GetMapping(value = "/registration")
-  @ApiOperation(value = "Get user's registration info (DEPRECATED)")
+  @Operation(summary =  "Get user's registration info (DEPRECATED)")
   public UserBidRS getUserBidInfo(@RequestParam(value = "uuid") String uuid) {
     return super.getUserBidInfo(uuid);
   }
 
   @DeleteMapping(value = "/{id}")
-  @ApiOperation(value = "Delete specified user (DEPRECATED)")
+  @Operation(summary =  "Delete specified user (DEPRECATED)")
   public OperationCompletionRS deleteUser(@PathVariable(value = "id") Long userId,
       @AuthenticationPrincipal ReportPortalUser currentUser) {
     return super.deleteUser(userId, currentUser);
@@ -126,7 +127,7 @@ public OperationCompletionRS deleteUser(@PathVariable(value = "id") Long userId,
   @DeleteMapping
   @PreAuthorize(ADMIN_ONLY)
   @ResponseStatus(OK)
-  @ApiOperation("Delete specified users by ids (DEPRECATED)")
+  @Operation(summary = "Delete specified users by ids (DEPRECATED)")
   public DeleteBulkRS deleteUsers(@RequestBody @Valid DeleteBulkRQ deleteBulkRQ,
       @AuthenticationPrincipal ReportPortalUser user) {
     return super.deleteUsers(deleteBulkRQ, user);
@@ -135,7 +136,7 @@ public DeleteBulkRS deleteUsers(@RequestBody @Valid DeleteBulkRQ deleteBulkRQ,
   @Transactional
   @PutMapping(value = "/{login}")
   @PreAuthorize(ALLOWED_TO_EDIT_USER)
-  @ApiOperation(value = "Edit specified user (DEPRECATED)", notes = "Only for administrators and profile's owner")
+  @Operation(summary =  "Edit specified user (DEPRECATED)", description = "Only for administrators and profile's owner")
   public OperationCompletionRS editUser(@PathVariable String login,
       @RequestBody @Validated EditUserRQ editUserRQ, @ActiveRole UserRole role,
       @AuthenticationPrincipal ReportPortalUser currentUser) {
@@ -146,7 +147,7 @@ public OperationCompletionRS editUser(@PathVariable String login,
   @GetMapping(value = "/{login}")
   @ResponseView(ModelViews.FullUserView.class)
   @PreAuthorize(ALLOWED_TO_EDIT_USER)
-  @ApiOperation(value = "Return information about specified user (DEPRECATED)", notes = "Only for administrators and profile's owner")
+  @Operation(summary =  "Return information about specified user (DEPRECATED)", description = "Only for administrators and profile's owner")
   public UserResource getUser(@PathVariable String login,
       @AuthenticationPrincipal ReportPortalUser currentUser) {
     return super.getUser(login, currentUser);
@@ -154,7 +155,7 @@ public UserResource getUser(@PathVariable String login,
 
   @Transactional(readOnly = true)
   @GetMapping(value = { "", "/" })
-  @ApiOperation("Return information about current logged-in user (DEPRECATED)")
+  @Operation(summary = "Return information about current logged-in user (DEPRECATED)")
   public UserResource getMyself(@AuthenticationPrincipal ReportPortalUser currentUser) {
     return super.getMyself(currentUser);
   }
@@ -163,7 +164,7 @@ public UserResource getMyself(@AuthenticationPrincipal ReportPortalUser currentU
   @GetMapping(value = "/all")
   @ResponseView(ModelViews.FullUserView.class)
   @PreAuthorize(ADMIN_ONLY)
-  @ApiOperation(value = "Return information about all users (DEPRECATED)", notes = "Allowable only for users with administrator role")
+  @Operation(summary =  "Return information about all users (DEPRECATED)", description = "Allowable only for users with administrator role")
   public Iterable<UserResource> getUsers(@FilterFor(User.class) Filter filter,
       @SortFor(User.class) Pageable pageable, @FilterFor(User.class) Queryable queryable,
       @AuthenticationPrincipal ReportPortalUser currentUser) {
@@ -172,7 +173,7 @@ public Iterable<UserResource> getUsers(@FilterFor(User.class) Filter filter,
 
   @Transactional(readOnly = true)
   @GetMapping(value = "/registration/info")
-  @ApiOperation(value = "Validate registration information (DEPRECATED)")
+  @Operation(summary =  "Validate registration information (DEPRECATED)")
   public YesNoRS validateInfo(@RequestParam(value = "username", required = false) String username,
       @RequestParam(value = "email", required = false) String email) {
     return super.validateInfo(username, email);
@@ -181,7 +182,7 @@ public YesNoRS validateInfo(@RequestParam(value = "username", required = false)
   @Transactional
   @PostMapping(value = "/password/restore")
   @ResponseStatus(OK)
-  @ApiOperation("Create a restore password request (DEPRECATED)")
+  @Operation(summary = "Create a restore password request (DEPRECATED)")
   public OperationCompletionRS restorePassword(@RequestBody @Validated RestorePasswordRQ rq,
       HttpServletRequest request) {
     return super.restorePassword(rq, request);
@@ -190,7 +191,7 @@ public OperationCompletionRS restorePassword(@RequestBody @Validated RestorePass
   @Transactional
   @PostMapping(value = "/password/reset")
   @ResponseStatus(OK)
-  @ApiOperation("Reset password (DEPRECATED")
+  @Operation(summary = "Reset password (DEPRECATED")
   public OperationCompletionRS resetPassword(@RequestBody @Validated ResetPasswordRQ rq) {
     return super.resetPassword(rq);
   }
@@ -198,7 +199,7 @@ public OperationCompletionRS resetPassword(@RequestBody @Validated ResetPassword
   @Transactional(readOnly = true)
   @GetMapping(value = "/password/reset/{uuid}")
   @ResponseStatus(OK)
-  @ApiOperation("Check if a restore password bid exists (DEPRECATED)")
+  @Operation(summary = "Check if a restore password bid exists (DEPRECATED)")
   public YesNoRS isRestorePasswordBidExist(@PathVariable String uuid) {
     return super.isRestorePasswordBidExist(uuid);
   }
@@ -206,7 +207,7 @@ public YesNoRS isRestorePasswordBidExist(@PathVariable String uuid) {
   @Transactional
   @PostMapping(value = "/password/change")
   @ResponseStatus(OK)
-  @ApiOperation("Change own password (DEPRECATED)")
+  @Operation(summary = "Change own password (DEPRECATED)")
   public OperationCompletionRS changePassword(
       @RequestBody @Validated ChangePasswordRQ changePasswordRQ,
       @AuthenticationPrincipal ReportPortalUser currentUser) {
@@ -216,7 +217,7 @@ public OperationCompletionRS changePassword(
   @Transactional(readOnly = true)
   @GetMapping(value = "/{userName}/projects")
   @ResponseStatus(OK)
-  @ApiOperation(value = "Get user's projects (DEPRECATED)")
+  @Operation(summary =  "Get user's projects (DEPRECATED)")
   public Map<String, UserResource.AssignedProject> getUserProjects(@PathVariable String userName,
       @AuthenticationPrincipal ReportPortalUser currentUser) {
     return super.getUserProjects(userName, currentUser);
@@ -226,7 +227,7 @@ public Map<String, UserResource.AssignedProject> getUserProjects(@PathVariable S
   @GetMapping(value = "/search")
   @ResponseStatus(OK)
   @PreAuthorize(ADMIN_ONLY)
-  @ApiOperation(value = "Find users by term (DEPRECATED)", notes = "Only for administrators")
+  @Operation(summary =  "Find users by term (DEPRECATED)", description = "Only for administrators")
   public Iterable<UserResource> findUsers(@RequestParam(value = "term") String term,
       Pageable pageable, @AuthenticationPrincipal ReportPortalUser user) {
     return super.findUsers(term, pageable, user);
@@ -235,8 +236,8 @@ public Iterable<UserResource> findUsers(@RequestParam(value = "term") String ter
   @Transactional(readOnly = true)
   @GetMapping(value = "/export")
   @PreAuthorize(ADMIN_ONLY)
-  @ApiOperation(value = "Exports information about all users (DEPRECATED)", notes = "Allowable only for users with administrator role")
-  public void export(@ApiParam(allowableValues = "csv")
+  @Operation(summary =  "Exports information about all users (DEPRECATED)", description = "Allowable only for users with administrator role")
+  public void export(@Parameter(schema = @Schema(allowableValues = "csv"))
   @RequestParam(value = "view", required = false, defaultValue = "csv") String view,
       @FilterFor(User.class) Filter filter, @FilterFor(User.class) Queryable queryable,
       @AuthenticationPrincipal ReportPortalUser currentUser, HttpServletResponse response) {
@@ -245,7 +246,7 @@ public void export(@ApiParam(allowableValues = "csv")
 
   @PostMapping(value = "/{userId}/api-keys")
   @ResponseStatus(CREATED)
-  @ApiOperation("Create new Api Key for current user (DEPRECATED)")
+  @Operation(summary = "Create new Api Key for current user (DEPRECATED)")
   public ApiKeyRS createApiKey(@RequestBody @Validated ApiKeyRQ apiKeyRQ,
       @AuthenticationPrincipal ReportPortalUser currentUser, @PathVariable Long userId) {
     return super.createApiKey(apiKeyRQ, currentUser, userId);
@@ -253,14 +254,14 @@ public ApiKeyRS createApiKey(@RequestBody @Validated ApiKeyRQ apiKeyRQ,
 
   @DeleteMapping(value = "/{userId}/api-keys/{keyId}")
   @ResponseStatus(OK)
-  @ApiOperation("Delete specified Api Key (DEPRECATED)")
+  @Operation(summary = "Delete specified Api Key (DEPRECATED)")
   public OperationCompletionRS deleteApiKey(@PathVariable Long keyId, @PathVariable Long userId) {
     return super.deleteApiKey(keyId, userId);
   }
 
   @GetMapping(value = "/{userId}/api-keys")
   @ResponseStatus(OK)
-  @ApiOperation("Get List of users Api Keys (DEPRECATED)")
+  @Operation(summary = "Get List of users Api Keys (DEPRECATED)")
   public ApiKeysRS getUsersApiKeys(@AuthenticationPrincipal ReportPortalUser currentUser,
       @PathVariable Long userId) {
     return super.getUsersApiKeys(currentUser, userId);
diff --git a/src/main/java/com/epam/ta/reportportal/ws/controller/FileStorageController.java b/src/main/java/com/epam/ta/reportportal/ws/controller/FileStorageController.java
index c0dff7cca4..f06a796f56 100644
--- a/src/main/java/com/epam/ta/reportportal/ws/controller/FileStorageController.java
+++ b/src/main/java/com/epam/ta/reportportal/ws/controller/FileStorageController.java
@@ -30,7 +30,8 @@
 import com.epam.ta.reportportal.util.ProjectExtractor;
 import com.epam.ta.reportportal.ws.model.OperationCompletionRS;
 import com.google.common.net.HttpHeaders;
-import io.swagger.annotations.ApiOperation;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.tags.Tag;
 import java.io.IOException;
 import java.io.InputStream;
 import javax.servlet.http.HttpServletResponse;
@@ -55,6 +56,7 @@
  */
 @RestController
 @RequestMapping("/v1/data")
+@Tag(name = "file-storage-controller", description = "File Storage Controller")
 public class FileStorageController {
 
   private final ProjectExtractor projectExtractor;
@@ -83,7 +85,7 @@ public void getFile(@PathVariable String projectName, @PathVariable("dataId") Lo
 
   @Transactional(readOnly = true)
   @GetMapping(value = "/photo")
-  @ApiOperation("Get photo of current user")
+  @Operation(summary = "Get photo of current user")
   public void getMyPhoto(@AuthenticationPrincipal ReportPortalUser user,
       HttpServletResponse response,
       @RequestParam(value = "loadThumbnail", required = false) boolean loadThumbnail) {
@@ -93,7 +95,7 @@ public void getMyPhoto(@AuthenticationPrincipal ReportPortalUser user,
   @Transactional(readOnly = true)
   @PreAuthorize(NOT_CUSTOMER)
   @GetMapping(value = "/{projectName}/userphoto")
-  @ApiOperation("Get user's photo")
+  @Operation(summary = "Get user's photo")
   public void getUserPhoto(@PathVariable String projectName,
       @RequestParam(value = "id") String username,
       @RequestParam(value = "loadThumbnail", required = false) boolean loadThumbnail,
@@ -106,7 +108,7 @@ public void getUserPhoto(@PathVariable String projectName,
 
   @Transactional
   @PostMapping(value = "/photo", consumes = {MediaType.MULTIPART_FORM_DATA_VALUE})
-  @ApiOperation("Upload user's photo")
+  @Operation(summary = "Upload user's photo")
   public OperationCompletionRS uploadPhoto(@RequestParam("file") MultipartFile file,
       @AuthenticationPrincipal ReportPortalUser user) {
     return editUserHandler.uploadPhoto(EntityUtils.normalizeId(user.getUsername()), file);
@@ -114,7 +116,7 @@ public OperationCompletionRS uploadPhoto(@RequestParam("file") MultipartFile fil
 
   @Transactional
   @DeleteMapping(value = "/photo")
-  @ApiOperation("Delete user's photo")
+  @Operation(summary = "Delete user's photo")
   public OperationCompletionRS deletePhoto(@AuthenticationPrincipal ReportPortalUser user) {
     return editUserHandler.deletePhoto(EntityUtils.normalizeId(user.getUsername()));
   }
@@ -122,7 +124,7 @@ public OperationCompletionRS deletePhoto(@AuthenticationPrincipal ReportPortalUs
   @Transactional
   @PreAuthorize(ADMIN_ONLY)
   @PostMapping(value = "/clean", consumes = {MediaType.MULTIPART_FORM_DATA_VALUE})
-  @ApiOperation("Remove attachments from file storage according to uploaded csv file")
+  @Operation(summary = "Remove attachments from file storage according to uploaded csv file")
   public OperationCompletionRS removeAttachmentsByCsv(@RequestParam("file") MultipartFile file,
       @AuthenticationPrincipal ReportPortalUser user) {
     return deleteFilesHandler.removeFilesByCsv(file);
diff --git a/src/main/java/com/epam/ta/reportportal/ws/controller/IntegrationController.java b/src/main/java/com/epam/ta/reportportal/ws/controller/IntegrationController.java
index 629c209862..b38651c33d 100644
--- a/src/main/java/com/epam/ta/reportportal/ws/controller/IntegrationController.java
+++ b/src/main/java/com/epam/ta/reportportal/ws/controller/IntegrationController.java
@@ -32,7 +32,8 @@
 import com.epam.ta.reportportal.model.integration.IntegrationResource;
 import com.epam.ta.reportportal.util.ProjectExtractor;
 import com.epam.ta.reportportal.ws.model.OperationCompletionRS;
-import io.swagger.annotations.ApiOperation;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.tags.Tag;
 import java.util.List;
 import java.util.Map;
 import javax.validation.Valid;
@@ -56,6 +57,7 @@
  */
 @RestController
 @RequestMapping(value = "/v1/integration")
+@Tag(name = "integration-controller", description = "Integration Controller")
 public class IntegrationController {
 
   private final ProjectExtractor projectExtractor;
@@ -80,7 +82,7 @@ public IntegrationController(ProjectExtractor projectExtractor,
   @Transactional(readOnly = true)
   @GetMapping("/global/all")
   @ResponseStatus(HttpStatus.OK)
-  @ApiOperation("Get available global integrations")
+  @Operation(summary = "Get available global integrations")
   public List<IntegrationResource> getGlobalIntegrations(
       @AuthenticationPrincipal ReportPortalUser reportPortalUser) {
     return getIntegrationHandler.getGlobalIntegrations();
@@ -89,7 +91,7 @@ public List<IntegrationResource> getGlobalIntegrations(
   @Transactional(readOnly = true)
   @GetMapping("/global/all/{pluginName}")
   @ResponseStatus(HttpStatus.OK)
-  @ApiOperation("Get available global integrations for plugin")
+  @Operation(summary = "Get available global integrations for plugin")
   public List<IntegrationResource> getGlobalIntegrations(
       @AuthenticationPrincipal ReportPortalUser reportPortalUser, @PathVariable String pluginName) {
     return getIntegrationHandler.getGlobalIntegrations(pluginName);
@@ -99,7 +101,7 @@ public List<IntegrationResource> getGlobalIntegrations(
   @GetMapping("/project/{projectName}/all")
   @ResponseStatus(HttpStatus.OK)
   @PreAuthorize(ASSIGNED_TO_PROJECT)
-  @ApiOperation("Get available project integrations")
+  @Operation(summary = "Get available project integrations")
   public List<IntegrationResource> getProjectIntegrations(@PathVariable String projectName,
       @AuthenticationPrincipal ReportPortalUser reportPortalUser) {
     return getIntegrationHandler.getProjectIntegrations(normalizeId(projectName));
@@ -109,7 +111,7 @@ public List<IntegrationResource> getProjectIntegrations(@PathVariable String pro
   @GetMapping("/project/{projectName}/all/{pluginName}")
   @ResponseStatus(HttpStatus.OK)
   @PreAuthorize(ASSIGNED_TO_PROJECT)
-  @ApiOperation("Get available project integrations for plugin")
+  @Operation(summary = "Get available project integrations for plugin")
   public List<IntegrationResource> getProjectIntegrations(
       @AuthenticationPrincipal ReportPortalUser reportPortalUser, @PathVariable String projectName,
       @PathVariable String pluginName) {
@@ -119,7 +121,7 @@ public List<IntegrationResource> getProjectIntegrations(
   @Transactional
   @PostMapping(value = "/{pluginName}")
   @ResponseStatus(HttpStatus.CREATED)
-  @ApiOperation("Create global Report Portal integration instance")
+  @Operation(summary = "Create global Report Portal integration instance")
   @PreAuthorize(ADMIN_ONLY)
   public EntryCreatedRS createGlobalIntegration(@RequestBody @Valid IntegrationRQ createRequest,
       @PathVariable String pluginName, @AuthenticationPrincipal ReportPortalUser user) {
@@ -129,7 +131,7 @@ public EntryCreatedRS createGlobalIntegration(@RequestBody @Valid IntegrationRQ
   @Transactional
   @PostMapping(value = "/{projectName}/{pluginName}")
   @ResponseStatus(HttpStatus.CREATED)
-  @ApiOperation("Create project Report Portal integration instance")
+  @Operation(summary = "Create project Report Portal integration instance")
   @PreAuthorize(PROJECT_MANAGER)
   public EntryCreatedRS createProjectIntegration(@RequestBody @Valid IntegrationRQ createRequest,
       @PathVariable String pluginName, @PathVariable String projectName,
@@ -144,7 +146,7 @@ public EntryCreatedRS createProjectIntegration(@RequestBody @Valid IntegrationRQ
   @GetMapping(value = "{projectName}/{integrationId}/connection/test")
   @ResponseStatus(HttpStatus.OK)
   @PreAuthorize(ASSIGNED_TO_PROJECT)
-  @ApiOperation("Test connection to the integration through the project config")
+  @Operation(summary = "Test connection to the integration through the project config")
   public boolean testIntegrationConnection(@PathVariable Long integrationId,
       @PathVariable String projectName, @AuthenticationPrincipal ReportPortalUser user) {
     return getIntegrationHandler.testConnection(integrationId, normalizeId(projectName));
@@ -154,7 +156,7 @@ public boolean testIntegrationConnection(@PathVariable Long integrationId,
   @GetMapping(value = "/{integrationId}/connection/test")
   @ResponseStatus(HttpStatus.OK)
   @PreAuthorize(ADMIN_ONLY)
-  @ApiOperation("Test connection to the global integration")
+  @Operation(summary = "Test connection to the global integration")
   public boolean testIntegrationConnection(@PathVariable Long integrationId,
       @AuthenticationPrincipal ReportPortalUser user) {
     return getIntegrationHandler.testConnection(integrationId);
@@ -163,7 +165,7 @@ public boolean testIntegrationConnection(@PathVariable Long integrationId,
   @Transactional(readOnly = true)
   @GetMapping(value = "/{integrationId}")
   @ResponseStatus(HttpStatus.OK)
-  @ApiOperation("Get global Report Portal integration instance")
+  @Operation(summary = "Get global Report Portal integration instance")
   @PreAuthorize(ADMIN_ONLY)
   public IntegrationResource getGlobalIntegration(@PathVariable Long integrationId,
       @AuthenticationPrincipal ReportPortalUser user) {
@@ -173,7 +175,7 @@ public IntegrationResource getGlobalIntegration(@PathVariable Long integrationId
   @Transactional(readOnly = true)
   @GetMapping(value = "/{projectName}/{integrationId}")
   @ResponseStatus(HttpStatus.OK)
-  @ApiOperation("Get integration instance")
+  @Operation(summary = "Get integration instance")
   @PreAuthorize(ASSIGNED_TO_PROJECT)
   public IntegrationResource getProjectIntegration(@PathVariable String projectName,
       @PathVariable Long integrationId, @AuthenticationPrincipal ReportPortalUser user) {
@@ -183,7 +185,7 @@ public IntegrationResource getProjectIntegration(@PathVariable String projectNam
   @Transactional
   @PutMapping(value = "/{integrationId}")
   @ResponseStatus(HttpStatus.OK)
-  @ApiOperation("Update global Report Portal integration instance")
+  @Operation(summary = "Update global Report Portal integration instance")
   @PreAuthorize(ADMIN_ONLY)
   public OperationCompletionRS updateGlobalIntegration(@PathVariable Long integrationId,
       @RequestBody @Valid IntegrationRQ updateRequest,
@@ -195,7 +197,7 @@ public OperationCompletionRS updateGlobalIntegration(@PathVariable Long integrat
   @Transactional
   @PutMapping(value = "/{projectName}/{integrationId}")
   @ResponseStatus(HttpStatus.OK)
-  @ApiOperation("Update project integration instance")
+  @Operation(summary = "Update project integration instance")
   @PreAuthorize(PROJECT_MANAGER)
   public OperationCompletionRS updateProjectIntegration(@PathVariable Long integrationId,
       @RequestBody @Valid IntegrationRQ updateRequest, @PathVariable String projectName,
@@ -209,7 +211,7 @@ public OperationCompletionRS updateProjectIntegration(@PathVariable Long integra
   @Transactional
   @DeleteMapping(value = "/{integrationId}")
   @ResponseStatus(HttpStatus.OK)
-  @ApiOperation("Delete global integration instance")
+  @Operation(summary = "Delete global integration instance")
   @PreAuthorize(ADMIN_ONLY)
   public OperationCompletionRS deleteGlobalIntegration(@PathVariable Long integrationId,
       @AuthenticationPrincipal ReportPortalUser user) {
@@ -219,7 +221,7 @@ public OperationCompletionRS deleteGlobalIntegration(@PathVariable Long integrat
   @Transactional
   @DeleteMapping(value = "/all/{type}")
   @ResponseStatus(HttpStatus.OK)
-  @ApiOperation("Delete all global integrations by type")
+  @Operation(summary = "Delete all global integrations by type")
   @PreAuthorize(ADMIN_ONLY)
   public OperationCompletionRS deleteAllIntegrations(@PathVariable String type,
       @AuthenticationPrincipal ReportPortalUser user) {
@@ -229,7 +231,7 @@ public OperationCompletionRS deleteAllIntegrations(@PathVariable String type,
   @Transactional
   @DeleteMapping(value = "/{projectName}/{integrationId}")
   @ResponseStatus(HttpStatus.OK)
-  @ApiOperation("Delete project integration instance")
+  @Operation(summary = "Delete project integration instance")
   @PreAuthorize(PROJECT_MANAGER)
   public OperationCompletionRS deleteProjectIntegration(@PathVariable String projectName,
       @PathVariable Long integrationId, @AuthenticationPrincipal ReportPortalUser user) {
@@ -241,7 +243,7 @@ public OperationCompletionRS deleteProjectIntegration(@PathVariable String proje
   @Transactional
   @DeleteMapping(value = "/{projectName}/all/{type}")
   @ResponseStatus(HttpStatus.OK)
-  @ApiOperation("Delete all integrations assigned to specified project")
+  @Operation(summary = "Delete all integrations assigned to specified project")
   @PreAuthorize(PROJECT_MANAGER)
   public OperationCompletionRS deleteAllProjectIntegrations(@PathVariable String type,
       @PathVariable String projectName, @AuthenticationPrincipal ReportPortalUser user) {
@@ -255,7 +257,7 @@ public OperationCompletionRS deleteAllProjectIntegrations(@PathVariable String t
       APPLICATION_JSON_VALUE })
   @ResponseStatus(HttpStatus.OK)
   @PreAuthorize(ASSIGNED_TO_PROJECT)
-  @ApiOperation("Execute command to the integration instance")
+  @Operation(summary = "Execute command to the integration instance")
   public Object executeIntegrationCommand(@PathVariable String projectName,
       @PathVariable("integrationId") Long integrationId, @PathVariable("command") String command,
       @RequestBody Map<String, Object> executionParams,
diff --git a/src/main/java/com/epam/ta/reportportal/ws/controller/InternalApiController.java b/src/main/java/com/epam/ta/reportportal/ws/controller/InternalApiController.java
deleted file mode 100644
index 45fb274192..0000000000
--- a/src/main/java/com/epam/ta/reportportal/ws/controller/InternalApiController.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- * 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.ta.reportportal.ws.controller;
-
-import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.RequestMapping;
-
-/**
- * Allowed for internal (other services) clients ONLY Provides direct access to DAO layer
- *
- * @author Andrei Varabyeu
- */
-@Controller
-@RequestMapping("/v1/api-internal")
-//@PreAuthorize("hasRole('COMPONENT')")
-public class InternalApiController {
-
-  //	private final ExternalSystemRepository externalSystemRepository;
-  //
-  //	@Autowired
-  //	public InternalApiController(ExternalSystemRepository externalSystemRepository) {
-  //		this.externalSystemRepository = externalSystemRepository;
-  //	}
-  //
-  //	@RequestMapping(value = "/external-system/{systemId}", method = RequestMethod.GET)
-  //	@ResponseBody
-  //	@ResponseStatus(HttpStatus.OK)
-  //
-  //	public ExternalSystemResource getExternalSystem(@PathVariable String systemId) {
-  //		ExternalSystem externalSystem = externalSystemRepository.findOne(systemId);
-  //		BusinessRule.expect(externalSystem, Predicates.notNull()).verify(ErrorType.EXTERNAL_SYSTEM_NOT_FOUND, systemId);
-  //		return ExternalSystemConverter.TO_RESOURCE.apply(externalSystem);
-  //	}
-}
diff --git a/src/main/java/com/epam/ta/reportportal/ws/controller/LaunchAsyncController.java b/src/main/java/com/epam/ta/reportportal/ws/controller/LaunchAsyncController.java
index 49c2521396..d08f93a4cc 100644
--- a/src/main/java/com/epam/ta/reportportal/ws/controller/LaunchAsyncController.java
+++ b/src/main/java/com/epam/ta/reportportal/ws/controller/LaunchAsyncController.java
@@ -34,8 +34,9 @@
 import com.epam.ta.reportportal.ws.model.launch.LaunchResource;
 import com.epam.ta.reportportal.ws.model.launch.StartLaunchRQ;
 import com.epam.ta.reportportal.ws.model.launch.StartLaunchRS;
-import io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.ApiParam;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.tags.Tag;
 import javax.servlet.http.HttpServletRequest;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
@@ -59,6 +60,7 @@
  */
 @RestController
 @RequestMapping("/v2/{projectName}/launch")
+@Tag(name = "launch-async-controller", description = "Activity Controller")
 public class LaunchAsyncController {
 
   private final ProjectExtractor projectExtractor;
@@ -81,9 +83,9 @@ public LaunchAsyncController(ProjectExtractor projectExtractor,
   @PostMapping
   @PreAuthorize(ALLOWED_TO_REPORT)
   @ResponseStatus(CREATED)
-  @ApiOperation("Starts launch for specified project")
+  @Operation(summary = "Starts launch for specified project")
   public StartLaunchRS startLaunch(@PathVariable String projectName,
-      @ApiParam(value = "Start launch request body", required = true) @RequestBody @Validated
+      @Parameter(description = "Start launch request body", required = true) @RequestBody @Validated
       StartLaunchRQ startLaunchRQ, @AuthenticationPrincipal ReportPortalUser user) {
     return startLaunchHandler.startLaunch(user,
         projectExtractor.extractProjectDetails(user, normalizeId(projectName)), startLaunchRQ
@@ -94,7 +96,7 @@ public StartLaunchRS startLaunch(@PathVariable String projectName,
   @PutMapping(value = "/{launchId}/finish")
   @PreAuthorize(ALLOWED_TO_REPORT)
   @ResponseStatus(OK)
-  @ApiOperation("Finish launch for specified project")
+  @Operation(summary = "Finish launch for specified project")
   public FinishLaunchRS finishLaunch(@PathVariable String projectName,
       @PathVariable String launchId, @RequestBody @Validated FinishExecutionRQ finishLaunchRQ,
       @AuthenticationPrincipal ReportPortalUser user, HttpServletRequest request) {
@@ -109,9 +111,9 @@ public FinishLaunchRS finishLaunch(@PathVariable String projectName,
   @PostMapping("/merge")
   @PreAuthorize(ALLOWED_TO_REPORT)
   @ResponseStatus(OK)
-  @ApiOperation("Merge set of specified launches in common one")
+  @Operation(summary = "Merge set of specified launches in common one")
   public LaunchResource mergeLaunches(@PathVariable String projectName,
-      @ApiParam(value = "Merge launches request body", required = true) @RequestBody @Validated
+      @Parameter(description = "Merge launches request body", required = true) @RequestBody @Validated
       MergeLaunchesRQ mergeLaunchesRQ, @AuthenticationPrincipal ReportPortalUser user) {
     return mergeLaunchesHandler.mergeLaunches(
         projectExtractor.extractProjectDetails(user, normalizeId(projectName)), user,
diff --git a/src/main/java/com/epam/ta/reportportal/ws/controller/LaunchController.java b/src/main/java/com/epam/ta/reportportal/ws/controller/LaunchController.java
index 93c1331a03..244b6e329b 100644
--- a/src/main/java/com/epam/ta/reportportal/ws/controller/LaunchController.java
+++ b/src/main/java/com/epam/ta/reportportal/ws/controller/LaunchController.java
@@ -60,10 +60,12 @@
 import com.epam.ta.reportportal.ws.resolver.FilterFor;
 import com.epam.ta.reportportal.ws.resolver.SortFor;
 import com.google.common.net.HttpHeaders;
-import io.swagger.annotations.ApiImplicitParam;
-import io.swagger.annotations.ApiImplicitParams;
-import io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.ApiParam;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.Parameters;
+import io.swagger.v3.oas.annotations.media.Content;
+import io.swagger.v3.oas.annotations.media.Schema;
+import io.swagger.v3.oas.annotations.tags.Tag;
 import java.io.IOException;
 import java.io.OutputStream;
 import java.util.List;
@@ -105,6 +107,7 @@
  */
 @RestController
 @RequestMapping("/v1/{projectName}/launch")
+@Tag(name = "launch-controller", description = "Launch Controller")
 public class LaunchController {
 
   private final ProjectExtractor projectExtractor;
@@ -142,9 +145,9 @@ public LaunchController(ProjectExtractor projectExtractor, StartLaunchHandler st
   @PostMapping
   @PreAuthorize(ALLOWED_TO_REPORT)
   @ResponseStatus(CREATED)
-  @ApiOperation("Starts launch for specified project")
+  @Operation(summary = "Starts launch for specified project")
   public StartLaunchRS startLaunch(@PathVariable String projectName,
-      @ApiParam(value = "Start launch request body", required = true) @RequestBody @Validated
+      @Parameter(description = "Start launch request body", required = true) @RequestBody @Validated
       @Valid StartLaunchRQ startLaunchRQ, @AuthenticationPrincipal ReportPortalUser user) {
     return startLaunchHandler.startLaunch(user,
         projectExtractor.extractProjectDetails(user, normalizeId(projectName)), startLaunchRQ
@@ -154,7 +157,7 @@ public StartLaunchRS startLaunch(@PathVariable String projectName,
   @PutMapping(value = "/{launchId}/finish")
   @PreAuthorize(ALLOWED_TO_REPORT)
   @ResponseStatus(OK)
-  @ApiOperation("Finish launch for specified project")
+  @Operation(summary = "Finish launch for specified project")
   public FinishLaunchRS finishLaunch(@PathVariable String projectName,
       @PathVariable String launchId, @RequestBody @Validated FinishExecutionRQ finishLaunchRQ,
       @AuthenticationPrincipal ReportPortalUser user, HttpServletRequest request) {
@@ -170,7 +173,7 @@ public FinishLaunchRS finishLaunch(@PathVariable String projectName,
   @PutMapping("/{launchId}/stop")
   @PreAuthorize(ALLOWED_TO_REPORT)
   @ResponseStatus(OK)
-  @ApiOperation("Force finish launch for specified project")
+  @Operation(summary = "Force finish launch for specified project")
   public OperationCompletionRS forceFinishLaunch(@PathVariable String projectName,
       @PathVariable Long launchId, @RequestBody @Validated FinishExecutionRQ finishExecutionRQ,
       @AuthenticationPrincipal ReportPortalUser user) {
@@ -183,7 +186,7 @@ public OperationCompletionRS forceFinishLaunch(@PathVariable String projectName,
   @PutMapping("/stop")
   @PreAuthorize(ALLOWED_TO_REPORT)
   @ResponseStatus(OK)
-  @ApiOperation("Force finish launch")
+  @Operation(summary = "Force finish launch")
   public List<OperationCompletionRS> bulkForceFinish(@PathVariable String projectName,
       @RequestBody @Validated BulkRQ<Long, FinishExecutionRQ> rq,
       @AuthenticationPrincipal ReportPortalUser user) {
@@ -196,7 +199,7 @@ public List<OperationCompletionRS> bulkForceFinish(@PathVariable String projectN
   @PutMapping("/{launchId}/update")
   @PreAuthorize(ALLOWED_TO_REPORT)
   @ResponseStatus(OK)
-  @ApiOperation("Updates launch for specified project")
+  @Operation(summary = "Updates launch for specified project")
   public OperationCompletionRS updateLaunch(@PathVariable String projectName,
       @PathVariable Long launchId, @RequestBody @Validated UpdateLaunchRQ updateLaunchRQ,
       @AuthenticationPrincipal ReportPortalUser user) {
@@ -209,7 +212,7 @@ public OperationCompletionRS updateLaunch(@PathVariable String projectName,
   @PutMapping("/update")
   @PreAuthorize(ALLOWED_TO_REPORT)
   @ResponseStatus(OK)
-  @ApiOperation("Updates launches for specified project")
+  @Operation(summary = "Updates launches for specified project")
   public List<OperationCompletionRS> updateLaunches(@PathVariable String projectName,
       @RequestBody @Validated BulkRQ<Long, UpdateLaunchRQ> rq,
       @AuthenticationPrincipal ReportPortalUser user) {
@@ -222,7 +225,7 @@ public List<OperationCompletionRS> updateLaunches(@PathVariable String projectNa
   @DeleteMapping("/{launchId}")
   @PreAuthorize(ALLOWED_TO_REPORT)
   @ResponseStatus(OK)
-  @ApiOperation("Delete specified launch by ID")
+  @Operation(summary = "Delete specified launch by ID")
   public OperationCompletionRS deleteLaunch(@PathVariable String projectName,
       @PathVariable Long launchId, @AuthenticationPrincipal ReportPortalUser user) {
     return deleteLaunchMessageHandler.deleteLaunch(launchId,
@@ -233,7 +236,7 @@ public OperationCompletionRS deleteLaunch(@PathVariable String projectName,
   @Transactional(readOnly = true)
   @GetMapping("/{launchId}")
   @ResponseStatus(OK)
-  @ApiOperation("Get specified launch by ID")
+  @Operation(summary = "Get specified launch by ID")
   public LaunchResource getLaunch(@PathVariable String projectName, @PathVariable String launchId,
       @AuthenticationPrincipal ReportPortalUser user) {
     return getLaunchMessageHandler.getLaunch(launchId,
@@ -244,7 +247,7 @@ public LaunchResource getLaunch(@PathVariable String projectName, @PathVariable
   @Transactional(readOnly = true)
   @GetMapping("/uuid/{launchId}")
   @ResponseStatus(OK)
-  @ApiOperation("Get specified launch by UUID")
+  @Operation(summary = "Get specified launch by UUID")
   public LaunchResource getLaunchByUuid(@PathVariable String projectName,
       @PathVariable String launchId, @AuthenticationPrincipal ReportPortalUser user) {
     return getLaunchMessageHandler.getLaunch(launchId,
@@ -255,7 +258,7 @@ public LaunchResource getLaunchByUuid(@PathVariable String projectName,
   @Transactional(readOnly = true)
   @GetMapping
   @ResponseStatus(OK)
-  @ApiOperation("Get list of project launches by filter")
+  @Operation(summary = "Get list of project launches by filter")
   public Iterable<LaunchResource> getProjectLaunches(@PathVariable String projectName,
       @FilterFor(Launch.class) Filter filter, @SortFor(Launch.class) Pageable pageable,
       @AuthenticationPrincipal ReportPortalUser user) {
@@ -268,7 +271,7 @@ public Iterable<LaunchResource> getProjectLaunches(@PathVariable String projectN
   @Transactional(readOnly = true)
   @GetMapping(value = "/latest")
   @ResponseStatus(OK)
-  @ApiOperation("Get list of latest project launches by filter")
+  @Operation(summary = "Get list of latest project launches by filter")
   public Iterable<LaunchResource> getLatestLaunches(@PathVariable String projectName,
       @FilterFor(Launch.class) Filter filter, @SortFor(Launch.class) Pageable pageable,
       @AuthenticationPrincipal ReportPortalUser user) {
@@ -279,7 +282,7 @@ public Iterable<LaunchResource> getLatestLaunches(@PathVariable String projectNa
   @GetMapping(value = "/mode")
   @ResponseBody
   @ResponseStatus(OK)
-  @ApiOperation("Get launches of specified project from DEBUG mode")
+  @Operation(summary = "Get launches of specified project from DEBUG mode")
   public Iterable<LaunchResource> getDebugLaunches(@PathVariable String projectName,
       @FilterFor(Launch.class) Filter filter, @SortFor(Launch.class) Pageable pageable,
       @AuthenticationPrincipal ReportPortalUser user) {
@@ -290,7 +293,7 @@ public Iterable<LaunchResource> getDebugLaunches(@PathVariable String projectNam
   @Transactional(readOnly = true)
   @GetMapping(value = "/attribute/keys")
   @ResponseStatus(OK)
-  @ApiOperation("Get all unique attribute keys of project launches")
+  @Operation(summary = "Get all unique attribute keys of project launches")
   public List<String> getAttributeKeys(@PathVariable String projectName,
       @RequestParam(value = "filter." + "cnt." + "attributeKey") String value,
       @AuthenticationPrincipal ReportPortalUser user) {
@@ -301,7 +304,7 @@ public List<String> getAttributeKeys(@PathVariable String projectName,
   @Transactional(readOnly = true)
   @GetMapping(value = "/attribute/values")
   @ResponseStatus(OK)
-  @ApiOperation("Get all unique attribute values of project launches")
+  @Operation(summary = "Get all unique attribute values of project launches")
   public List<String> getAttributeValues(@PathVariable String projectName,
       @RequestParam(value = "filter." + "eq." + "attributeKey", required = false) String key,
       @RequestParam(value = "filter." + "cnt." + "attributeValue") String value,
@@ -312,7 +315,7 @@ public List<String> getAttributeValues(@PathVariable String projectName,
 
   @GetMapping(value = "/cluster/{launchId}")
   @ResponseStatus(OK)
-  @ApiOperation("Get all index clusters of the launch")
+  @Operation(summary = "Get all index clusters of the launch")
   public Iterable<ClusterInfoResource> getClusters(@PathVariable String projectName,
       @PathVariable String launchId, Pageable pageable,
       @AuthenticationPrincipal ReportPortalUser user) {
@@ -325,7 +328,7 @@ public Iterable<ClusterInfoResource> getClusters(@PathVariable String projectNam
   @PutMapping(value = "/info")
   @PreAuthorize(PROJECT_MANAGER_OR_ADMIN)
   @ResponseStatus(OK)
-  @ApiOperation("Bulk update attributes and description")
+  @Operation(summary = "Bulk update attributes and description")
   public OperationCompletionRS bulkUpdate(@PathVariable String projectName,
       @RequestBody @Validated BulkInfoUpdateRQ bulkInfoUpdateRQ,
       @AuthenticationPrincipal ReportPortalUser user) {
@@ -337,7 +340,7 @@ public OperationCompletionRS bulkUpdate(@PathVariable String projectName,
   @Transactional(readOnly = true)
   @GetMapping(value = "/owners")
   @ResponseStatus(OK)
-  @ApiOperation("Get all unique owners of project launches")
+  @Operation(summary = "Get all unique owners of project launches")
   public List<String> getAllOwners(@PathVariable String projectName,
       @RequestParam(value = "filter." + "cnt." + "user") String value,
       @RequestParam(value = "mode", required = false, defaultValue = "DEFAULT") String mode,
@@ -349,7 +352,7 @@ public List<String> getAllOwners(@PathVariable String projectName,
   @Transactional(readOnly = true)
   @GetMapping(value = "/names")
   @ResponseStatus(OK)
-  @ApiOperation("Get launch names of project")
+  @Operation(summary = "Get launch names of project")
   public List<String> getAllLaunchNames(@PathVariable String projectName,
       @RequestParam(value = "filter." + "cnt." + "name", required = false, defaultValue = "")
       String value, @AuthenticationPrincipal ReportPortalUser user) {
@@ -360,7 +363,7 @@ public List<String> getAllLaunchNames(@PathVariable String projectName,
   @Transactional(readOnly = true)
   @GetMapping(value = "/compare")
   @ResponseStatus(OK)
-  @ApiOperation("Compare launches")
+  @Operation(summary = "Compare launches")
   public Map<String, List<ChartStatisticsContent>> compareLaunches(@PathVariable String projectName,
       @RequestParam(value = "ids") Long[] ids, @AuthenticationPrincipal ReportPortalUser user) {
     return getLaunchMessageHandler.getLaunchesComparisonInfo(
@@ -371,9 +374,9 @@ public Map<String, List<ChartStatisticsContent>> compareLaunches(@PathVariable S
   @PostMapping("/merge")
   @PreAuthorize(ALLOWED_TO_REPORT)
   @ResponseStatus(OK)
-  @ApiOperation("Merge set of specified launches in common one")
+  @Operation(summary = "Merge set of specified launches in common one")
   public LaunchResource mergeLaunches(@PathVariable String projectName,
-      @ApiParam(value = "Merge launches request body", required = true) @RequestBody @Validated
+      @Parameter(description = "Merge launches request body", required = true) @RequestBody @Validated
       MergeLaunchesRQ mergeLaunchesRQ, @AuthenticationPrincipal ReportPortalUser user) {
     return mergeLaunchesHandler.mergeLaunches(
         projectExtractor.extractProjectDetails(user, normalizeId(projectName)), user,
@@ -384,7 +387,7 @@ public LaunchResource mergeLaunches(@PathVariable String projectName,
   @Transactional
   @PostMapping(value = "/analyze")
   @ResponseStatus(OK)
-  @ApiOperation("Start launch auto-analyzer on demand")
+  @Operation(summary = "Start launch auto-analyzer on demand")
   public OperationCompletionRS startLaunchAnalyzer(@PathVariable String projectName,
       @RequestBody @Validated AnalyzeLaunchRQ analyzeLaunchRQ,
       @AuthenticationPrincipal ReportPortalUser user) {
@@ -395,7 +398,7 @@ public OperationCompletionRS startLaunchAnalyzer(@PathVariable String projectNam
 
   @PostMapping(value = "/cluster")
   @ResponseStatus(OK)
-  @ApiOperation("Create launch clusters")
+  @Operation(summary = "Create launch clusters")
   public OperationCompletionRS createClusters(@PathVariable String projectName,
       @RequestBody @Validated CreateClustersRQ createClustersRQ,
       @AuthenticationPrincipal ReportPortalUser user) {
@@ -418,9 +421,9 @@ public Map<String, String> getStatuses(@PathVariable String projectName,
   @GetMapping(value = "/{launchId}/report")
   @ResponseStatus(OK)
   @PreAuthorize(ASSIGNED_TO_PROJECT)
-  @ApiOperation(value = "Export specified launch", notes = "Only following formats are supported: pdf (by default), xls, html.")
+  @Operation(summary =  "Export specified launch", description = "Only following formats are supported: pdf (by default), xls, html.")
   public void getLaunchReport(@PathVariable String projectName, @PathVariable Long launchId,
-      @ApiParam(allowableValues = "pdf, xls, html")
+      @Parameter(schema = @Schema(allowableValues = {"pdf", "xls", "html"}))
       @RequestParam(value = "view", required = false, defaultValue = "pdf") String view,
       @AuthenticationPrincipal ReportPortalUser user, HttpServletResponse response) {
 
@@ -446,7 +449,7 @@ public void getLaunchReport(@PathVariable String projectName, @PathVariable Long
   @DeleteMapping
   @PreAuthorize(ALLOWED_TO_REPORT)
   @ResponseStatus(OK)
-  @ApiOperation("Delete specified launches by ids")
+  @Operation(summary = "Delete specified launches by ids")
   public DeleteBulkRS deleteLaunches(@PathVariable String projectName,
       @RequestBody @Valid DeleteBulkRQ deleteBulkRQ,
       @AuthenticationPrincipal ReportPortalUser user) {
@@ -455,10 +458,12 @@ public DeleteBulkRS deleteLaunches(@PathVariable String projectName,
     );
   }
 
-  @ApiImplicitParams(@ApiImplicitParam(name = "launchImportRq", dataType = "LaunchImportRQ", paramType = "body"))
+  @Parameters(
+      @Parameter(name = "launchImportRq", content = @Content(schema = @Schema(implementation = LaunchImportRQ.class)))
+  )
   @PostMapping(value = "/import", consumes = { MediaType.MULTIPART_FORM_DATA_VALUE })
   @ResponseStatus(OK)
-  @ApiOperation(value = "Import junit xml report", notes = "Only following formats are supported: zip and xml.")
+  @Operation(summary =  "Import junit xml report", description = "Only following formats are supported: zip and xml.")
   public OperationCompletionRS importLaunch(@PathVariable String projectName,
       @RequestParam("file") MultipartFile file, @AuthenticationPrincipal ReportPortalUser user,
       HttpServletRequest request,
diff --git a/src/main/java/com/epam/ta/reportportal/ws/controller/LogAsyncController.java b/src/main/java/com/epam/ta/reportportal/ws/controller/LogAsyncController.java
index 980ac468fa..b473c2d55b 100644
--- a/src/main/java/com/epam/ta/reportportal/ws/controller/LogAsyncController.java
+++ b/src/main/java/com/epam/ta/reportportal/ws/controller/LogAsyncController.java
@@ -36,7 +36,9 @@
 import com.epam.ta.reportportal.ws.model.EntryCreatedAsyncRS;
 import com.epam.ta.reportportal.ws.model.ErrorType;
 import com.epam.ta.reportportal.ws.model.log.SaveLogRQ;
-import io.swagger.annotations.ApiOperation;
+import io.swagger.v3.oas.annotations.Hidden;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.tags.Tag;
 import javax.servlet.http.HttpServletRequest;
 import javax.validation.Validator;
 import org.apache.commons.collections4.MultiValuedMap;
@@ -56,7 +58,6 @@
 import org.springframework.web.bind.annotation.ResponseStatus;
 import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.multipart.MultipartFile;
-import springfox.documentation.annotations.ApiIgnore;
 
 /**
  * @author Konstantin Antipin
@@ -64,6 +65,7 @@
 @RestController
 @RequestMapping("/v2/{projectName}/log")
 @PreAuthorize(ASSIGNED_TO_PROJECT)
+@Tag(name = "log-async-controller", description = "Log Async Controller")
 public class LogAsyncController {
 
   private final ProjectExtractor projectExtractor;
@@ -88,7 +90,7 @@ public LogAsyncController(ProjectExtractor projectExtractor,
   @HttpLogging
   @PostMapping(consumes = {MediaType.APPLICATION_JSON_VALUE})
   @ResponseStatus(CREATED)
-  @ApiIgnore
+  @Hidden
   @PreAuthorize(ALLOWED_TO_REPORT)
   public EntryCreatedAsyncRS createLog(@PathVariable String projectName,
       @RequestBody SaveLogRQ createLogRQ,
@@ -101,7 +103,7 @@ public EntryCreatedAsyncRS createLog(@PathVariable String projectName,
   @HttpLogging
   @PostMapping(value = "/entry", consumes = {MediaType.APPLICATION_JSON_VALUE})
   @ResponseStatus(CREATED)
-  @ApiOperation("Create log")
+  @Operation(summary = "Create log")
   @PreAuthorize(ALLOWED_TO_REPORT)
   public EntryCreatedAsyncRS createLogEntry(@PathVariable String projectName,
       @RequestBody SaveLogRQ createLogRQ,
@@ -113,7 +115,7 @@ public EntryCreatedAsyncRS createLogEntry(@PathVariable String projectName,
 
   @HttpLogging
   @PostMapping(consumes = {MediaType.MULTIPART_FORM_DATA_VALUE})
-  @ApiOperation("Create log (batching operation)")
+  @Operation(summary = "Create log (batching operation)")
   // Specific handler should be added for springfox in case of similar POST
   // request mappings
   //	@Async
diff --git a/src/main/java/com/epam/ta/reportportal/ws/controller/LogController.java b/src/main/java/com/epam/ta/reportportal/ws/controller/LogController.java
index 50628ef033..eb00cf0fc8 100644
--- a/src/main/java/com/epam/ta/reportportal/ws/controller/LogController.java
+++ b/src/main/java/com/epam/ta/reportportal/ws/controller/LogController.java
@@ -53,8 +53,10 @@
 import com.epam.ta.reportportal.ws.resolver.FilterFor;
 import com.epam.ta.reportportal.ws.resolver.SortFor;
 import com.google.common.collect.ImmutableMap;
-import io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.ApiParam;
+import io.swagger.v3.oas.annotations.Hidden;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.tags.Tag;
 import java.io.Serializable;
 import java.util.List;
 import java.util.Map;
@@ -82,7 +84,6 @@
 import org.springframework.web.bind.annotation.ResponseStatus;
 import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.multipart.MultipartFile;
-import springfox.documentation.annotations.ApiIgnore;
 
 /**
  * @author Pavel Bortnik
@@ -90,6 +91,7 @@
 @RestController
 @RequestMapping("/v1/{projectName}/log")
 @PreAuthorize(ASSIGNED_TO_PROJECT)
+@Tag(name = "log-controller", description = "Log Controller")
 public class LogController {
 
   private final ProjectExtractor projectExtractor;
@@ -120,7 +122,7 @@ public LogController(ProjectExtractor projectExtractor,
   @Deprecated
   @PostMapping(consumes = { MediaType.APPLICATION_JSON_VALUE })
   @ResponseStatus(CREATED)
-  @ApiIgnore
+  @Hidden
   @PreAuthorize(ALLOWED_TO_REPORT)
   public EntryCreatedAsyncRS createLog(@PathVariable String projectName,
       @RequestBody SaveLogRQ createLogRQ, @AuthenticationPrincipal ReportPortalUser user) {
@@ -133,7 +135,7 @@ public EntryCreatedAsyncRS createLog(@PathVariable String projectName,
   /* Report client API */
   @PostMapping(value = "/entry", consumes = { MediaType.APPLICATION_JSON_VALUE })
   @ResponseStatus(CREATED)
-  @ApiOperation("Create log")
+  @Operation(summary = "Create log")
   @PreAuthorize(ALLOWED_TO_REPORT)
   public EntryCreatedAsyncRS createLogEntry(@PathVariable String projectName,
       @RequestBody SaveLogRQ createLogRQ, @AuthenticationPrincipal ReportPortalUser user) {
@@ -144,7 +146,7 @@ public EntryCreatedAsyncRS createLogEntry(@PathVariable String projectName,
   }
 
   @PostMapping(consumes = { MediaType.MULTIPART_FORM_DATA_VALUE })
-  @ApiOperation("Create log (batching operation)")
+  @Operation(summary = "Create log (batching operation)")
   // Specific handler should be added for springfox in case of similar POST
   // request mappings
   //	@Async
@@ -205,7 +207,7 @@ public ResponseEntity<BatchSaveOperatingRS> createLog(@PathVariable String proje
   /* Frontend API */
 
   @RequestMapping(value = "/{logId}", method = RequestMethod.DELETE)
-  @ApiOperation("Delete log")
+  @Operation(summary = "Delete log")
   @Transactional
   public OperationCompletionRS deleteLog(@PathVariable String projectName, @PathVariable Long logId,
       @AuthenticationPrincipal ReportPortalUser user) {
@@ -215,7 +217,7 @@ public OperationCompletionRS deleteLog(@PathVariable String projectName, @PathVa
   }
 
   @RequestMapping(method = RequestMethod.GET)
-  @ApiOperation("Get logs by filter")
+  @Operation(summary = "Get logs by filter")
   @Transactional(readOnly = true)
   public Iterable<LogResource> getLogs(@PathVariable String projectName,
       @RequestParam(value = DEFAULT_FILTER_PREFIX + UNDR + CRITERIA_PATH, required = false)
@@ -228,7 +230,7 @@ public Iterable<LogResource> getLogs(@PathVariable String projectName,
   }
 
   @PostMapping(value = "/under")
-  @ApiOperation("Get logs under items")
+  @Operation(summary = "Get logs under items")
   @Transactional(readOnly = true)
   public Map<Long, List<LogResource>> getLogsUnder(@PathVariable String projectName,
       @RequestBody GetLogsUnderRq logsUnderRq, @AuthenticationPrincipal ReportPortalUser user) {
@@ -238,7 +240,7 @@ public Map<Long, List<LogResource>> getLogsUnder(@PathVariable String projectNam
   }
 
   @GetMapping(value = "/{logId}/page")
-  @ApiOperation("Get logs by filter")
+  @Operation(summary = "Get logs by filter")
   @Transactional(readOnly = true)
   public Map<String, Serializable> getPageNumber(@PathVariable String projectName,
       @PathVariable Long logId, @FilterFor(Log.class) Filter filter,
@@ -251,7 +253,7 @@ public Map<String, Serializable> getPageNumber(@PathVariable String projectName,
   }
 
   @GetMapping(value = "/{logId}")
-  @ApiOperation("Get log by ID")
+  @Operation(summary = "Get log by ID")
   @Transactional(readOnly = true)
   public LogResource getLog(@PathVariable String projectName, @PathVariable String logId,
       @AuthenticationPrincipal ReportPortalUser user) {
@@ -266,7 +268,7 @@ public LogResource getLog(@PathVariable String projectName, @PathVariable String
    */
   @Deprecated(since = "5.8", forRemoval = true)
   @GetMapping(value = "/uuid/{logId}")
-  @ApiOperation("Get log by UUID (Will be removed in version 6.0)")
+  @Operation(summary = "Get log by UUID (Will be removed in version 6.0)")
   @Transactional(readOnly = true)
   public LogResource getLogByUuid(@PathVariable String projectName, @PathVariable String logId,
       @AuthenticationPrincipal ReportPortalUser user) {
@@ -276,10 +278,10 @@ public LogResource getLogByUuid(@PathVariable String projectName, @PathVariable
   }
 
   @GetMapping(value = "/nested/{parentId}")
-  @ApiOperation("Get nested steps with logs for the parent Test Item")
+  @Operation(summary = "Get nested steps with logs for the parent Test Item")
   @Transactional(readOnly = true)
   public Iterable<?> getNestedItems(@PathVariable String projectName, @PathVariable Long parentId,
-      @ApiParam(required = false) @RequestParam Map<String, String> params,
+      @Parameter(required = false) @RequestParam Map<String, String> params,
       @FilterFor(Log.class) Filter filter, @SortFor(Log.class) Pageable pageable,
       @AuthenticationPrincipal ReportPortalUser user) {
     return getLogHandler.getNestedItems(parentId,
@@ -288,7 +290,7 @@ public Iterable<?> getNestedItems(@PathVariable String projectName, @PathVariabl
   }
 
   @GetMapping(value = "/locations/{parentId}")
-  @ApiOperation("Get next or previous log in test item")
+  @Operation(summary = "Get next or previous log in test item")
   @Transactional(readOnly = true)
   public List<PagedLogResource> getErrorPage(@PathVariable String projectName,
       @PathVariable Long parentId, @RequestParam Map<String, String> params,
@@ -301,7 +303,7 @@ public List<PagedLogResource> getErrorPage(@PathVariable String projectName,
 
   @PostMapping("search/{itemId}")
   @ResponseStatus(OK)
-  @ApiOperation("Search test items with similar error logs")
+  @Operation(summary = "Search test items with similar error logs")
   public Iterable<SearchLogRs> searchLogs(@PathVariable String projectName,
       @RequestBody SearchLogRq request, @PathVariable Long itemId,
       @AuthenticationPrincipal ReportPortalUser user) {
diff --git a/src/main/java/com/epam/ta/reportportal/ws/controller/OnboardingController.java b/src/main/java/com/epam/ta/reportportal/ws/controller/OnboardingController.java
index 92aebdda3a..899e16a940 100644
--- a/src/main/java/com/epam/ta/reportportal/ws/controller/OnboardingController.java
+++ b/src/main/java/com/epam/ta/reportportal/ws/controller/OnboardingController.java
@@ -16,7 +16,8 @@
 package com.epam.ta.reportportal.ws.controller;
 
 import com.epam.ta.reportportal.core.onboarding.OnboardingService;
-import io.swagger.annotations.ApiOperation;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.tags.Tag;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
@@ -27,6 +28,7 @@
  */
 @RestController
 @RequestMapping("/v1/onboarding")
+@Tag(name = "onboarding-controller", description = "Onboarding Controller")
 public class OnboardingController {
 
   private final OnboardingService onboardingService;
@@ -40,7 +42,7 @@ public OnboardingController(OnboardingService onboardingService) {
    * something else.
    */
     @GetMapping(value = { "" })
-    @ApiOperation("Return onboarding information for page if available, -1 otherwise")
+    @Operation(summary = "Return onboarding information for page if available, -1 otherwise")
     public Object onBoarding(@RequestParam(value = "page", defaultValue = "GENERAL") String page) {
         // object because it can be different types of onboarding data
         Object data = onboardingService.getOnboardingDataForPageIfAvailable(page);
diff --git a/src/main/java/com/epam/ta/reportportal/ws/controller/PluginController.java b/src/main/java/com/epam/ta/reportportal/ws/controller/PluginController.java
index 0ef56e4e81..749df238b8 100644
--- a/src/main/java/com/epam/ta/reportportal/ws/controller/PluginController.java
+++ b/src/main/java/com/epam/ta/reportportal/ws/controller/PluginController.java
@@ -31,7 +31,8 @@
 import com.epam.ta.reportportal.model.integration.UpdatePluginStateRQ;
 import com.epam.ta.reportportal.util.ProjectExtractor;
 import com.epam.ta.reportportal.ws.model.OperationCompletionRS;
-import io.swagger.annotations.ApiOperation;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.tags.Tag;
 import java.util.List;
 import java.util.Map;
 import javax.validation.Valid;
@@ -59,6 +60,7 @@
  */
 @RestController
 @RequestMapping(value = "/v1/plugin")
+@Tag(name = "plugin-controller", description = "Plugin Controller")
 public class PluginController {
 
   private final CreatePluginHandler createPluginHandler;
@@ -84,7 +86,7 @@ public PluginController(CreatePluginHandler createPluginHandler,
   @Transactional
   @PostMapping(consumes = MediaType.MULTIPART_FORM_DATA_VALUE)
   @ResponseStatus(HttpStatus.CREATED)
-  @ApiOperation("Upload new Report Portal plugin")
+  @Operation(summary = "Upload new Report Portal plugin")
   @PreAuthorize(ADMIN_ONLY)
   public EntryCreatedRS uploadPlugin(@NotNull @RequestParam("file") MultipartFile pluginFile,
       @AuthenticationPrincipal ReportPortalUser user) {
@@ -94,7 +96,7 @@ public EntryCreatedRS uploadPlugin(@NotNull @RequestParam("file") MultipartFile
   @Transactional
   @PutMapping(value = "/{pluginId}")
   @ResponseStatus(HttpStatus.OK)
-  @ApiOperation("Update Report Portal plugin state")
+  @Operation(summary = "Update Report Portal plugin state")
   @PreAuthorize(ADMIN_ONLY)
   public OperationCompletionRS updatePluginState(@PathVariable(value = "pluginId") Long id,
       @RequestBody @Valid UpdatePluginStateRQ updatePluginStateRQ,
@@ -105,7 +107,7 @@ public OperationCompletionRS updatePluginState(@PathVariable(value = "pluginId")
   @Transactional(readOnly = true)
   @GetMapping
   @ResponseStatus(HttpStatus.OK)
-  @ApiOperation("Get all available plugins")
+  @Operation(summary = "Get all available plugins")
   public List<IntegrationTypeResource> getPlugins(@AuthenticationPrincipal ReportPortalUser user) {
     return getPluginHandler.getPlugins();
   }
@@ -113,7 +115,7 @@ public List<IntegrationTypeResource> getPlugins(@AuthenticationPrincipal ReportP
   @Transactional
   @DeleteMapping(value = "/{pluginId}")
   @ResponseStatus(HttpStatus.OK)
-  @ApiOperation("Delete plugin by id")
+  @Operation(summary = "Delete plugin by id")
   @PreAuthorize(ADMIN_ONLY)
   public OperationCompletionRS deletePlugin(@PathVariable(value = "pluginId") Long id,
       @AuthenticationPrincipal ReportPortalUser user) {
@@ -125,7 +127,7 @@ public OperationCompletionRS deletePlugin(@PathVariable(value = "pluginId") Long
       APPLICATION_JSON_VALUE })
   @ResponseStatus(HttpStatus.OK)
   @PreAuthorize(ASSIGNED_TO_PROJECT)
-  @ApiOperation("Execute command to the plugin instance")
+  @Operation(summary = "Execute command to the plugin instance")
   public Object executePluginCommand(@PathVariable String projectName,
       @PathVariable("pluginName") String pluginName, @PathVariable("command") String command,
       @RequestBody Map<String, Object> executionParams,
diff --git a/src/main/java/com/epam/ta/reportportal/ws/controller/PluginPublicController.java b/src/main/java/com/epam/ta/reportportal/ws/controller/PluginPublicController.java
index 5766a5f230..3e5fec00fe 100644
--- a/src/main/java/com/epam/ta/reportportal/ws/controller/PluginPublicController.java
+++ b/src/main/java/com/epam/ta/reportportal/ws/controller/PluginPublicController.java
@@ -24,7 +24,8 @@
 import com.epam.ta.reportportal.entity.attachment.BinaryData;
 import com.epam.ta.reportportal.model.integration.IntegrationTypeResource;
 import com.epam.ta.reportportal.util.BinaryDataResponseWriter;
-import io.swagger.annotations.ApiOperation;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.tags.Tag;
 import java.util.List;
 import java.util.Map;
 import javax.servlet.http.HttpServletResponse;
@@ -42,6 +43,7 @@
  */
 @RestController
 @RequestMapping(value = "/v1/plugin/public")
+@Tag(name = "plugin-public-controller", description = "Plugin Public Controller")
 public class PluginPublicController {
 
   private final PluginFilesProvider pluginPublicFilesProvider;
@@ -60,7 +62,7 @@ public PluginPublicController(PluginFilesProvider pluginPublicFilesProvider,
 
   @GetMapping(value = "/{pluginName}/file/{name}")
   @ResponseStatus(HttpStatus.OK)
-  @ApiOperation("Get public plugin file without authentication")
+  @Operation(summary = "Get public plugin file without authentication")
   public void getPublicFile(@PathVariable(value = "pluginName") String pluginName,
       @PathVariable(value = "name") String fileName, HttpServletResponse response) {
     final BinaryData binaryData = pluginPublicFilesProvider.load(pluginName, fileName);
@@ -69,7 +71,7 @@ public void getPublicFile(@PathVariable(value = "pluginName") String pluginName,
 
   @PutMapping(value = "/{pluginName}/{command}", consumes = { APPLICATION_JSON_VALUE })
   @ResponseStatus(HttpStatus.OK)
-  @ApiOperation("Execute public command without authentication")
+  @Operation(summary = "Execute public command without authentication")
   public Object executePublicPluginCommand(@PathVariable("pluginName") String pluginName,
       @PathVariable("command") String command, @RequestBody Map<String, Object> executionParams) {
     return executeIntegrationHandler.executePublicCommand(pluginName, command, executionParams);
@@ -77,7 +79,7 @@ public Object executePublicPluginCommand(@PathVariable("pluginName") String plug
 
   @GetMapping
   @ResponseStatus(HttpStatus.OK)
-  @ApiOperation("Get all available public plugins")
+  @Operation(summary = "Get all available public plugins")
   public List<IntegrationTypeResource> getPlugins() {
     return getPluginHandler.getPublicPlugins();
   }
diff --git a/src/main/java/com/epam/ta/reportportal/ws/controller/ProjectController.java b/src/main/java/com/epam/ta/reportportal/ws/controller/ProjectController.java
index 0fcea11f41..7e0ef21c91 100644
--- a/src/main/java/com/epam/ta/reportportal/ws/controller/ProjectController.java
+++ b/src/main/java/com/epam/ta/reportportal/ws/controller/ProjectController.java
@@ -64,8 +64,10 @@
 import com.epam.ta.reportportal.ws.resolver.FilterCriteriaResolver;
 import com.epam.ta.reportportal.ws.resolver.FilterFor;
 import com.epam.ta.reportportal.ws.resolver.SortFor;
-import io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.ApiParam;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.media.Schema;
+import io.swagger.v3.oas.annotations.tags.Tag;
 import java.io.IOException;
 import java.io.OutputStream;
 import java.security.Principal;
@@ -99,6 +101,7 @@
  */
 @RestController
 @RequestMapping("/v1/project")
+@Tag(name = "project-controller", description = "Project Controller")
 public class ProjectController {
 
   private final ProjectExtractor projectExtractor;
@@ -135,7 +138,7 @@ public ProjectController(ProjectExtractor projectExtractor, GetProjectHandler ge
   @PostMapping
   @ResponseStatus(CREATED)
   @PreAuthorize(ADMIN_ONLY)
-  @ApiOperation("Create new project")
+  @Operation(summary = "Create new project")
   public EntryCreatedRS createProject(@RequestBody @Validated CreateProjectRQ createProjectRQ,
       @AuthenticationPrincipal ReportPortalUser user) {
     return createProjectHandler.createProject(createProjectRQ, user);
@@ -145,7 +148,7 @@ public EntryCreatedRS createProject(@RequestBody @Validated CreateProjectRQ crea
   @PutMapping("/{projectName}")
   @ResponseStatus(OK)
   @PreAuthorize(PROJECT_MANAGER_OR_ADMIN)
-  @ApiOperation(value = "Update project")
+  @Operation(summary =  "Update project")
   public OperationCompletionRS updateProject(@PathVariable String projectName,
       @RequestBody @Validated UpdateProjectRQ updateProjectRQ,
       @AuthenticationPrincipal ReportPortalUser user) {
@@ -156,7 +159,7 @@ public OperationCompletionRS updateProject(@PathVariable String projectName,
   @PutMapping("/{projectName}/notification")
   @ResponseStatus(OK)
   @PreAuthorize(PROJECT_MANAGER)
-  @ApiOperation("Update project notifications configuration")
+  @Operation(summary = "Update project notifications configuration")
   public OperationCompletionRS updateProjectNotificationConfig(@PathVariable String projectName,
       @RequestBody @Validated ProjectNotificationConfigDTO updateProjectNotificationConfigRQ,
       @AuthenticationPrincipal ReportPortalUser user) {
@@ -168,7 +171,7 @@ public OperationCompletionRS updateProjectNotificationConfig(@PathVariable Strin
   @DeleteMapping
   @ResponseStatus(OK)
   @PreAuthorize(ADMIN_ONLY)
-  @ApiOperation(value = "Delete multiple projects", notes = "Could be deleted only by users with administrator role")
+  @Operation(summary =  "Delete multiple projects", description = "Could be deleted only by users with administrator role")
   public DeleteBulkRS deleteProject(@RequestBody @Valid DeleteBulkRQ deleteBulkRQ,
       @AuthenticationPrincipal ReportPortalUser user) {
     return deleteProjectHandler.bulkDeleteProjects(deleteBulkRQ.getIds(), user);
@@ -177,7 +180,7 @@ public DeleteBulkRS deleteProject(@RequestBody @Valid DeleteBulkRQ deleteBulkRQ,
   @DeleteMapping("/{projectId}")
   @ResponseStatus(OK)
   @PreAuthorize(ADMIN_ONLY)
-  @ApiOperation(value = "Delete project", notes = "Could be deleted only by users with administrator role")
+  @Operation(summary =  "Delete project", description = "Could be deleted only by users with administrator role")
   public OperationCompletionRS deleteProject(@PathVariable Long projectId,
       @AuthenticationPrincipal ReportPortalUser user) {
     return deleteProjectHandler.deleteProject(projectId, user);
@@ -186,7 +189,7 @@ public OperationCompletionRS deleteProject(@PathVariable Long projectId,
   @DeleteMapping("/{projectName}/index")
   @ResponseStatus(OK)
   @PreAuthorize(PROJECT_MANAGER_OR_ADMIN)
-  @ApiOperation("Delete project index from ML")
+  @Operation(summary = "Delete project index from ML")
   public OperationCompletionRS deleteProjectIndex(@PathVariable String projectName,
       Principal principal) {
     return deleteProjectHandler.deleteProjectIndex(normalizeId(projectName), principal.getName());
@@ -196,7 +199,7 @@ public OperationCompletionRS deleteProjectIndex(@PathVariable String projectName
   @PutMapping("/{projectName}/index")
   @ResponseStatus(OK)
   @PreAuthorize(PROJECT_MANAGER_OR_ADMIN)
-  @ApiOperation(value = "Starts reindex all project data in ML")
+  @Operation(summary =  "Starts reindex all project data in ML")
   public OperationCompletionRS indexProjectData(@PathVariable String projectName,
       @AuthenticationPrincipal ReportPortalUser user) {
     return updateProjectHandler.indexProjectData(normalizeId(projectName), user);
@@ -205,7 +208,7 @@ public OperationCompletionRS indexProjectData(@PathVariable String projectName,
   @Transactional(readOnly = true)
   @GetMapping("/{projectName}/users")
   @PreAuthorize(NOT_CUSTOMER)
-  @ApiOperation("Get users assigned on current project")
+  @Operation(summary = "Get users assigned on current project")
   public Iterable<UserResource> getProjectUsers(@PathVariable String projectName,
       @FilterFor(User.class) Filter filter, @SortFor(User.class) Pageable pageable,
       @AuthenticationPrincipal ReportPortalUser user) {
@@ -215,7 +218,7 @@ public Iterable<UserResource> getProjectUsers(@PathVariable String projectName,
   @Transactional(readOnly = true)
   @GetMapping("/{projectName}")
   @PreAuthorize(ASSIGNED_TO_PROJECT)
-  @ApiOperation(value = "Get information about project", notes = "Only for users that are assigned to the project")
+  @Operation(summary =  "Get information about project", description = "Only for users that are assigned to the project")
   public ProjectResource getProject(@PathVariable String projectName,
       @AuthenticationPrincipal ReportPortalUser user) {
     return getProjectHandler.getResource(normalizeId(projectName), user);
@@ -225,7 +228,7 @@ public ProjectResource getProject(@PathVariable String projectName,
   @PutMapping("/{projectName}/unassign")
   @ResponseStatus(OK)
   @PreAuthorize(PROJECT_MANAGER)
-  @ApiOperation("Un assign users")
+  @Operation(summary = "Un assign users")
   public OperationCompletionRS unassignProjectUsers(@PathVariable String projectName,
       @RequestBody @Validated UnassignUsersRQ unassignUsersRQ,
       @AuthenticationPrincipal ReportPortalUser user) {
@@ -236,7 +239,7 @@ public OperationCompletionRS unassignProjectUsers(@PathVariable String projectNa
   @PutMapping("/{projectName}/assign")
   @ResponseStatus(OK)
   @PreAuthorize(PROJECT_MANAGER)
-  @ApiOperation("Assign users")
+  @Operation(summary = "Assign users")
   public OperationCompletionRS assignProjectUsers(@PathVariable String projectName,
       @RequestBody @Validated AssignUsersRQ assignUsersRQ,
       @AuthenticationPrincipal ReportPortalUser user) {
@@ -247,7 +250,7 @@ public OperationCompletionRS assignProjectUsers(@PathVariable String projectName
   @GetMapping("/{projectName}/assignable")
   @ResponseStatus(OK)
   @PreAuthorize(PROJECT_MANAGER)
-  @ApiOperation(value = "Load users which can be assigned to specified project", notes = "Only for users with project manager permissions")
+  @Operation(summary =  "Load users which can be assigned to specified project", description = "Only for users with project manager permissions")
   public Iterable<UserResource> getUsersForAssign(@FilterFor(User.class) Filter filter,
       @SortFor(User.class) Pageable pageable, @PathVariable String projectName,
       @AuthenticationPrincipal ReportPortalUser user) {
@@ -260,7 +263,7 @@ public Iterable<UserResource> getUsersForAssign(@FilterFor(User.class) Filter fi
   @GetMapping("/{projectName}/usernames")
   @ResponseStatus(HttpStatus.OK)
   @PreAuthorize(NOT_CUSTOMER)
-  @ApiOperation(value = "Load project users by filter", notes = "Only for users that are members of the project")
+  @Operation(summary =  "Load project users by filter", description = "Only for users that are members of the project")
   public List<String> getProjectUsers(@PathVariable String projectName,
       @RequestParam(value = FilterCriteriaResolver.DEFAULT_FILTER_PREFIX + Condition.CNT + "users")
       String value, @AuthenticationPrincipal ReportPortalUser user) {
@@ -308,7 +311,7 @@ public OperationCompletionRS removeUserPreference(@PathVariable String projectNa
   @GetMapping("/{projectName}/preference/{login}")
   @ResponseStatus(HttpStatus.OK)
   @PreAuthorize(ALLOWED_TO_EDIT_USER)
-  @ApiOperation(value = "Load user preferences", notes = "Only for users that allowed to edit other users")
+  @Operation(summary =  "Load user preferences", description = "Only for users that allowed to edit other users")
   public PreferenceResource getUserPreference(@PathVariable String projectName,
       @PathVariable String login, @AuthenticationPrincipal ReportPortalUser user) {
     return getPreference.getPreference(projectExtractor.extractProjectDetails(user, projectName),
@@ -333,8 +336,8 @@ public Iterable<ProjectInfoResource> getAllProjectsInfo(
   @PreAuthorize(ADMIN_ONLY)
   @GetMapping(value = "/export")
   @ResponseStatus(HttpStatus.OK)
-  @ApiOperation(value = "Exports information about all projects", notes = "Allowable only for users with administrator role")
-  public void exportProjects(@ApiParam(allowableValues = "csv")
+  @Operation(summary =  "Exports information about all projects", description = "Allowable only for users with administrator role")
+  public void exportProjects(@Parameter(schema = @Schema(allowableValues = "csv"))
   @RequestParam(value = "view", required = false, defaultValue = "csv") String view,
       @FilterFor(ProjectInfo.class) Filter filter,
       @FilterFor(ProjectInfo.class) Queryable predefinedFilter,
diff --git a/src/main/java/com/epam/ta/reportportal/ws/controller/ProjectSettingsController.java b/src/main/java/com/epam/ta/reportportal/ws/controller/ProjectSettingsController.java
index b5b50ba943..89aba80a8d 100644
--- a/src/main/java/com/epam/ta/reportportal/ws/controller/ProjectSettingsController.java
+++ b/src/main/java/com/epam/ta/reportportal/ws/controller/ProjectSettingsController.java
@@ -42,7 +42,8 @@
 import com.epam.ta.reportportal.model.project.config.pattern.UpdatePatternTemplateRQ;
 import com.epam.ta.reportportal.model.project.email.SenderCaseDTO;
 import com.epam.ta.reportportal.ws.model.OperationCompletionRS;
-import io.swagger.annotations.ApiOperation;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.tags.Tag;
 import java.util.List;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
@@ -68,6 +69,7 @@
 @RestController
 @RequestMapping("/v1/{projectName}/settings")
 @PreAuthorize(ASSIGNED_TO_PROJECT)
+@Tag(name = "project-settings-controller", description = "Project Settings Controller")
 public class ProjectSettingsController {
 
   private final CreateProjectSettingsHandler createHandler;
@@ -110,7 +112,7 @@ public ProjectSettingsController(CreateProjectSettingsHandler createHandler,
   @PostMapping("/sub-type")
   @ResponseStatus(CREATED)
   @PreAuthorize(PROJECT_MANAGER)
-  @ApiOperation("Creation of custom project specific issue sub-type")
+  @Operation(summary = "Creation of custom project specific issue sub-type")
   public IssueSubTypeCreatedRS createProjectIssueSubType(@PathVariable String projectName,
       @RequestBody @Validated CreateIssueSubTypeRQ request,
       @AuthenticationPrincipal ReportPortalUser user) {
@@ -120,7 +122,7 @@ public IssueSubTypeCreatedRS createProjectIssueSubType(@PathVariable String proj
   @PutMapping("/sub-type")
   @ResponseStatus(OK)
   @PreAuthorize(PROJECT_MANAGER)
-  @ApiOperation("Update of custom project specific issue sub-type")
+  @Operation(summary = "Update of custom project specific issue sub-type")
   public OperationCompletionRS updateProjectIssueSubType(@PathVariable String projectName,
       @RequestBody @Validated UpdateIssueSubTypeRQ request,
       @AuthenticationPrincipal ReportPortalUser user) {
@@ -130,7 +132,7 @@ public OperationCompletionRS updateProjectIssueSubType(@PathVariable String proj
   @DeleteMapping("/sub-type/{id}")
   @ResponseStatus(OK)
   @PreAuthorize(PROJECT_MANAGER)
-  @ApiOperation("Delete custom project specific issue sub-type")
+  @Operation(summary = "Delete custom project specific issue sub-type")
   public OperationCompletionRS deleteProjectIssueSubType(@PathVariable String projectName,
       @PathVariable Long id, @AuthenticationPrincipal ReportPortalUser user) {
     return deleteHandler.deleteProjectIssueSubType(normalizeId(projectName), user, id);
@@ -139,7 +141,7 @@ public OperationCompletionRS deleteProjectIssueSubType(@PathVariable String proj
   @GetMapping
   @ResponseStatus(OK)
   @PreAuthorize(ASSIGNED_TO_PROJECT)
-  @ApiOperation(value = "Get project specific issue sub-types", notes = "Only for users that are assigned to the project")
+  @Operation(summary =  "Get project specific issue sub-types", description = "Only for users that are assigned to the project")
   public ProjectSettingsResource getProjectSettings(@PathVariable String projectName,
       @AuthenticationPrincipal ReportPortalUser user) {
     return getHandler.getProjectSettings(normalizeId(projectName));
@@ -148,7 +150,7 @@ public ProjectSettingsResource getProjectSettings(@PathVariable String projectNa
   @PostMapping("/pattern")
   @ResponseStatus(CREATED)
   @PreAuthorize(PROJECT_MANAGER)
-  @ApiOperation("Create pattern template for items' log messages pattern analysis")
+  @Operation(summary = "Create pattern template for items' log messages pattern analysis")
   public EntryCreatedRS createPatternTemplate(@PathVariable String projectName,
       @RequestBody @Validated CreatePatternTemplateRQ createPatternTemplateRQ,
       @AuthenticationPrincipal ReportPortalUser user) {
@@ -160,7 +162,7 @@ public EntryCreatedRS createPatternTemplate(@PathVariable String projectName,
   @PutMapping("/pattern/{id}")
   @ResponseStatus(OK)
   @PreAuthorize(PROJECT_MANAGER)
-  @ApiOperation("Update pattern template for items' log messages pattern analysis")
+  @Operation(summary = "Update pattern template for items' log messages pattern analysis")
   public OperationCompletionRS updatePatternTemplate(@PathVariable String projectName,
       @PathVariable Long id,
       @RequestBody @Validated UpdatePatternTemplateRQ updatePatternTemplateRQ,
@@ -173,7 +175,7 @@ public OperationCompletionRS updatePatternTemplate(@PathVariable String projectN
   @DeleteMapping("/pattern/{id}")
   @ResponseStatus(OK)
   @PreAuthorize(PROJECT_MANAGER)
-  @ApiOperation("Delete pattern template for items' log messages pattern analysis")
+  @Operation(summary = "Delete pattern template for items' log messages pattern analysis")
   public OperationCompletionRS deletePatternTemplate(@PathVariable String projectName,
       @PathVariable Long id, @AuthenticationPrincipal ReportPortalUser user) {
     return deleteHandler.deletePatternTemplate(normalizeId(projectName), user, id);
@@ -183,7 +185,7 @@ public OperationCompletionRS deletePatternTemplate(@PathVariable String projectN
   @GetMapping("/notification")
   @ResponseStatus(OK)
   @PreAuthorize(ASSIGNED_TO_PROJECT)
-  @ApiOperation(value = "Returns notifications config of specified project", notes = "Only for users assigned to specified project")
+  @Operation(summary =  "Returns notifications config of specified project", description = "Only for users assigned to specified project")
   public List<SenderCaseDTO> getNotifications(@PathVariable String projectName) {
     return getProjectNotificationsHandler.getProjectNotifications(
         getProjectHandler.get(normalizeId(projectName)).getId());
@@ -193,7 +195,7 @@ public List<SenderCaseDTO> getNotifications(@PathVariable String projectName) {
   @PostMapping("/notification")
   @ResponseStatus(CREATED)
   @PreAuthorize(PROJECT_MANAGER_OR_ADMIN)
-  @ApiOperation(value = "Creates notification for specified project", notes = "Only for users with PROJECT_MANAGER or ADMIN roles")
+  @Operation(summary =  "Creates notification for specified project", description = "Only for users with PROJECT_MANAGER or ADMIN roles")
   public EntryCreatedRS createNotification(@PathVariable String projectName,
       @RequestBody @Validated SenderCaseDTO createNotificationRQ,
       @AuthenticationPrincipal ReportPortalUser user) {
@@ -205,7 +207,7 @@ public EntryCreatedRS createNotification(@PathVariable String projectName,
   @PutMapping("/notification")
   @ResponseStatus(CREATED)
   @PreAuthorize(PROJECT_MANAGER_OR_ADMIN)
-  @ApiOperation(value = "Updates notification for specified project", notes = "Only for users with PROJECT_MANAGER or ADMIN roles")
+  @Operation(summary =  "Updates notification for specified project", description = "Only for users with PROJECT_MANAGER or ADMIN roles")
   public OperationCompletionRS updateNotification(@PathVariable String projectName,
       @RequestBody @Validated SenderCaseDTO updateNotificationRQ,
       @AuthenticationPrincipal ReportPortalUser user) {
@@ -217,7 +219,7 @@ public OperationCompletionRS updateNotification(@PathVariable String projectName
   @DeleteMapping("/notification/{notificationId:\\d+}")
   @ResponseStatus(OK)
   @PreAuthorize(PROJECT_MANAGER_OR_ADMIN)
-  @ApiOperation(value = "Deletes notification for specified project", notes = "Only for users with PROJECT_MANAGER or ADMIN roles")
+  @Operation(summary =  "Deletes notification for specified project", description = "Only for users with PROJECT_MANAGER or ADMIN roles")
   public OperationCompletionRS deleteNotification(@PathVariable String projectName,
       @PathVariable Long notificationId, @AuthenticationPrincipal ReportPortalUser user) {
     return deleteNotificationHandler.deleteNotification(
diff --git a/src/main/java/com/epam/ta/reportportal/ws/controller/SettingsController.java b/src/main/java/com/epam/ta/reportportal/ws/controller/SettingsController.java
index f6cc50d1e0..a2078454dd 100644
--- a/src/main/java/com/epam/ta/reportportal/ws/controller/SettingsController.java
+++ b/src/main/java/com/epam/ta/reportportal/ws/controller/SettingsController.java
@@ -22,7 +22,8 @@
 import com.epam.ta.reportportal.core.admin.ServerAdminHandler;
 import com.epam.ta.reportportal.model.settings.AnalyticsResource;
 import com.epam.ta.reportportal.ws.model.OperationCompletionRS;
-import io.swagger.annotations.ApiOperation;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.tags.Tag;
 import java.util.Map;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpStatus;
@@ -44,6 +45,7 @@
 @RestController
 @RequestMapping("/v1/settings")
 @PreAuthorize(ADMIN_ONLY)
+@Tag(name = "settings-controller", description = "Settings Controller")
 public class SettingsController {
 
   private final ServerAdminHandler serverHandler;
@@ -56,7 +58,7 @@ public SettingsController(ServerAdminHandler serverHandler) {
   @Transactional
   @RequestMapping(value = "/analytics", method = { RequestMethod.PUT, RequestMethod.POST })
   @ResponseStatus(HttpStatus.OK)
-  @ApiOperation(value = "Update analytics settings")
+  @Operation(summary =  "Update analytics settings")
   public OperationCompletionRS saveAnalyticsSettings(
       @RequestBody @Validated AnalyticsResource request,
       @AuthenticationPrincipal ReportPortalUser user) {
@@ -66,7 +68,7 @@ public OperationCompletionRS saveAnalyticsSettings(
   @Transactional(readOnly = true)
   @GetMapping
   @ResponseStatus(HttpStatus.OK)
-  @ApiOperation(value = "Get server settings")
+  @Operation(summary =  "Get server settings")
   public Map<String, String> getServerSettings(@AuthenticationPrincipal ReportPortalUser user) {
     return serverHandler.getServerSettings();
   }
diff --git a/src/main/java/com/epam/ta/reportportal/ws/controller/TestItemAsyncController.java b/src/main/java/com/epam/ta/reportportal/ws/controller/TestItemAsyncController.java
index 0b234f8aa5..9f12f49d46 100644
--- a/src/main/java/com/epam/ta/reportportal/ws/controller/TestItemAsyncController.java
+++ b/src/main/java/com/epam/ta/reportportal/ws/controller/TestItemAsyncController.java
@@ -30,7 +30,8 @@
 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 io.swagger.annotations.ApiOperation;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.tags.Tag;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.security.access.prepost.PreAuthorize;
@@ -54,6 +55,7 @@
 @RestController
 @RequestMapping("/v2/{projectName}/item")
 @PreAuthorize(ASSIGNED_TO_PROJECT)
+@Tag(name = "test-item-async-controller", description = "Test Item Async Controller")
 public class TestItemAsyncController {
 
   private final ProjectExtractor projectExtractor;
@@ -72,7 +74,7 @@ public TestItemAsyncController(ProjectExtractor projectExtractor,
   @HttpLogging
   @PostMapping
   @ResponseStatus(CREATED)
-  @ApiOperation("Start a root test item")
+  @Operation(summary = "Start a root test item")
   @PreAuthorize(ALLOWED_TO_REPORT)
   public EntryCreatedAsyncRS startRootItem(@PathVariable String projectName,
       @AuthenticationPrincipal ReportPortalUser user,
@@ -84,7 +86,7 @@ public EntryCreatedAsyncRS startRootItem(@PathVariable String projectName,
   @HttpLogging
   @PostMapping("/{parentItem}")
   @ResponseStatus(CREATED)
-  @ApiOperation("Start a child test item")
+  @Operation(summary = "Start a child test item")
   @PreAuthorize(ALLOWED_TO_REPORT)
   public EntryCreatedAsyncRS startChildItem(@PathVariable String projectName,
       @AuthenticationPrincipal ReportPortalUser user,
@@ -96,7 +98,7 @@ public EntryCreatedAsyncRS startChildItem(@PathVariable String projectName,
   @HttpLogging
   @PutMapping("/{testItemId}")
   @ResponseStatus(OK)
-  @ApiOperation("Finish test item")
+  @Operation(summary = "Finish test item")
   @PreAuthorize(ALLOWED_TO_REPORT)
   public OperationCompletionRS finishTestItem(@PathVariable String projectName,
       @AuthenticationPrincipal ReportPortalUser user,
diff --git a/src/main/java/com/epam/ta/reportportal/ws/controller/TestItemController.java b/src/main/java/com/epam/ta/reportportal/ws/controller/TestItemController.java
index 3a31a568fa..41af6a8df5 100644
--- a/src/main/java/com/epam/ta/reportportal/ws/controller/TestItemController.java
+++ b/src/main/java/com/epam/ta/reportportal/ws/controller/TestItemController.java
@@ -63,7 +63,8 @@
 import com.epam.ta.reportportal.ws.model.statistics.StatisticsResource;
 import com.epam.ta.reportportal.ws.resolver.FilterFor;
 import com.epam.ta.reportportal.ws.resolver.SortFor;
-import io.swagger.annotations.ApiOperation;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.tags.Tag;
 import java.util.Collections;
 import java.util.List;
 import java.util.Map;
@@ -94,6 +95,7 @@
 @RestController
 @RequestMapping("/v1/{projectName}/item")
 @PreAuthorize(ASSIGNED_TO_PROJECT)
+@Tag(name = "test-item-controller", description = "Test Item Controller")
 public class TestItemController {
 
   public static final String HISTORY_TYPE_PARAM = "type";
@@ -133,7 +135,7 @@ public TestItemController(ProjectExtractor projectExtractor,
 
   @PostMapping
   @ResponseStatus(CREATED)
-  @ApiOperation("Start a root test item")
+  @Operation(summary = "Start a root test item")
   @PreAuthorize(ALLOWED_TO_REPORT)
   public EntryCreatedAsyncRS startRootItem(@PathVariable String projectName,
       @AuthenticationPrincipal ReportPortalUser user,
@@ -145,7 +147,7 @@ public EntryCreatedAsyncRS startRootItem(@PathVariable String projectName,
 
   @PostMapping("/{parentItem}")
   @ResponseStatus(CREATED)
-  @ApiOperation("Start a child test item")
+  @Operation(summary = "Start a child test item")
   @PreAuthorize(ALLOWED_TO_REPORT)
   public EntryCreatedAsyncRS startChildItem(@PathVariable String projectName,
       @AuthenticationPrincipal ReportPortalUser user, @PathVariable String parentItem,
@@ -157,7 +159,7 @@ public EntryCreatedAsyncRS startChildItem(@PathVariable String projectName,
 
   @PutMapping("/{testItemId}")
   @ResponseStatus(OK)
-  @ApiOperation("Finish test item")
+  @Operation(summary = "Finish test item")
   @PreAuthorize(ALLOWED_TO_REPORT)
   public OperationCompletionRS finishTestItem(@PathVariable String projectName,
       @AuthenticationPrincipal ReportPortalUser user, @PathVariable String testItemId,
@@ -173,7 +175,7 @@ public OperationCompletionRS finishTestItem(@PathVariable String projectName,
   @Transactional(readOnly = true)
   @GetMapping("/{itemId}")
   @ResponseStatus(OK)
-  @ApiOperation("Find test item by ID")
+  @Operation(summary = "Find test item by ID")
   public TestItemResource getTestItem(@PathVariable String projectName,
       @AuthenticationPrincipal ReportPortalUser user, @PathVariable String itemId) {
     return getTestItemHandler.getTestItem(itemId,
@@ -185,7 +187,7 @@ public TestItemResource getTestItem(@PathVariable String projectName,
   @Transactional(readOnly = true)
   @GetMapping("/uuid/{itemId}")
   @ResponseStatus(OK)
-  @ApiOperation("Find test item by UUID")
+  @Operation(summary = "Find test item by UUID")
   public TestItemResource getTestItemByUuid(@PathVariable String projectName,
       @AuthenticationPrincipal ReportPortalUser user, @PathVariable String itemId) {
     return getTestItemHandler.getTestItem(itemId,
@@ -197,7 +199,7 @@ public TestItemResource getTestItemByUuid(@PathVariable String projectName,
   @Transactional(readOnly = true)
   @GetMapping("/suggest/{itemId}")
   @ResponseStatus(OK)
-  @ApiOperation("Search suggested items in analyzer for provided one")
+  @Operation(summary = "Search suggested items in analyzer for provided one")
   public List<SuggestedItem> getSuggestedItems(@PathVariable String projectName,
       @AuthenticationPrincipal ReportPortalUser user, @PathVariable Long itemId) {
     return suggestItemService.suggestItems(itemId,
@@ -207,7 +209,7 @@ public List<SuggestedItem> getSuggestedItems(@PathVariable String projectName,
 
   @GetMapping("/suggest/cluster/{clusterId}")
   @ResponseStatus(OK)
-  @ApiOperation("Search suggested items in analyzer for provided one")
+  @Operation(summary = "Search suggested items in analyzer for provided one")
   public List<SuggestedItem> getSuggestedClusterItems(@PathVariable String projectName,
       @AuthenticationPrincipal ReportPortalUser user, @PathVariable Long clusterId) {
     return suggestItemService.suggestClusterItems(clusterId,
@@ -218,7 +220,7 @@ public List<SuggestedItem> getSuggestedClusterItems(@PathVariable String project
   @Transactional
   @PutMapping("/suggest/choice")
   @ResponseStatus(OK)
-  @ApiOperation("Handle user choice from suggested items")
+  @Operation(summary = "Handle user choice from suggested items")
   public OperationCompletionRS handleSuggestChoose(@PathVariable String projectName,
       @AuthenticationPrincipal ReportPortalUser user,
       @RequestBody @Validated List<SuggestInfo> request) {
@@ -230,7 +232,7 @@ public OperationCompletionRS handleSuggestChoose(@PathVariable String projectNam
   @Transactional(readOnly = true)
   @GetMapping
   @ResponseStatus(OK)
-  @ApiOperation("Find test items by specified filter")
+  @Operation(summary = "Find test items by specified filter")
   public Iterable<TestItemResource> getTestItems(@PathVariable String projectName,
       @AuthenticationPrincipal ReportPortalUser user, @Nullable
   @RequestParam(value = DEFAULT_FILTER_PREFIX + Condition.EQ + CRITERIA_LAUNCH_ID, required = false)
@@ -252,7 +254,7 @@ public Iterable<TestItemResource> getTestItems(@PathVariable String projectName,
   @Transactional(readOnly = true)
   @GetMapping("/v2")
   @ResponseStatus(OK)
-  @ApiOperation("Find test items by specified filter")
+  @Operation(summary = "Find test items by specified filter")
   public Iterable<TestItemResource> getTestItemsV2(@PathVariable String projectName,
       @AuthenticationPrincipal ReportPortalUser user, @RequestParam Map<String, String> params,
       @FilterFor(TestItem.class) Filter filter,
@@ -271,7 +273,7 @@ public Iterable<TestItemResource> getTestItemsV2(@PathVariable String projectNam
   @Transactional(readOnly = true)
   @GetMapping("/statistics")
   @ResponseStatus(OK)
-  @ApiOperation("Find accumulated statistics of items by specified filter")
+  @Operation(summary = "Find accumulated statistics of items by specified filter")
   public StatisticsResource getTestItems(@PathVariable String projectName,
       @AuthenticationPrincipal ReportPortalUser user, @FilterFor(TestItem.class) Filter filter,
       @FilterFor(TestItem.class) Queryable predefinedFilter,
@@ -285,7 +287,7 @@ public StatisticsResource getTestItems(@PathVariable String projectName,
   @Transactional
   @DeleteMapping("/{itemId}")
   @ResponseStatus(OK)
-  @ApiOperation("Delete test item")
+  @Operation(summary = "Delete test item")
   public OperationCompletionRS deleteTestItem(@PathVariable String projectName,
       @AuthenticationPrincipal ReportPortalUser user, @PathVariable Long itemId) {
     return deleteTestItemHandler.deleteTestItem(itemId,
@@ -296,7 +298,7 @@ public OperationCompletionRS deleteTestItem(@PathVariable String projectName,
   @Transactional
   @DeleteMapping
   @ResponseStatus(OK)
-  @ApiOperation("Delete test items by specified ids")
+  @Operation(summary = "Delete test items by specified ids")
   public List<OperationCompletionRS> deleteTestItems(@PathVariable String projectName,
       @AuthenticationPrincipal ReportPortalUser user, @RequestParam(value = "ids") Set<Long> ids) {
     return deleteTestItemHandler.deleteTestItems(ids,
@@ -307,7 +309,7 @@ public List<OperationCompletionRS> deleteTestItems(@PathVariable String projectN
   @Transactional
   @PutMapping
   @ResponseStatus(OK)
-  @ApiOperation("Update issues of specified test items")
+  @Operation(summary = "Update issues of specified test items")
   public List<Issue> defineTestItemIssueType(@PathVariable String projectName,
       @AuthenticationPrincipal ReportPortalUser user,
       @RequestBody @Validated DefineIssueRQ request) {
@@ -318,7 +320,7 @@ public List<Issue> defineTestItemIssueType(@PathVariable String projectName,
   @Transactional(readOnly = true)
   @GetMapping("/history")
   @ResponseStatus(OK)
-  @ApiOperation("Load history of test items")
+  @Operation(summary = "Load history of test items")
   public Iterable<TestItemHistoryElement> getItemsHistory(@PathVariable String projectName,
       @AuthenticationPrincipal ReportPortalUser user, @FilterFor(TestItem.class) Filter filter,
       @FilterFor(TestItem.class) Queryable predefinedFilter,
@@ -349,7 +351,7 @@ public Iterable<TestItemHistoryElement> getItemsHistory(@PathVariable String pro
   @Transactional(readOnly = true)
   @GetMapping("/ticket/ids")
   @ResponseStatus(OK)
-  @ApiOperation("Get tickets that contains a term as a part inside for specified launch")
+  @Operation(summary = "Get tickets that contains a term as a part inside for specified launch")
   public List<String> getTicketIds(@AuthenticationPrincipal ReportPortalUser user,
       @PathVariable String projectName, @RequestParam(value = "launch") Long id,
       @RequestParam(value = "term") String term) {
@@ -359,7 +361,7 @@ public List<String> getTicketIds(@AuthenticationPrincipal ReportPortalUser user,
   @Transactional(readOnly = true)
   @GetMapping("/ticket/ids/all")
   @ResponseStatus(OK)
-  @ApiOperation("Get tickets that contains a term as a part inside for specified launch")
+  @Operation(summary = "Get tickets that contains a term as a part inside for specified launch")
   public List<String> getTicketIdsForProject(@AuthenticationPrincipal ReportPortalUser user,
       @PathVariable String projectName, @RequestParam(value = "term") String term) {
     return getTestItemHandler.getTicketIds(
@@ -370,7 +372,7 @@ public List<String> getTicketIdsForProject(@AuthenticationPrincipal ReportPortal
   @Transactional(readOnly = true)
   @GetMapping("/attribute/keys")
   @ResponseStatus(OK)
-  @ApiOperation("Get all unique attribute keys of specified launch")
+  @Operation(summary = "Get all unique attribute keys of specified launch")
   public List<String> getAttributeKeys(@PathVariable String projectName,
       @AuthenticationPrincipal ReportPortalUser user, @RequestParam(value = "launch") Long id,
       @RequestParam(value = DEFAULT_FILTER_PREFIX + Condition.CNT + CRITERIA_ITEM_ATTRIBUTE_KEY)
@@ -382,7 +384,7 @@ public List<String> getAttributeKeys(@PathVariable String projectName,
   @Transactional(readOnly = true)
   @GetMapping("/attribute/keys/all")
   @ResponseStatus(OK)
-  @ApiOperation("Get all unique attribute keys of specified launch")
+  @Operation(summary = "Get all unique attribute keys of specified launch")
   public List<String> getAttributeKeysForProject(@PathVariable String projectName,
       @AuthenticationPrincipal ReportPortalUser user,
       @RequestParam(value = DEFAULT_FILTER_PREFIX + Condition.CNT + CRITERIA_ITEM_ATTRIBUTE_KEY)
@@ -399,7 +401,7 @@ public List<String> getAttributeKeysForProject(@PathVariable String projectName,
   @Transactional(readOnly = true)
   @GetMapping("/attribute/values")
   @ResponseStatus(OK)
-  @ApiOperation("Get all unique attribute values of specified launch")
+  @Operation(summary = "Get all unique attribute values of specified launch")
   public List<String> getAttributeValues(@PathVariable String projectName,
       @AuthenticationPrincipal ReportPortalUser user, @RequestParam(value = "launch") Long id,
       @RequestParam(value = DEFAULT_FILTER_PREFIX + Condition.EQ
@@ -412,7 +414,7 @@ public List<String> getAttributeValues(@PathVariable String projectName,
   @Transactional(readOnly = true)
   @GetMapping("/step/attribute/keys")
   @ResponseStatus(OK)
-  @ApiOperation("Get all unique attribute keys of step items under specified project")
+  @Operation(summary = "Get all unique attribute keys of step items under specified project")
   public List<String> getAttributeKeys(@PathVariable String projectName,
       @AuthenticationPrincipal ReportPortalUser user,
       @RequestParam(value = DEFAULT_FILTER_PREFIX + Condition.EQ + CRITERIA_NAME, required = false)
@@ -428,7 +430,7 @@ public List<String> getAttributeKeys(@PathVariable String projectName,
   @Transactional(readOnly = true)
   @GetMapping("/step/attribute/values")
   @ResponseStatus(OK)
-  @ApiOperation("Get all unique attribute values of step items under specified project")
+  @Operation(summary = "Get all unique attribute values of step items under specified project")
   public List<String> getAttributeValues(@PathVariable String projectName,
       @AuthenticationPrincipal ReportPortalUser user,
       @RequestParam(value = DEFAULT_FILTER_PREFIX + Condition.EQ + CRITERIA_NAME, required = false)
@@ -446,7 +448,7 @@ public List<String> getAttributeValues(@PathVariable String projectName,
   @PutMapping(value = "/info")
   @PreAuthorize(PROJECT_MANAGER_OR_ADMIN)
   @ResponseStatus(OK)
-  @ApiOperation("Bulk update attributes and description")
+  @Operation(summary = "Bulk update attributes and description")
   public OperationCompletionRS bulkUpdate(@PathVariable String projectName,
       @RequestBody @Validated BulkInfoUpdateRQ bulkInfoUpdateRQ,
       @AuthenticationPrincipal ReportPortalUser user) {
@@ -458,7 +460,7 @@ public OperationCompletionRS bulkUpdate(@PathVariable String projectName,
   @Transactional
   @PutMapping("/{itemId}/update")
   @ResponseStatus(OK)
-  @ApiOperation("Update test item")
+  @Operation(summary = "Update test item")
   public OperationCompletionRS updateTestItem(@PathVariable String projectName,
       @AuthenticationPrincipal ReportPortalUser user, @PathVariable Long itemId,
       @RequestBody @Validated UpdateTestItemRQ rq) {
@@ -469,7 +471,7 @@ public OperationCompletionRS updateTestItem(@PathVariable String projectName,
   @Transactional
   @PutMapping("/issue/link")
   @ResponseStatus(OK)
-  @ApiOperation("Attach external issue for specified test items")
+  @Operation(summary = "Attach external issue for specified test items")
   public List<OperationCompletionRS> linkExternalIssues(@PathVariable String projectName,
       @AuthenticationPrincipal ReportPortalUser user,
       @RequestBody @Validated LinkExternalIssueRQ rq) {
@@ -481,7 +483,7 @@ public List<OperationCompletionRS> linkExternalIssues(@PathVariable String proje
   @Transactional
   @PutMapping("/issue/unlink")
   @ResponseStatus(OK)
-  @ApiOperation("Unlink external issue for specified test items")
+  @Operation(summary = "Unlink external issue for specified test items")
   public List<OperationCompletionRS> unlinkExternalIssues(@PathVariable String projectName,
       @AuthenticationPrincipal ReportPortalUser user,
       @RequestBody @Validated UnlinkExternalIssueRQ rq) {
@@ -493,7 +495,7 @@ public List<OperationCompletionRS> unlinkExternalIssues(@PathVariable String pro
   @Transactional(readOnly = true)
   @GetMapping("/items")
   @ResponseStatus(OK)
-  @ApiOperation("Get test items by specified ids")
+  @Operation(summary = "Get test items by specified ids")
   public List<TestItemResource> getTestItems(@PathVariable String projectName,
       @AuthenticationPrincipal ReportPortalUser user, @RequestParam(value = "ids") Long[] ids) {
     return getTestItemHandler.getTestItems(ids,
diff --git a/src/main/java/com/epam/ta/reportportal/ws/controller/UserController.java b/src/main/java/com/epam/ta/reportportal/ws/controller/UserController.java
index 7ebb7a84f7..5a63a0746c 100644
--- a/src/main/java/com/epam/ta/reportportal/ws/controller/UserController.java
+++ b/src/main/java/com/epam/ta/reportportal/ws/controller/UserController.java
@@ -61,8 +61,10 @@
 import com.epam.ta.reportportal.ws.resolver.FilterFor;
 import com.epam.ta.reportportal.ws.resolver.ResponseView;
 import com.epam.ta.reportportal.ws.resolver.SortFor;
-import io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.ApiParam;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.media.Schema;
+import io.swagger.v3.oas.annotations.tags.Tag;
 import java.io.IOException;
 import java.io.OutputStream;
 import java.util.Map;
@@ -90,6 +92,7 @@
 
 @RestController
 @RequestMapping("/users")
+@Tag(name = "user-controller", description = "User Controller")
 public class UserController {
 
   private final CreateUserHandler createUserMessageHandler;
@@ -121,7 +124,7 @@ public UserController(CreateUserHandler createUserMessageHandler,
   @PostMapping
   @ResponseStatus(CREATED)
   @PreAuthorize(ADMIN_ONLY)
-  @ApiOperation(value = "Create specified user", notes = "Allowable only for users with administrator role")
+  @Operation(summary =  "Create specified user", description = "Allowable only for users with administrator role")
   public CreateUserRS createUserByAdmin(@RequestBody @Validated CreateUserRQFull rq,
       @AuthenticationPrincipal ReportPortalUser currentUser, HttpServletRequest request) {
     return createUserMessageHandler.createUserByAdmin(rq, currentUser, composeBaseUrl(request));
@@ -131,7 +134,7 @@ public CreateUserRS createUserByAdmin(@RequestBody @Validated CreateUserRQFull r
   @PostMapping(value = "/bid")
   @ResponseStatus(CREATED)
   @PreAuthorize("(hasPermission(#createUserRQ.getDefaultProject(), 'projectManagerPermission')) || hasRole('ADMINISTRATOR')")
-  @ApiOperation("Register invitation for user who will be created")
+  @Operation(summary = "Register invitation for user who will be created")
   public CreateUserBidRS createUserBid(@RequestBody @Validated CreateUserRQ createUserRQ,
       @AuthenticationPrincipal ReportPortalUser currentUser, HttpServletRequest request) {
     return createUserMessageHandler.createUserBid(createUserRQ, currentUser,
@@ -141,7 +144,7 @@ public CreateUserBidRS createUserBid(@RequestBody @Validated CreateUserRQ create
 
   @PostMapping(value = "/registration")
   @ResponseStatus(CREATED)
-  @ApiOperation("Activate invitation and create user in system")
+  @Operation(summary = "Activate invitation and create user in system")
   public CreateUserRS createUser(@RequestBody @Validated CreateUserRQConfirm request,
       @RequestParam(value = "uuid") String uuid) {
     return createUserMessageHandler.createUser(request, uuid);
@@ -154,7 +157,7 @@ public UserBidRS getUserBidInfo(@RequestParam(value = "uuid") String uuid) {
   }
 
   @DeleteMapping(value = "/{id}")
-  @ApiOperation(value = "Delete specified user")
+  @Operation(summary =  "Delete specified user")
   public OperationCompletionRS deleteUser(@PathVariable(value = "id") Long userId,
       @AuthenticationPrincipal ReportPortalUser currentUser) {
     return deleteUserHandler.deleteUser(userId, currentUser);
@@ -163,7 +166,7 @@ public OperationCompletionRS deleteUser(@PathVariable(value = "id") Long userId,
   @DeleteMapping
   @PreAuthorize(ADMIN_ONLY)
   @ResponseStatus(OK)
-  @ApiOperation("Delete specified users by ids")
+  @Operation(summary = "Delete specified users by ids")
   public DeleteBulkRS deleteUsers(@RequestBody @Valid DeleteBulkRQ deleteBulkRQ,
       @AuthenticationPrincipal ReportPortalUser user) {
     return deleteUserHandler.deleteUsers(deleteBulkRQ.getIds(), user);
@@ -172,7 +175,7 @@ public DeleteBulkRS deleteUsers(@RequestBody @Valid DeleteBulkRQ deleteBulkRQ,
   @Transactional
   @PutMapping(value = "/{login}")
   @PreAuthorize(ALLOWED_TO_EDIT_USER)
-  @ApiOperation(value = "Edit specified user", notes = "Only for administrators and profile's owner")
+  @Operation(summary =  "Edit specified user", description = "Only for administrators and profile's owner")
   public OperationCompletionRS editUser(@PathVariable String login,
       @RequestBody @Validated EditUserRQ editUserRQ, @ActiveRole UserRole role,
       @AuthenticationPrincipal ReportPortalUser currentUser) {
@@ -183,7 +186,7 @@ public OperationCompletionRS editUser(@PathVariable String login,
   @GetMapping(value = "/{login}")
   @ResponseView(ModelViews.FullUserView.class)
   @PreAuthorize(ALLOWED_TO_EDIT_USER)
-  @ApiOperation(value = "Return information about specified user", notes = "Only for administrators and profile's owner")
+  @Operation(summary =  "Return information about specified user", description = "Only for administrators and profile's owner")
   public UserResource getUser(@PathVariable String login,
       @AuthenticationPrincipal ReportPortalUser currentUser) {
     return getUserHandler.getUser(EntityUtils.normalizeId(login), currentUser);
@@ -191,7 +194,7 @@ public UserResource getUser(@PathVariable String login,
 
   @Transactional(readOnly = true)
   @GetMapping(value = { "", "/" })
-  @ApiOperation("Return information about current logged-in user")
+  @Operation(summary = "Return information about current logged-in user")
   public UserResource getMyself(@AuthenticationPrincipal ReportPortalUser currentUser) {
     return getUserHandler.getUser(currentUser);
   }
@@ -200,7 +203,7 @@ public UserResource getMyself(@AuthenticationPrincipal ReportPortalUser currentU
   @GetMapping(value = "/all")
   @ResponseView(ModelViews.FullUserView.class)
   @PreAuthorize(ADMIN_ONLY)
-  @ApiOperation(value = "Return information about all users", notes = "Allowable only for users with administrator role")
+  @Operation(summary =  "Return information about all users", description = "Allowable only for users with administrator role")
   public Iterable<UserResource> getUsers(@FilterFor(User.class) Filter filter,
       @SortFor(User.class) Pageable pageable, @FilterFor(User.class) Queryable queryable,
       @AuthenticationPrincipal ReportPortalUser currentUser) {
@@ -220,7 +223,7 @@ public YesNoRS validateInfo(@RequestParam(value = "username", required = false)
   @Transactional
   @PostMapping(value = "/password/restore")
   @ResponseStatus(OK)
-  @ApiOperation("Create a restore password request")
+  @Operation(summary = "Create a restore password request")
   public OperationCompletionRS restorePassword(@RequestBody @Validated RestorePasswordRQ rq,
       HttpServletRequest request) {
     return createUserMessageHandler.createRestorePasswordBid(rq, composeBaseUrl(request));
@@ -229,7 +232,7 @@ public OperationCompletionRS restorePassword(@RequestBody @Validated RestorePass
   @Transactional
   @PostMapping(value = "/password/reset")
   @ResponseStatus(OK)
-  @ApiOperation("Reset password")
+  @Operation(summary = "Reset password")
   public OperationCompletionRS resetPassword(@RequestBody @Validated ResetPasswordRQ rq) {
     return createUserMessageHandler.resetPassword(rq);
   }
@@ -237,7 +240,7 @@ public OperationCompletionRS resetPassword(@RequestBody @Validated ResetPassword
   @Transactional(readOnly = true)
   @GetMapping(value = "/password/reset/{uuid}")
   @ResponseStatus(OK)
-  @ApiOperation("Check if a restore password bid exists")
+  @Operation(summary = "Check if a restore password bid exists")
   public YesNoRS isRestorePasswordBidExist(@PathVariable String uuid) {
     return createUserMessageHandler.isResetPasswordBidExist(uuid);
   }
@@ -245,7 +248,7 @@ public YesNoRS isRestorePasswordBidExist(@PathVariable String uuid) {
   @Transactional
   @PostMapping(value = "/password/change")
   @ResponseStatus(OK)
-  @ApiOperation("Change own password")
+  @Operation(summary = "Change own password")
   public OperationCompletionRS changePassword(
       @RequestBody @Validated ChangePasswordRQ changePasswordRQ,
       @AuthenticationPrincipal ReportPortalUser currentUser) {
@@ -272,8 +275,8 @@ public Iterable<UserResource> findUsers(@RequestParam(value = "term") String ter
   @Transactional(readOnly = true)
   @GetMapping(value = "/export")
   @PreAuthorize(ADMIN_ONLY)
-  @ApiOperation(value = "Exports information about all users", notes = "Allowable only for users with administrator role")
-  public void export(@ApiParam(allowableValues = "csv")
+  @Operation(summary =  "Exports information about all users", description = "Allowable only for users with administrator role")
+  public void export(@Parameter(schema = @Schema(allowableValues = "csv"))
   @RequestParam(value = "view", required = false, defaultValue = "csv") String view,
       @FilterFor(User.class) Filter filter, @FilterFor(User.class) Queryable queryable,
       @AuthenticationPrincipal ReportPortalUser currentUser, HttpServletResponse response) {
@@ -300,7 +303,7 @@ public void export(@ApiParam(allowableValues = "csv")
 
   @PostMapping(value = "/{userId}/api-keys")
   @ResponseStatus(CREATED)
-  @ApiOperation("Create new Api Key for current user")
+  @Operation(summary = "Create new Api Key for current user")
   public ApiKeyRS createApiKey(@RequestBody @Validated ApiKeyRQ apiKeyRQ,
       @AuthenticationPrincipal ReportPortalUser currentUser, @PathVariable Long userId) {
     return apiKeyHandler.createApiKey(apiKeyRQ.getName(), currentUser.getUserId());
@@ -308,14 +311,14 @@ public ApiKeyRS createApiKey(@RequestBody @Validated ApiKeyRQ apiKeyRQ,
 
   @DeleteMapping(value = "/{userId}/api-keys/{keyId}")
   @ResponseStatus(OK)
-  @ApiOperation("Delete specified Api Key")
+  @Operation(summary = "Delete specified Api Key")
   public OperationCompletionRS deleteApiKey(@PathVariable Long keyId, @PathVariable Long userId) {
     return apiKeyHandler.deleteApiKey(keyId);
   }
 
   @GetMapping(value = "/{userId}/api-keys")
   @ResponseStatus(OK)
-  @ApiOperation("Get List of users Api Keys")
+  @Operation(summary = "Get List of users Api Keys")
   public ApiKeysRS getUsersApiKeys(@AuthenticationPrincipal ReportPortalUser currentUser,
       @PathVariable Long userId) {
     return apiKeyHandler.getAllUsersApiKeys(currentUser.getUserId());
diff --git a/src/main/java/com/epam/ta/reportportal/ws/controller/UserFilterController.java b/src/main/java/com/epam/ta/reportportal/ws/controller/UserFilterController.java
index f872a88179..b6d191f020 100644
--- a/src/main/java/com/epam/ta/reportportal/ws/controller/UserFilterController.java
+++ b/src/main/java/com/epam/ta/reportportal/ws/controller/UserFilterController.java
@@ -35,7 +35,8 @@
 import com.epam.ta.reportportal.ws.model.OperationCompletionRS;
 import com.epam.ta.reportportal.ws.resolver.FilterFor;
 import com.epam.ta.reportportal.ws.resolver.SortFor;
-import io.swagger.annotations.ApiOperation;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.tags.Tag;
 import java.util.List;
 import java.util.stream.Collectors;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -64,6 +65,7 @@
 @RestController
 @PreAuthorize(ASSIGNED_TO_PROJECT)
 @RequestMapping("/v1/{projectName}/filter")
+@Tag(name = "user-filter-controller", description = "User Filter Controller")
 public class UserFilterController {
 
   private final ProjectExtractor projectExtractor;
@@ -84,7 +86,7 @@ public UserFilterController(ProjectExtractor projectExtractor,
   @Transactional
   @PostMapping
   @ResponseStatus(HttpStatus.CREATED)
-  @ApiOperation("Create user filter")
+  @Operation(summary = "Create user filter")
   public EntryCreatedRS createFilter(@PathVariable String projectName,
       @RequestBody @Validated UpdateUserFilterRQ createFilterRQ,
       @AuthenticationPrincipal ReportPortalUser user) {
@@ -94,7 +96,7 @@ public EntryCreatedRS createFilter(@PathVariable String projectName,
   @Transactional(readOnly = true)
   @GetMapping(value = "/{filterId}")
   @ResponseStatus(HttpStatus.OK)
-  @ApiOperation("Get specified user filter by id")
+  @Operation(summary = "Get specified user filter by id")
   public UserFilterResource getFilter(@PathVariable String projectName, @PathVariable Long filterId,
       @AuthenticationPrincipal ReportPortalUser user) {
     return getFilterHandler.getUserFilter(
@@ -104,7 +106,7 @@ public UserFilterResource getFilter(@PathVariable String projectName, @PathVaria
   @Transactional(readOnly = true)
   @GetMapping
   @ResponseStatus(HttpStatus.OK)
-  @ApiOperation("Get filters")
+  @Operation(summary = "Get filters")
   public Iterable<UserFilterResource> getAllFilters(@PathVariable String projectName,
       @SortFor(UserFilter.class) Pageable pageable, @FilterFor(UserFilter.class) Filter filter,
       @AuthenticationPrincipal ReportPortalUser user) {
@@ -114,7 +116,7 @@ public Iterable<UserFilterResource> getAllFilters(@PathVariable String projectNa
   @Transactional
   @DeleteMapping(value = "/{filterId}")
   @ResponseStatus(HttpStatus.OK)
-  @ApiOperation("Delete specified user filter by id")
+  @Operation(summary = "Delete specified user filter by id")
   public OperationCompletionRS deleteFilter(@PathVariable String projectName,
       @PathVariable Long filterId, @AuthenticationPrincipal ReportPortalUser user) {
     return deleteFilterHandler.deleteFilter(
@@ -124,7 +126,7 @@ public OperationCompletionRS deleteFilter(@PathVariable String projectName,
   @Transactional(readOnly = true)
   @GetMapping(value = "/names")
   @ResponseStatus(HttpStatus.OK)
-  @ApiOperation("Get available filter names")
+  @Operation(summary = "Get available filter names")
   public Iterable<OwnedEntityResource> getAllFiltersNames(@PathVariable String projectName,
       @SortFor(UserFilter.class) Pageable pageable, @FilterFor(UserFilter.class) Filter filter,
       @AuthenticationPrincipal ReportPortalUser user) {
@@ -135,7 +137,7 @@ public Iterable<OwnedEntityResource> getAllFiltersNames(@PathVariable String pro
   @Transactional
   @PutMapping(value = "/{filterId}")
   @ResponseStatus(HttpStatus.OK)
-  @ApiOperation("Update specified user filter")
+  @Operation(summary = "Update specified user filter")
   public OperationCompletionRS updateUserFilter(@PathVariable String projectName,
       @PathVariable Long filterId, @RequestBody @Validated UpdateUserFilterRQ updateRQ,
       @AuthenticationPrincipal ReportPortalUser user) {
@@ -147,7 +149,7 @@ public OperationCompletionRS updateUserFilter(@PathVariable String projectName,
   @Transactional(readOnly = true)
   @GetMapping(value = "/filters")
   @ResponseStatus(HttpStatus.OK)
-  @ApiOperation("Get list of specified user filters")
+  @Operation(summary = "Get list of specified user filters")
   public List<UserFilterResource> getUserFilters(@PathVariable String projectName,
       @RequestParam(value = "ids") Long[] ids, @AuthenticationPrincipal ReportPortalUser user) {
     List<UserFilter> filters = getFilterHandler.getFiltersById(ids,
@@ -160,7 +162,7 @@ public List<UserFilterResource> getUserFilters(@PathVariable String projectName,
   @Transactional
   @RequestMapping(method = RequestMethod.PUT)
   @ResponseStatus(HttpStatus.OK)
-  @ApiOperation("Update list of user filters")
+  @Operation(summary = "Update list of user filters")
   public List<OperationCompletionRS> updateUserFilters(@PathVariable String projectName,
       @RequestBody @Validated CollectionsRQ<BulkUpdateFilterRQ> updateRQ,
       @AuthenticationPrincipal ReportPortalUser user) {
diff --git a/src/main/java/com/epam/ta/reportportal/ws/controller/WidgetController.java b/src/main/java/com/epam/ta/reportportal/ws/controller/WidgetController.java
index 384c6de639..9e0413b1d2 100644
--- a/src/main/java/com/epam/ta/reportportal/ws/controller/WidgetController.java
+++ b/src/main/java/com/epam/ta/reportportal/ws/controller/WidgetController.java
@@ -35,7 +35,8 @@
 import com.epam.ta.reportportal.ws.model.OperationCompletionRS;
 import com.epam.ta.reportportal.ws.resolver.FilterFor;
 import com.epam.ta.reportportal.ws.resolver.SortFor;
-import io.swagger.annotations.ApiOperation;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.tags.Tag;
 import java.util.Map;
 import org.apache.commons.lang3.ArrayUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -61,6 +62,7 @@
 @RestController
 @PreAuthorize(ASSIGNED_TO_PROJECT)
 @RequestMapping("/v1/{projectName}/widget")
+@Tag(name = "widget-controller", description = "Widget Controller")
 public class WidgetController {
 
   private final ProjectExtractor projectExtractor;
@@ -81,7 +83,7 @@ public WidgetController(ProjectExtractor projectExtractor,
   @Transactional
   @PostMapping
   @ResponseStatus(CREATED)
-  @ApiOperation("Create a new widget")
+  @Operation(summary = "Create a new widget")
   public EntryCreatedRS createWidget(@RequestBody @Validated WidgetRQ createWidget,
       @AuthenticationPrincipal ReportPortalUser user, @PathVariable String projectName) {
     return createWidgetHandler.createWidget(
@@ -91,7 +93,7 @@ public EntryCreatedRS createWidget(@RequestBody @Validated WidgetRQ createWidget
   @Transactional(readOnly = true)
   @GetMapping(value = "/{widgetId}")
   @ResponseStatus(OK)
-  @ApiOperation("Get widget by ID")
+  @Operation(summary = "Get widget by ID")
   public WidgetResource getWidget(@PathVariable String projectName, @PathVariable Long widgetId,
       @AuthenticationPrincipal ReportPortalUser user) {
     return getWidgetHandler.getWidget(
@@ -101,7 +103,7 @@ public WidgetResource getWidget(@PathVariable String projectName, @PathVariable
   @Transactional(readOnly = true)
   @GetMapping(value = "multilevel/{widgetId}")
   @ResponseStatus(OK)
-  @ApiOperation("Get multilevel widget by ID")
+  @Operation(summary = "Get multilevel widget by ID")
   public WidgetResource getWidget(@PathVariable String projectName, @PathVariable Long widgetId,
       @RequestParam(required = false, name = "attributes") String[] attributes,
       @RequestParam MultiValueMap<String, String> params,
@@ -115,7 +117,7 @@ public WidgetResource getWidget(@PathVariable String projectName, @PathVariable
   @Transactional(readOnly = true)
   @PostMapping(value = "/preview")
   @ResponseStatus(OK)
-  @ApiOperation("Get widget preview")
+  @Operation(summary = "Get widget preview")
   public Map<String, ?> getWidgetPreview(@PathVariable String projectName,
       @RequestBody @Validated WidgetPreviewRQ previewRQ,
       @AuthenticationPrincipal ReportPortalUser user) {
@@ -126,7 +128,7 @@ public WidgetResource getWidget(@PathVariable String projectName, @PathVariable
   @Transactional
   @PutMapping(value = "/{widgetId}")
   @ResponseStatus(OK)
-  @ApiOperation("Update specified widget")
+  @Operation(summary = "Update specified widget")
   public OperationCompletionRS updateWidget(@PathVariable String projectName,
       @PathVariable Long widgetId, @RequestBody @Validated WidgetRQ updateRQ,
       @AuthenticationPrincipal ReportPortalUser user) {
@@ -137,7 +139,7 @@ public OperationCompletionRS updateWidget(@PathVariable String projectName,
   @Transactional(readOnly = true)
   @GetMapping(value = "/names/all")
   @ResponseStatus(OK)
-  @ApiOperation("Load all widget names which belong to a user")
+  @Operation(summary = "Load all widget names which belong to a user")
   public Iterable<Object> getWidgetNames(@PathVariable String projectName,
       @SortFor(Widget.class) Pageable pageable, @FilterFor(Widget.class) Filter filter,
       @AuthenticationPrincipal ReportPortalUser user) {
diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties
index 4bc0c01d3a..2b1f7acca5 100644
--- a/src/main/resources/application.properties
+++ b/src/main/resources/application.properties
@@ -54,3 +54,4 @@ com.ta.reportportal.rp.flushing.time.cron=\${rp.environment.variable.flushing.ti
 spring.profiles.active=\${rp.profiles:default}
 
 rp.feature.flags=
+springdoc.default-produces-media-type=application/json
diff --git a/src/main/resources/application.yaml b/src/main/resources/application.yaml
index bbb51b4bf0..9ec8088317 100644
--- a/src/main/resources/application.yaml
+++ b/src/main/resources/application.yaml
@@ -42,11 +42,9 @@ logging:
     org.elasticsearch.client.RestClient: error
 
 
-springfox:
-  documentation:
-    swagger:
-      v2:
-        path: /v1/api-docs
+springdoc:
+  api-docs:
+    path: /v1/api-docs
 
 
 #### Custom ReportPortal Properties ######

From 2bdee6be2e940d6fb78696b3395d1d419908884e Mon Sep 17 00:00:00 2001
From: Ivan Kustau <86599591+IvanKustau@users.noreply.github.com>
Date: Tue, 27 Feb 2024 15:25:45 +0300
Subject: [PATCH 16/24] EPMRPP-88848 || Update checking for existing ticket to
 use project (#1930)

* EPMRPP-88848 || Update checking for existing ticket to use project

* EPMRPP-88848 || Update library
---
 build.gradle                                                   | 2 +-
 .../reportportal/core/item/impl/ExternalTicketHandlerImpl.java | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/build.gradle b/build.gradle
index 82ea4feb07..294a185d2a 100644
--- a/build.gradle
+++ b/build.gradle
@@ -72,7 +72,7 @@ dependencies {
         implementation 'com.epam.reportportal:plugin-api'
     } else {
         implementation 'com.github.reportportal:commons-events:e337f8b7be'
-        implementation 'com.github.reportportal:commons-dao:b299f80'
+        implementation 'com.github.reportportal:commons-dao:af24606f16'
         implementation 'com.github.reportportal:commons-rules:42d4dd5634'
         implementation 'com.github.reportportal:commons-model:541f2a4'
         implementation 'com.github.reportportal:commons:07566b8e'
diff --git a/src/main/java/com/epam/ta/reportportal/core/item/impl/ExternalTicketHandlerImpl.java b/src/main/java/com/epam/ta/reportportal/core/item/impl/ExternalTicketHandlerImpl.java
index 05c06dc779..a15a24fbd7 100644
--- a/src/main/java/com/epam/ta/reportportal/core/item/impl/ExternalTicketHandlerImpl.java
+++ b/src/main/java/com/epam/ta/reportportal/core/item/impl/ExternalTicketHandlerImpl.java
@@ -113,7 +113,8 @@ private Set<Ticket> collectTickets(Collection<Issue.ExternalSystemIssue> externa
     }
     return externalIssues.stream().map(it -> {
       Ticket ticket;
-      Optional<Ticket> ticketOptional = ticketRepository.findByTicketId(it.getTicketId());
+      Optional<Ticket> ticketOptional =
+          ticketRepository.findByTicketIdAndBtsProject(it.getTicketId(), it.getBtsProject());
       if (ticketOptional.isPresent()) {
         ticket = ticketOptional.get();
         ticket.setUrl(it.getUrl());

From 973a1f990580b81e4bd061aecb0c46f7066f0c38 Mon Sep 17 00:00:00 2001
From: PeeAyBee <pavel_bortnik@epam.com>
Date: Tue, 27 Feb 2024 23:46:55 +0300
Subject: [PATCH 17/24]  EPMRPP-89384 ||  Model and reporting libs separation
 (#1931)

* Add caffeine cache manager

* added github.run_number to rc build

(cherry picked from commit 52ca2ef7089f465f6ce84be2afaec43a300f7478)

* EPMRPP-86400 || Fix the problem with 'undefined' for exported filename (#1794)

* tag latest added

* Update rc.yaml

* Create dockerhub-release.yaml

* github.event.pull_request.base.ref

* rewrite target regestry envs

* modified:   .github/workflows/dockerhub-release.yaml

* Update to release version

* [Gradle Release Plugin] - new version commit:  '5.10.1'.

* Hotfix 5.10.1 (#1837)

* EPMRPP-87223 || Fix duplicated logs

* [Gradle Release Plugin] - new version commit:  '5.10.2'.

* EPMRPP-89384 || Update according to model and reporting model libs separation

---------

Co-authored-by: Ivan_Kustau <Ivan_Kustau@epam.com>
Co-authored-by: hlebkanonik <hleb_kanonik@epam.com>
Co-authored-by: Ivan Kustau <86599591+IvanKustau@users.noreply.github.com>
Co-authored-by: reportportal.io <support@reportportal.io>
Co-authored-by: APiankouski <109206864+APiankouski@users.noreply.github.com>
---
 .github/workflows/dockerhub-release.yaml      |  71 ++++
 build.gradle                                  |  11 +-
 .../AssignedToProjectPermission.java          |   7 +-
 .../permissions/BaseProjectPermission.java    |   2 +-
 .../activity/impl/ActivityHandlerImpl.java    |  12 +-
 .../impl/ActivityEventHandlerImpl.java        |   2 +-
 .../core/admin/ServerAdminHandler.java        |   2 +-
 .../core/admin/ServerAdminHandlerImpl.java    |   2 +-
 .../impl/AnalyzerServiceClientImpl.java       |   2 +-
 .../RabbitMqManagementClientTemplate.java     |   3 +-
 .../auto/impl/AnalyzerServiceImpl.java        |   2 +-
 .../analyzer/auto/impl/LogIndexerService.java |   2 +-
 .../auto/impl/SearchLogServiceImpl.java       |   2 +-
 .../auto/impl/SuggestItemService.java         |   6 +-
 .../analyzer/auto/impl/SuggestedItem.java     |   2 +-
 .../preparer/LaunchPreparerServiceImpl.java   |   2 +-
 .../decorator/ExistingAnalyzerStarter.java    |   2 +-
 .../strategy/analyze/AnalyzeItemsMode.java    |   2 +-
 .../auto/strategy/search/FilterCollector.java |   2 +-
 .../core/analyzer/config/AnalyzerType.java    |   2 +-
 .../CreatePatternTemplateHandlerImpl.java     |   2 +-
 .../CreateRegexPatternTemplateHandler.java    |   2 +-
 .../impl/LaunchPatternAnalyzerImpl.java       |   2 +-
 .../AbstractLaunchAnalysisStrategy.java       |   4 +-
 .../strategy/LaunchAutoAnalysisStrategy.java  |   6 +-
 .../LaunchPatternAnalysisStrategy.java        |   4 +-
 .../handler/impl/CreateTicketHandlerImpl.java |   4 +-
 .../impl/GetBugTrackingSystemHandlerImpl.java |   2 +-
 .../handler/impl/GetTicketHandlerImpl.java    |   5 +-
 .../rabbit/AnalyzerRabbitMqConfiguration.java |   2 +-
 .../configs/rabbit/RabbitMqConfiguration.java |   2 +-
 .../ResourceAttributeHandlerConfig.java       |   2 +-
 .../dashboard/DeleteDashboardHandler.java     |   2 +-
 .../dashboard/UpdateDashboardHandler.java     |   2 +-
 .../impl/CreateDashboardHandlerImpl.java      |   2 +-
 .../impl/DeleteDashboardHandlerImpl.java      |  17 +-
 .../impl/GetDashboardHandlerImpl.java         |   2 +-
 .../impl/UpdateDashboardHandlerImpl.java      |   8 +-
 .../handler/DefectTypeDeletedHandler.java     |   2 +-
 .../GenerateWidgetViewEventHandler.java       |   2 +-
 .../launch/LaunchNotificationRunner.java      |   6 +-
 .../core/file/DeleteFilesHandler.java         |   4 +-
 .../core/file/impl/GetFileHandlerImpl.java    |   2 +-
 .../core/filter/DeleteUserFilterHandler.java  |   2 +-
 .../core/filter/UpdateUserFilterHandler.java  |   2 +-
 .../impl/DeleteUserFilterHandlerImpl.java     |  15 +-
 .../filter/impl/GetUserFilterHandlerImpl.java |   2 +-
 .../impl/UpdateUserFilterHandlerImpl.java     |   6 +-
 .../predefined/PredefinedFilterBuilder.java   |   2 +-
 .../AbstractFinishHierarchyHandler.java       |   2 +-
 .../core/imprt/ImportLaunchHandler.java       |   2 +-
 .../core/imprt/ImportLaunchHandlerImpl.java   |   8 +-
 .../imprt/impl/AbstractImportStrategy.java    |  10 +-
 .../core/imprt/impl/XmlImportStrategy.java    |   2 +-
 .../core/imprt/impl/ZipImportStrategy.java    |   2 +-
 .../imprt/impl/junit/XunitImportHandler.java  |   8 +-
 .../core/imprt/impl/junit/XunitParseJob.java  |   2 +-
 .../integration/CreateIntegrationHandler.java |   2 +-
 .../integration/DeleteIntegrationHandler.java |   2 +-
 .../impl/CreateIntegrationHandlerImpl.java    |   4 +-
 .../impl/DeleteIntegrationHandlerImpl.java    |   8 +-
 .../impl/ExecuteIntegrationHandlerImpl.java   |   8 +-
 .../impl/GetIntegrationHandlerImpl.java       |   2 +-
 .../plugin/DeletePluginHandler.java           |   2 +-
 .../plugin/UpdatePluginHandler.java           |   2 +-
 .../plugin/binary/PluginFilesProvider.java    |   2 +-
 .../plugin/impl/CreatePluginHandlerImpl.java  |   2 +-
 .../plugin/impl/DeletePluginHandlerImpl.java  |   4 +-
 .../plugin/impl/PluginLoaderImpl.java         |   2 +-
 .../plugin/impl/UpdatePluginHandlerImpl.java  |   4 +-
 .../util/BasicIntegrationServiceImpl.java     |   2 +-
 .../util/BtsIntegrationService.java           |   4 +-
 .../util/EmailServerIntegrationService.java   |   6 +-
 .../util/SauceLabsIntegrationService.java     |   2 +-
 .../util/validator/IntegrationValidator.java  |   2 +-
 .../core/item/DeleteTestItemHandler.java      |   2 +-
 .../core/item/ExternalTicketHandler.java      |   2 +-
 .../core/item/FinishTestItemHandler.java      |   4 +-
 .../core/item/GetTestItemHandler.java         |   4 +-
 .../core/item/StartTestItemHandler.java       |   4 +-
 .../core/item/TestItemService.java            |   2 +-
 .../core/item/UpdateTestItemHandler.java      |   6 +-
 .../core/item/identity/IdentityUtil.java      |   2 +-
 .../item/impl/DeleteTestItemHandlerImpl.java  |  12 +-
 .../item/impl/ExternalTicketHandlerImpl.java  |  11 +-
 .../impl/FinishTestItemHandlerAsyncImpl.java  |   6 +-
 .../item/impl/FinishTestItemHandlerImpl.java  |  16 +-
 .../item/impl/GetTestItemHandlerImpl.java     |   8 +-
 .../core/item/impl/IssueTypeHandler.java      |   2 +-
 .../item/impl/LaunchAccessValidatorImpl.java  |   6 +-
 .../impl/StartTestItemHandlerAsyncImpl.java   |   4 +-
 .../item/impl/StartTestItemHandlerImpl.java   |  14 +-
 .../item/impl/UpdateTestItemHandlerImpl.java  |  18 +-
 .../history/TestItemsHistoryHandlerImpl.java  |   4 +-
 .../history/param/HistoryRequestParams.java   |   2 +-
 .../ComparingBaselineHistoryProvider.java     |   2 +-
 .../impl/FilterBaselineHistoryProvider.java   |   2 +-
 .../impl/LaunchBaselineHistoryProvider.java   |   2 +-
 .../impl/TestItemBaselineHistoryProvider.java |   2 +-
 .../strategy/AbstractLaunchMergeStrategy.java |  12 +-
 .../strategy/BasicLaunchMergeStrategy.java    |   2 +-
 .../strategy/DeepLaunchMergeStrategy.java     |   2 +-
 .../impl/provider/FilterDataProviderImpl.java |   4 +-
 .../impl/BaselineLaunchDataProvider.java      |   2 +-
 .../CumulativeTestItemDataProviderImpl.java   |   2 +-
 .../DelegatingClusterDataProviderHandler.java |   2 +-
 .../impl/LaunchDataProviderHandlerImpl.java   |   2 +-
 ...MaterializedWidgetProviderHandlerImpl.java |   2 +-
 .../item/impl/retry/DefaultRetryHandler.java  |   2 +-
 .../AbstractStatusChangingStrategy.java       |   6 +-
 .../ToFailedStatusChangingStrategy.java       |   2 +-
 .../ToPassedStatusChangingStrategy.java       |   2 +-
 .../ToSkippedStatusChangingStrategy.java      |   2 +-
 .../core/item/merge/LaunchMergeStrategy.java  |   2 +-
 .../utils/DefaultLaunchFilterProvider.java    |   4 +-
 .../parent/NestedStepConditionValidator.java  |   4 +-
 .../validator/parent/ParentItemValidator.java |   2 +-
 .../validator/parent/PathLengthValidator.java |   4 +-
 .../parent/RetryConditionValidator.java       |   4 +-
 .../parent/StartTimeConditionValidator.java   |   4 +-
 .../impl/AbstractJasperReportHandler.java     |   4 +-
 .../core/launch/DeleteLaunchHandler.java      |   2 +-
 .../core/launch/FinishLaunchHandler.java      |   2 +-
 .../core/launch/GetLaunchHandler.java         |   2 +-
 .../core/launch/MergeLaunchHandler.java       |   4 +-
 .../core/launch/StartLaunchHandler.java       |   8 +-
 .../core/launch/StopLaunchHandler.java        |   4 +-
 .../core/launch/UpdateLaunchHandler.java      |   4 +-
 .../launch/cluster/GetClusterHandlerImpl.java |   2 +-
 .../launch/cluster/UniqueErrorGenerator.java  |   2 +-
 .../data/AnalyzerClusterDataProvider.java     |   2 +-
 .../launch/impl/DeleteLaunchHandlerImpl.java  |  12 +-
 .../impl/FinishLaunchHandlerAsyncImpl.java    |   2 +-
 .../launch/impl/FinishLaunchHandlerImpl.java  |   4 +-
 .../launch/impl/GetLaunchHandlerImpl.java     |  20 +-
 .../launch/impl/MergeLaunchHandlerImpl.java   |  30 +-
 .../core/launch/impl/MetadataUpdater.java     |   2 +-
 .../impl/StartLaunchHandlerAsyncImpl.java     |   4 +-
 .../launch/impl/StartLaunchHandlerImpl.java   |   4 +-
 .../launch/impl/StopLaunchHandlerImpl.java    |   8 +-
 .../launch/impl/UpdateLaunchHandlerImpl.java  |  14 +-
 .../core/launch/rerun/RerunHandler.java       |   6 +-
 .../core/launch/rerun/RerunHandlerImpl.java   |   8 +-
 .../core/launch/util/LaunchValidator.java     |  10 +-
 .../core/log/CreateLogHandler.java            |   6 +-
 .../core/log/DeleteLogHandler.java            |   2 +-
 .../log/impl/CreateLogHandlerAsyncImpl.java   |   4 +-
 .../core/log/impl/CreateLogHandlerImpl.java   |   6 +-
 .../core/log/impl/DeleteLogHandlerImpl.java   |  14 +-
 .../core/log/impl/GetLogHandlerImpl.java      |   6 +-
 .../log/impl/SaveLogBinaryDataTaskAsync.java  |   4 +-
 .../core/onboarding/OnboardingService.java    |   2 +-
 .../preference/UpdatePreferenceHandler.java   |   2 +-
 .../impl/UpdatePreferenceHandlerImpl.java     |   4 +-
 .../core/project/DeleteProjectHandler.java    |   2 +-
 .../core/project/UpdateProjectHandler.java    |   2 +-
 .../impl/CreateProjectHandlerImpl.java        |   2 +-
 .../impl/DeleteProjectHandlerImpl.java        |   4 +-
 .../project/impl/GetProjectHandlerImpl.java   |   4 +-
 .../impl/GetProjectInfoHandlerImpl.java       |   6 +-
 .../impl/UpdateProjectHandlerImpl.java        |  18 +-
 .../DeleteProjectSettingsHandler.java         |   2 +-
 .../UpdateProjectSettingsHandler.java         |   2 +-
 .../CreateProjectSettingsHandlerImpl.java     |   8 +-
 .../DeleteProjectSettingsHandlerImpl.java     |   6 +-
 .../impl/GetProjectSettingsHandlerImpl.java   |   2 +-
 .../UpdateProjectSettingsHandlerImpl.java     |  10 +-
 .../CreateProjectNotificationHandlerImpl.java |   2 +-
 .../DeleteProjectNotificationHandler.java     |   2 +-
 .../DeleteProjectNotificationHandlerImpl.java |   4 +-
 .../UpdateProjectNotificationHandler.java     |   2 +-
 .../UpdateProjectNotificationHandlerImpl.java |   4 +-
 .../attribute/DelayBoundValidator.java        |   2 +-
 .../attribute/ProjectAttributeValidator.java  |   5 +-
 .../ProjectNotificationValidator.java         |   2 +-
 .../core/statistics/StatisticsHelper.java     |   2 +-
 .../reportportal/core/user/ApiKeyHandler.java |   2 +-
 .../core/user/CreateUserHandler.java          |   2 +-
 .../core/user/DeleteUserHandler.java          |   2 +-
 .../core/user/EditUserHandler.java            |   2 +-
 .../core/user/impl/ApiKeyHandlerImpl.java     |   8 +-
 .../core/user/impl/CreateUserHandlerImpl.java |  20 +-
 .../core/user/impl/DeleteUserHandlerImpl.java |   4 +-
 .../core/user/impl/EditUserHandlerImpl.java   |   6 +-
 .../core/user/impl/GetUserHandlerImpl.java    |   2 +-
 .../core/widget/UpdateWidgetHandler.java      |   2 +-
 .../MaterializedLoadContentStrategyImpl.java  |   2 +-
 .../filter/GeneralLaunchFilterStrategy.java   |   2 +-
 .../filter/LaunchHistoryFilterStrategy.java   |   2 +-
 .../content/loader/ActivityContentLoader.java |   2 +-
 .../ComponentHealthCheckContentLoader.java    |   2 +-
 ...CumulativeTrendChartContentLoaderImpl.java |   2 +-
 .../HealthCheckTableReadyContentLoader.java   |   2 +-
 .../ReadyMaterializedWidgetStateHandler.java  |   2 +-
 .../ProductStatusContentLoaderManager.java    |   2 +-
 .../state/WidgetStateResolver.java            |   2 +-
 .../validator/ActivityContentValidator.java   |   2 +-
 .../BugTrendChartContentValidator.java        |   2 +-
 .../validator/CasesTrendContentValidator.java |   2 +-
 .../ChartInvestigatedContentValidator.java    |   2 +-
 .../ComponentHealthCheckContentValidator.java |   2 +-
 .../CumulativeTrendChartValidator.java        |   2 +-
 .../FlakyCasesTableContentValidator.java      |   2 +-
 ...ionAndIssueStatisticsContentValidator.java |   2 +-
 .../LaunchesComparisonContentValidator.java   |   2 +-
 .../LaunchesDurationContentValidator.java     |   2 +-
 .../LaunchesTableContentValidator.java        |   2 +-
 .../validator/LineChartContentValidator.java  |   2 +-
 .../MostTimeConsumingContentValidator.java    |   2 +-
 .../NotPassedTestsContentValidator.java       |   2 +-
 .../OverallStatisticsContentValidator.java    |   2 +-
 .../PassingRatePerLaunchContentValidator.java |   2 +-
 .../PassingRateSummaryContentValidator.java   |   2 +-
 .../ProductStatusContentValidator.java        |   2 +-
 .../validator/TopPatternContentValidator.java |   2 +-
 .../TopTestCasesContentValidator.java         |   2 +-
 .../validator/UniqueBugContentValidator.java  |   2 +-
 .../WidgetContentFieldsValidator.java         |   2 +-
 .../widget/impl/CreateWidgetHandlerImpl.java  |   2 +-
 .../widget/impl/GetWidgetHandlerImpl.java     |   2 +-
 .../widget/impl/UpdateWidgetHandlerImpl.java  |   4 +-
 .../core/widget/util/WidgetFilterUtil.java    |   2 +-
 .../core/widget/util/WidgetOptionUtil.java    |   2 +-
 .../demodata/service/ContentUtils.java        |   4 +-
 .../service/DefaultDemoDataFacade.java        |   2 +-
 .../service/DemoDashboardsService.java        |   4 +-
 .../service/DemoDataLaunchService.java        |   8 +-
 .../service/DemoDataTestItemService.java      |   4 +-
 .../demodata/service/DemoLogsService.java     |  30 +-
 .../ta/reportportal/job/LoadPluginsJob.java   |   2 +-
 .../reportportal/model/BulkInfoUpdateRQ.java  |  91 -----
 .../ta/reportportal/model/DeleteBulkRS.java   |   2 +-
 .../model/LaunchImportCompletionRS.java       |   2 +-
 .../model/TestItemHistoryElement.java         |   1 +
 .../reportportal/model/TestItemResource.java  | 345 ------------------
 .../model/dashboard/DashboardResource.java    |   2 +-
 .../model/filter/UserFilterResource.java      |   2 +-
 .../model/issue/IssueDefinition.java          |   2 +-
 .../model/item/LinkExternalIssueRQ.java       |   2 +-
 .../model/item/UpdateTestItemRQ.java          |   2 +-
 .../model/launch/FinishLaunchRS.java          |   2 +-
 .../model/launch/LaunchImportRQ.java          |   4 +-
 .../model/launch/MergeLaunchesRQ.java         | 209 -----------
 .../model/launch/UpdateLaunchRQ.java          |   8 +-
 .../reportportal/model/log/SearchLogRs.java   |   4 +-
 .../model/project/email/SenderCaseDTO.java    |   2 +-
 .../model/widget/WidgetResource.java          |   2 +-
 .../plugin/Pf4jPluginManager.java             |   2 +-
 .../util/BinaryDataResponseWriter.java        |   2 +-
 .../ta/reportportal/util/ControllerUtils.java |   4 +-
 .../ta/reportportal/util/ItemInfoUtils.java   |  11 +-
 .../epam/ta/reportportal/util/Predicates.java |   2 +-
 .../reportportal/util/ProjectExtractor.java   |   2 +-
 .../util/email/EmailRulesValidator.java       |   8 +-
 .../util/email/MailServiceFactory.java        |   4 +-
 .../util/email/strategy/EmailTemplate.java    |   2 +-
 .../ws/controller/DashboardController.java    |   2 +-
 .../controller/DeprecatedUserController.java  |   2 +-
 .../ws/controller/FileStorageController.java  |   2 +-
 .../ws/controller/IntegrationController.java  |   2 +-
 .../ws/controller/LaunchAsyncController.java  |  18 +-
 .../ws/controller/LaunchController.java       |  18 +-
 .../ws/controller/LogAsyncController.java     |  12 +-
 .../ws/controller/LogController.java          |  29 +-
 .../ws/controller/PluginController.java       |   2 +-
 .../ws/controller/ProjectController.java      |   4 +-
 .../controller/ProjectSettingsController.java |   2 +-
 .../ws/controller/SettingsController.java     |   2 +-
 .../controller/TestItemAsyncController.java   |   8 +-
 .../ws/controller/TestItemController.java     |  16 +-
 .../ws/controller/UserController.java         |   4 +-
 .../ws/controller/UserFilterController.java   |   2 +-
 .../ws/controller/WidgetController.java       |   2 +-
 .../converter/TestItemResourceAssembler.java  |   2 +-
 .../ws/converter/builders/LaunchBuilder.java  |  13 +-
 .../ws/converter/builders/LogFullBuilder.java |   2 +-
 .../builders/PatternTemplateBuilder.java      |   2 +-
 .../converter/builders/TestItemBuilder.java   |  10 +-
 .../converter/builders/UserFilterBuilder.java |   2 +-
 .../converters/ExceptionConverter.java        |   2 +-
 .../converter/converters/IssueConverter.java  |   2 +-
 .../converters/ItemAttributeConverter.java    |   5 +-
 .../converter/converters/LaunchConverter.java |   4 +-
 .../NotificationConfigConverter.java          |   4 +-
 .../converters/ParametersConverter.java       |   2 +-
 .../converters/ServerSettingsConverter.java   |   2 +-
 .../converters/StatisticsConverter.java       |   2 +-
 .../converters/TestItemConverter.java         |  10 +-
 .../converter/converters/TicketConverter.java |   2 +-
 .../launch/LaunchResourceAttributeLogger.java |   2 +-
 .../LaunchResourceAttributeUpdater.java       |   4 +-
 ...aunchResourceMetadataAttributeUpdater.java |   7 +-
 .../provider/PathNameUpdaterProvider.java     |   2 +-
 .../item/provider/RetriesUpdaterProvider.java |   2 +-
 .../utils/item/updater/PathNameUpdater.java   |   2 +-
 .../utils/item/updater/RetriesUpdater.java    |   2 +-
 .../ws/rabbit/AsyncReportingListener.java     |  12 +-
 .../ws/resolver/FilterCriteriaResolver.java   |   2 +-
 .../PredefinedFilterCriteriaResolver.java     |   2 +-
 .../ws/resolver/SortArgumentResolver.java     |   2 +-
 .../auto/impl/SuggestItemServiceTest.java     |   2 +-
 .../analyzer/config/AnalyzerTypeTest.java     |   2 +-
 .../impl/UpdateUserFilterHandlerTest.java     |   2 +-
 .../imprt/ImportLaunchHandlerImplTest.java    |   2 +-
 .../core/imprt/XmlImportStrategyTest.java     |   4 +-
 .../impl/junit/XunitImportHandlerTest.java    |   6 +-
 .../impl/DeleteIntegrationHandlerTest.java    |   2 +-
 .../plugin/impl/UpdatePluginHandlerTest.java  |   2 +-
 .../impl/DeleteTestItemHandlerImplTest.java   |   2 +-
 .../FinishTestItemHandlerAsyncImplTest.java   |   2 +-
 .../impl/FinishTestItemHandlerImplTest.java   |   4 +-
 .../item/impl/GetTestItemHandlerImplTest.java |   2 +-
 .../StartTestItemHandlerAsyncImplTest.java    |   2 +-
 .../impl/StartTestItemHandlerImplTest.java    |   4 +-
 .../impl/UpdateTestItemHandlerImplTest.java   |   4 +-
 .../FinishLaunchHandlerAsyncImplTest.java     |   2 +-
 .../impl/FinishLaunchHandlerImplTest.java     |   4 +-
 .../impl/StartLaunchHandlerAsyncImplTest.java |   2 +-
 .../impl/StartLaunchHandlerImplTest.java      |   6 +-
 .../impl/UpdateLaunchHandlerImplTest.java     |   2 +-
 .../launch/rerun/RerunHandlerImplTest.java    |  10 +-
 .../core/launch/util/LaunchValidatorTest.java |   4 +-
 .../util/MergeLaunchesSerializerTest.java     |   6 +-
 .../impl/CreateLogHandlerAsyncImplTest.java   |   2 +-
 .../impl/DeleteProjectHandlerImplTest.java    |   2 +-
 ...ateProjectNotificationHandlerImplTest.java |   6 +-
 ...ateProjectNotificationHandlerImplTest.java |   2 +-
 .../user/impl/CreateUserHandlerImplTest.java  |   2 +-
 .../reportportal/util/ItemInfoUtilsTest.java  |   2 +-
 .../util/TestProjectExtractor.java            |   2 +-
 .../util/email/EmailRulesValidatorTest.java   |   2 +-
 .../BugTrackingSystemControllerTest.java      |   4 +-
 .../DashboardControllerValidationTest.java    |   4 +-
 .../controller/LaunchAsyncControllerTest.java |   6 +-
 .../ws/controller/LaunchControllerTest.java   |  18 +-
 .../LaunchControllerValidationTest.java       |  12 +-
 .../ws/controller/LogAsyncControllerTest.java |   2 +-
 .../ws/controller/LogControllerTest.java      |   4 +-
 .../ws/controller/ProjectControllerTest.java  |   2 +-
 .../TestItemAsyncControllerTest.java          |   4 +-
 .../ws/controller/TestItemControllerTest.java |  16 +-
 .../TestItemControllerValidationTest.java     |   8 +-
 .../UserFilterControllerValidationTest.java   |   4 +-
 .../WidgetControllerValidationTest.java       |   4 +-
 .../converter/builders/LaunchBuilderTest.java |  10 +-
 .../builders/LogFullBuilderTest.java          |   2 +-
 .../builders/TestItemBuilderTest.java         |   8 +-
 .../converters/IssueConverterTest.java        |   2 +-
 .../ItemAttributeConverterTest.java           |   2 +-
 .../NotificationConfigConverterTest.java      |   2 +-
 .../converters/ParametersConverterTest.java   |   2 +-
 .../converters/TestItemConverterTest.java     |   2 +-
 .../converters/TicketConverterTest.java       |   2 +-
 .../LaunchResourceAttributeUpdaterTest.java   |   4 +-
 ...hResourceMetadataAttributeUpdaterTest.java |   2 +-
 .../ws/rabbit/AsyncReportingListenerTest.java |  18 +-
 .../ws/validation/BusinessRuleTest.java       |   2 +-
 ...JaskonRequiredPropertiesValidatorTest.java |   6 +-
 .../ws/validation/TicketsValidationTest.java  |   4 +-
 359 files changed, 830 insertions(+), 1412 deletions(-)
 create mode 100644 .github/workflows/dockerhub-release.yaml
 delete mode 100644 src/main/java/com/epam/ta/reportportal/model/BulkInfoUpdateRQ.java
 delete mode 100644 src/main/java/com/epam/ta/reportportal/model/TestItemResource.java
 delete mode 100644 src/main/java/com/epam/ta/reportportal/model/launch/MergeLaunchesRQ.java

diff --git a/.github/workflows/dockerhub-release.yaml b/.github/workflows/dockerhub-release.yaml
new file mode 100644
index 0000000000..f874986a45
--- /dev/null
+++ b/.github/workflows/dockerhub-release.yaml
@@ -0,0 +1,71 @@
+name: Retag RC Docker image
+
+on:
+  pull_request_review:
+    types: [submitted]
+
+env:
+  AWS_REGION: ${{ vars.AWS_REGION }}               # set this to your preferred AWS region, e.g. us-west-1
+  ECR_REPOSITORY: ${{ vars.ECR_REPOSITORY }}       # set this to your Amazon ECR repository name
+  TARGET_REGISTRY: ${{ vars.TARGET_REGISTRY }}     # set to target regestry (DockerHub, GitHub & etc)
+  TARGET_REPOSITORY: ${{ vars.TARGET_REPOSITORY }} # set to target repository
+  PLATFORMS: ${{ vars.BUILD_PLATFORMS }}           # set target build platforms. By default linux/amd64
+  RELEASE_MODE: ${{ vars.RELEASE_MODE }}
+
+jobs:
+  retag-image:
+    name: Retag and push image 
+    runs-on: ubuntu-latest
+    environment: rc
+    if: github.event.pull_request.base.ref == 'master' || github.event.pull_request.base.ref == 'main'
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v3
+
+      - name: Configure AWS credentials
+        uses: aws-actions/configure-aws-credentials@v2
+        with:
+          # role-to-assume: arn:aws:iam::123456789012:role/my-github-actions-role
+          aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }}
+          aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
+          aws-region: ${{ env.AWS_REGION }}
+
+      - name: Login to Amazon ECR
+        id: login-ecr
+        uses: aws-actions/amazon-ecr-login@v1
+        with:
+          mask-password: 'true'
+      
+      - name: Log in to Docker Hub
+        uses: docker/login-action@v3
+        with:
+          username: ${{ secrets.REGESTRY_USERNAME }}
+          password: ${{ secrets.REGESTRY_PASSWORD }}
+      
+      - name: Create variables
+        id: vars
+        run: |
+          echo "tag=$(echo '${{ github.event.pull_request.title }}' | sed -nE 's/.*([0-9]+\.[0-9]+\.[0-9]+).*/\1/p')" >> $GITHUB_OUTPUT
+      
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v2
+      
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v2
+
+      - name: Retag and Push Docker Image
+        env:
+          ECR_REGISTRY: ${{ steps.login-ecr.outputs.registry }}
+          IMAGE_TAG: ${{ steps.vars.outputs.tag }}
+        run: |
+          docker buildx imagetools create $ECR_REGISTRY/$ECR_REPOSITORY:latest --tag $TARGET_REGISTRY/$TARGET_REPOSITORY:$IMAGE_TAG --tag $TARGET_REGISTRY/$TARGET_REPOSITORY:latest
+      
+      - name: Summarize
+        env:
+          ECR_REGISTRY: ${{ steps.login-ecr.outputs.registry }}
+          IMAGE_TAG: ${{ steps.vars.outputs.tag }}
+        run: |
+          echo "## General information about the build:" >> $GITHUB_STEP_SUMMARY
+          echo "" >> $GITHUB_STEP_SUMMARY
+          echo "- :whale: Docker image: $TARGET_REGISTRY/$TARGET_REPOSITORY:$IMAGE_TAG" >> $GITHUB_STEP_SUMMARY
+          echo "- :octocat: The commit SHA from which the build was performed: [$GITHUB_SHA](https://github.com/$GITHUB_REPOSITORY/commit/$GITHUB_SHA)" >> $GITHUB_STEP_SUMMARY
diff --git a/build.gradle b/build.gradle
index 294a185d2a..eed4f2b41c 100644
--- a/build.gradle
+++ b/build.gradle
@@ -72,12 +72,13 @@ dependencies {
         implementation 'com.epam.reportportal:plugin-api'
     } else {
         implementation 'com.github.reportportal:commons-events:e337f8b7be'
-        implementation 'com.github.reportportal:commons-dao:af24606f16'
-        implementation 'com.github.reportportal:commons-rules:42d4dd5634'
-        implementation 'com.github.reportportal:commons-model:541f2a4'
+        implementation 'com.github.reportportal:commons-dao:d0894a1'
+        implementation 'com.github.reportportal:commons-rules:1f6bfed'
+        implementation 'com.github.reportportal:commons-model:f466951'
+        implementation 'com.github.reportportal:commons-reporting:12c31b1'
         implementation 'com.github.reportportal:commons:07566b8e'
         implementation 'com.github.reportportal:commons-fonts:d6e62dd'
-        implementation 'com.github.reportportal:plugin-api:0ccfed880c'
+        implementation 'com.github.reportportal:plugin-api:cc3c5c8'
     }
 
     implementation 'org.springframework.boot:spring-boot-starter-aop'
@@ -114,6 +115,8 @@ dependencies {
     implementation 'org.apache.poi:poi:5.2.3'
     implementation 'org.springdoc:springdoc-openapi-ui:1.7.0'
     implementation 'com.google.code.gson:gson:2.8.9'
+    implementation 'com.google.api-client:google-api-client:2.3.0'
+    implementation 'joda-time:joda-time:2.12.7'
 
 
     ///// Security
diff --git a/src/main/java/com/epam/ta/reportportal/auth/permissions/AssignedToProjectPermission.java b/src/main/java/com/epam/ta/reportportal/auth/permissions/AssignedToProjectPermission.java
index de589a17f0..d1f5dd4dfe 100644
--- a/src/main/java/com/epam/ta/reportportal/auth/permissions/AssignedToProjectPermission.java
+++ b/src/main/java/com/epam/ta/reportportal/auth/permissions/AssignedToProjectPermission.java
@@ -19,15 +19,16 @@
 import com.epam.ta.reportportal.commons.ReportPortalUser;
 import com.epam.ta.reportportal.commons.validation.BusinessRule;
 import com.epam.ta.reportportal.util.ProjectExtractor;
-import com.epam.ta.reportportal.ws.model.ErrorType;
+import com.epam.ta.reportportal.ws.reporting.ErrorType;
 import com.google.common.collect.Maps;
+import java.util.Map;
+import java.util.Objects;
+import java.util.Optional;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.core.Authentication;
 import org.springframework.security.oauth2.provider.OAuth2Authentication;
 import org.springframework.stereotype.Component;
 
-import java.util.*;
-
 /**
  * Check whether user assigned to project
  *
diff --git a/src/main/java/com/epam/ta/reportportal/auth/permissions/BaseProjectPermission.java b/src/main/java/com/epam/ta/reportportal/auth/permissions/BaseProjectPermission.java
index 372b7be071..bab527a16d 100644
--- a/src/main/java/com/epam/ta/reportportal/auth/permissions/BaseProjectPermission.java
+++ b/src/main/java/com/epam/ta/reportportal/auth/permissions/BaseProjectPermission.java
@@ -21,7 +21,7 @@
 import com.epam.ta.reportportal.entity.project.ProjectRole;
 import com.epam.ta.reportportal.exception.ReportPortalException;
 import com.epam.ta.reportportal.util.ProjectExtractor;
-import com.epam.ta.reportportal.ws.model.ErrorType;
+import com.epam.ta.reportportal.ws.reporting.ErrorType;
 import com.google.common.collect.Maps;
 import java.util.Map;
 import java.util.Objects;
diff --git a/src/main/java/com/epam/ta/reportportal/core/activity/impl/ActivityHandlerImpl.java b/src/main/java/com/epam/ta/reportportal/core/activity/impl/ActivityHandlerImpl.java
index 2ea2d99b3c..5ce7c2021b 100644
--- a/src/main/java/com/epam/ta/reportportal/core/activity/impl/ActivityHandlerImpl.java
+++ b/src/main/java/com/epam/ta/reportportal/core/activity/impl/ActivityHandlerImpl.java
@@ -21,10 +21,11 @@
 import static com.epam.ta.reportportal.commons.querygen.constant.ActivityCriteriaConstant.CRITERIA_OBJECT_TYPE;
 import static com.epam.ta.reportportal.commons.querygen.constant.GeneralCriteriaConstant.CRITERIA_PROJECT_ID;
 import static com.epam.ta.reportportal.commons.validation.BusinessRule.expect;
-import static com.epam.ta.reportportal.ws.model.ErrorType.ACCESS_DENIED;
-import static com.epam.ta.reportportal.ws.model.ErrorType.ACTIVITY_NOT_FOUND;
-import static com.epam.ta.reportportal.ws.model.ErrorType.PROJECT_NOT_FOUND;
-import static com.epam.ta.reportportal.ws.model.ErrorType.TEST_ITEM_NOT_FOUND;
+import static com.epam.ta.reportportal.ws.reporting.ErrorType.ACCESS_DENIED;
+import static com.epam.ta.reportportal.ws.reporting.ErrorType.ACTIVITY_NOT_FOUND;
+import static com.epam.ta.reportportal.ws.reporting.ErrorType.LAUNCH_NOT_FOUND;
+import static com.epam.ta.reportportal.ws.reporting.ErrorType.PROJECT_NOT_FOUND;
+import static com.epam.ta.reportportal.ws.reporting.ErrorType.TEST_ITEM_NOT_FOUND;
 
 import com.epam.ta.reportportal.commons.ReportPortalUser;
 import com.epam.ta.reportportal.commons.querygen.CompositeFilter;
@@ -51,7 +52,6 @@
 import com.epam.ta.reportportal.ws.converter.converters.ActivityConverter;
 import com.epam.ta.reportportal.ws.converter.converters.ActivityEventConverter;
 import com.epam.ta.reportportal.ws.model.ActivityResource;
-import com.epam.ta.reportportal.ws.model.ErrorType;
 import java.util.function.Predicate;
 import org.apache.commons.lang3.BooleanUtils;
 import org.jooq.Operator;
@@ -118,7 +118,7 @@ public Iterable<ActivityEventResource> getItemActivities(
 			Pageable pageable) {
 		TestItem testItem = testItemRepository.findById(itemId).orElseThrow(() -> new ReportPortalException(TEST_ITEM_NOT_FOUND, itemId));
 		Launch launch = launchRepository.findById(testItem.getLaunchId())
-				.orElseThrow(() -> new ReportPortalException(ErrorType.LAUNCH_NOT_FOUND, testItem.getLaunchId()));
+				.orElseThrow(() -> new ReportPortalException(LAUNCH_NOT_FOUND, testItem.getLaunchId()));
 		expect(projectDetails.getProjectId(), Predicate.isEqual(launch.getProjectId())).verify(ACCESS_DENIED,
 				Suppliers.formattedSupplier("Test item with id '{}' is not under project with id '{}'",
 						itemId,
diff --git a/src/main/java/com/epam/ta/reportportal/core/activityevent/impl/ActivityEventHandlerImpl.java b/src/main/java/com/epam/ta/reportportal/core/activityevent/impl/ActivityEventHandlerImpl.java
index 1b8b18b1b0..16ebdc0b4c 100644
--- a/src/main/java/com/epam/ta/reportportal/core/activityevent/impl/ActivityEventHandlerImpl.java
+++ b/src/main/java/com/epam/ta/reportportal/core/activityevent/impl/ActivityEventHandlerImpl.java
@@ -28,7 +28,7 @@
 import com.epam.ta.reportportal.model.PagedResponse;
 import com.epam.ta.reportportal.ws.converter.PagedResourcesAssembler;
 import com.epam.ta.reportportal.ws.converter.converters.ActivityEventConverter;
-import com.epam.ta.reportportal.ws.model.ErrorType;
+import com.epam.ta.reportportal.ws.reporting.ErrorType;
 import java.util.List;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
diff --git a/src/main/java/com/epam/ta/reportportal/core/admin/ServerAdminHandler.java b/src/main/java/com/epam/ta/reportportal/core/admin/ServerAdminHandler.java
index 4f407a8db7..c08511248e 100644
--- a/src/main/java/com/epam/ta/reportportal/core/admin/ServerAdminHandler.java
+++ b/src/main/java/com/epam/ta/reportportal/core/admin/ServerAdminHandler.java
@@ -18,7 +18,7 @@
 
 import com.epam.ta.reportportal.model.settings.AnalyticsResource;
 import com.epam.ta.reportportal.model.settings.ServerSettingsResource;
-import com.epam.ta.reportportal.ws.model.OperationCompletionRS;
+import com.epam.ta.reportportal.ws.reporting.OperationCompletionRS;
 import java.util.Map;
 
 /**
diff --git a/src/main/java/com/epam/ta/reportportal/core/admin/ServerAdminHandlerImpl.java b/src/main/java/com/epam/ta/reportportal/core/admin/ServerAdminHandlerImpl.java
index d0af43eef8..c4708106f7 100644
--- a/src/main/java/com/epam/ta/reportportal/core/admin/ServerAdminHandlerImpl.java
+++ b/src/main/java/com/epam/ta/reportportal/core/admin/ServerAdminHandlerImpl.java
@@ -24,7 +24,7 @@
 import com.epam.ta.reportportal.entity.ServerSettings;
 import com.epam.ta.reportportal.model.settings.AnalyticsResource;
 import com.epam.ta.reportportal.ws.converter.converters.ServerSettingsConverter;
-import com.epam.ta.reportportal.ws.model.OperationCompletionRS;
+import com.epam.ta.reportportal.ws.reporting.OperationCompletionRS;
 import java.util.Map;
 import java.util.stream.Collectors;
 import org.springframework.beans.factory.annotation.Autowired;
diff --git a/src/main/java/com/epam/ta/reportportal/core/analyzer/auto/client/impl/AnalyzerServiceClientImpl.java b/src/main/java/com/epam/ta/reportportal/core/analyzer/auto/client/impl/AnalyzerServiceClientImpl.java
index aef1abbfee..f643f89612 100644
--- a/src/main/java/com/epam/ta/reportportal/core/analyzer/auto/client/impl/AnalyzerServiceClientImpl.java
+++ b/src/main/java/com/epam/ta/reportportal/core/analyzer/auto/client/impl/AnalyzerServiceClientImpl.java
@@ -32,8 +32,8 @@
 import com.epam.ta.reportportal.model.analyzer.AnalyzedItemRs;
 import com.epam.ta.reportportal.model.analyzer.SearchRq;
 import com.epam.ta.reportportal.model.analyzer.SearchRs;
-import com.epam.ta.reportportal.ws.model.ErrorType;
 import com.epam.ta.reportportal.ws.model.analyzer.IndexLaunch;
+import com.epam.ta.reportportal.ws.reporting.ErrorType;
 import com.rabbitmq.http.client.domain.ExchangeInfo;
 import java.util.Collections;
 import java.util.Comparator;
diff --git a/src/main/java/com/epam/ta/reportportal/core/analyzer/auto/client/impl/RabbitMqManagementClientTemplate.java b/src/main/java/com/epam/ta/reportportal/core/analyzer/auto/client/impl/RabbitMqManagementClientTemplate.java
index 4ff216f06c..0ffbf0264b 100644
--- a/src/main/java/com/epam/ta/reportportal/core/analyzer/auto/client/impl/RabbitMqManagementClientTemplate.java
+++ b/src/main/java/com/epam/ta/reportportal/core/analyzer/auto/client/impl/RabbitMqManagementClientTemplate.java
@@ -22,8 +22,7 @@
 
 import com.epam.ta.reportportal.core.analyzer.auto.client.RabbitMqManagementClient;
 import com.epam.ta.reportportal.exception.ReportPortalException;
-import com.epam.ta.reportportal.ws.model.ErrorType;
-import com.fasterxml.jackson.core.JsonProcessingException;
+import com.epam.ta.reportportal.ws.reporting.ErrorType;
 import com.rabbitmq.http.client.Client;
 import com.rabbitmq.http.client.domain.ExchangeInfo;
 import java.util.List;
diff --git a/src/main/java/com/epam/ta/reportportal/core/analyzer/auto/impl/AnalyzerServiceImpl.java b/src/main/java/com/epam/ta/reportportal/core/analyzer/auto/impl/AnalyzerServiceImpl.java
index c60bee6e46..82a1890041 100644
--- a/src/main/java/com/epam/ta/reportportal/core/analyzer/auto/impl/AnalyzerServiceImpl.java
+++ b/src/main/java/com/epam/ta/reportportal/core/analyzer/auto/impl/AnalyzerServiceImpl.java
@@ -39,9 +39,9 @@
 import com.epam.ta.reportportal.model.analyzer.AnalyzedItemRs;
 import com.epam.ta.reportportal.model.analyzer.RelevantItemInfo;
 import com.epam.ta.reportportal.ws.converter.builders.IssueEntityBuilder;
-import com.epam.ta.reportportal.ws.model.ErrorType;
 import com.epam.ta.reportportal.ws.model.analyzer.IndexLaunch;
 import com.epam.ta.reportportal.ws.model.project.AnalyzerConfig;
+import com.epam.ta.reportportal.ws.reporting.ErrorType;
 import com.google.common.collect.Iterables;
 import com.google.common.collect.Sets;
 import java.util.List;
diff --git a/src/main/java/com/epam/ta/reportportal/core/analyzer/auto/impl/LogIndexerService.java b/src/main/java/com/epam/ta/reportportal/core/analyzer/auto/impl/LogIndexerService.java
index 429225b290..c48abaf808 100644
--- a/src/main/java/com/epam/ta/reportportal/core/analyzer/auto/impl/LogIndexerService.java
+++ b/src/main/java/com/epam/ta/reportportal/core/analyzer/auto/impl/LogIndexerService.java
@@ -26,9 +26,9 @@
 import com.epam.ta.reportportal.entity.item.TestItem;
 import com.epam.ta.reportportal.entity.launch.Launch;
 import com.epam.ta.reportportal.exception.ReportPortalException;
-import com.epam.ta.reportportal.ws.model.ErrorType;
 import com.epam.ta.reportportal.ws.model.analyzer.IndexLaunch;
 import com.epam.ta.reportportal.ws.model.project.AnalyzerConfig;
+import com.epam.ta.reportportal.ws.reporting.ErrorType;
 import java.util.Collection;
 import java.util.List;
 import java.util.Map;
diff --git a/src/main/java/com/epam/ta/reportportal/core/analyzer/auto/impl/SearchLogServiceImpl.java b/src/main/java/com/epam/ta/reportportal/core/analyzer/auto/impl/SearchLogServiceImpl.java
index 5714d074c3..ecbefb1bf8 100644
--- a/src/main/java/com/epam/ta/reportportal/core/analyzer/auto/impl/SearchLogServiceImpl.java
+++ b/src/main/java/com/epam/ta/reportportal/core/analyzer/auto/impl/SearchLogServiceImpl.java
@@ -48,8 +48,8 @@
 import com.epam.ta.reportportal.model.log.SearchLogRs;
 import com.epam.ta.reportportal.ws.converter.converters.IssueConverter;
 import com.epam.ta.reportportal.ws.converter.converters.TestItemConverter;
-import com.epam.ta.reportportal.ws.model.ErrorType;
 import com.epam.ta.reportportal.ws.model.project.AnalyzerConfig;
+import com.epam.ta.reportportal.ws.reporting.ErrorType;
 import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
 import java.time.temporal.ChronoUnit;
diff --git a/src/main/java/com/epam/ta/reportportal/core/analyzer/auto/impl/SuggestItemService.java b/src/main/java/com/epam/ta/reportportal/core/analyzer/auto/impl/SuggestItemService.java
index 5547e2e220..5c57ab063b 100644
--- a/src/main/java/com/epam/ta/reportportal/core/analyzer/auto/impl/SuggestItemService.java
+++ b/src/main/java/com/epam/ta/reportportal/core/analyzer/auto/impl/SuggestItemService.java
@@ -17,7 +17,7 @@
 
 import static com.epam.ta.reportportal.core.analyzer.auto.impl.AnalyzerUtils.getAnalyzerConfig;
 import static com.epam.ta.reportportal.entity.enums.LogLevel.ERROR_INT;
-import static com.epam.ta.reportportal.ws.model.ErrorType.BAD_REQUEST_ERROR;
+import static com.epam.ta.reportportal.ws.reporting.ErrorType.BAD_REQUEST_ERROR;
 
 import com.epam.ta.reportportal.commons.ReportPortalUser;
 import com.epam.ta.reportportal.core.analyzer.auto.client.AnalyzerServiceClient;
@@ -37,8 +37,8 @@
 import com.epam.ta.reportportal.exception.ReportPortalException;
 import com.epam.ta.reportportal.ws.converter.converters.LogConverter;
 import com.epam.ta.reportportal.ws.converter.converters.TestItemConverter;
-import com.epam.ta.reportportal.ws.model.ErrorType;
-import com.epam.ta.reportportal.ws.model.OperationCompletionRS;
+import com.epam.ta.reportportal.ws.reporting.ErrorType;
+import com.epam.ta.reportportal.ws.reporting.OperationCompletionRS;
 import java.util.Collections;
 import java.util.List;
 import java.util.Objects;
diff --git a/src/main/java/com/epam/ta/reportportal/core/analyzer/auto/impl/SuggestedItem.java b/src/main/java/com/epam/ta/reportportal/core/analyzer/auto/impl/SuggestedItem.java
index 57a6b482c3..1d32af2d29 100644
--- a/src/main/java/com/epam/ta/reportportal/core/analyzer/auto/impl/SuggestedItem.java
+++ b/src/main/java/com/epam/ta/reportportal/core/analyzer/auto/impl/SuggestedItem.java
@@ -17,8 +17,8 @@
 package com.epam.ta.reportportal.core.analyzer.auto.impl;
 
 import com.epam.ta.reportportal.core.analyzer.auto.client.model.SuggestInfo;
-import com.epam.ta.reportportal.model.TestItemResource;
 import com.epam.ta.reportportal.model.log.LogResource;
+import com.epam.ta.reportportal.ws.reporting.TestItemResource;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import java.util.Set;
 
diff --git a/src/main/java/com/epam/ta/reportportal/core/analyzer/auto/impl/preparer/LaunchPreparerServiceImpl.java b/src/main/java/com/epam/ta/reportportal/core/analyzer/auto/impl/preparer/LaunchPreparerServiceImpl.java
index 665aa65692..e44c1e85f0 100644
--- a/src/main/java/com/epam/ta/reportportal/core/analyzer/auto/impl/preparer/LaunchPreparerServiceImpl.java
+++ b/src/main/java/com/epam/ta/reportportal/core/analyzer/auto/impl/preparer/LaunchPreparerServiceImpl.java
@@ -24,10 +24,10 @@
 import com.epam.ta.reportportal.entity.item.TestItem;
 import com.epam.ta.reportportal.entity.launch.Launch;
 import com.epam.ta.reportportal.exception.ReportPortalException;
-import com.epam.ta.reportportal.ws.model.ErrorType;
 import com.epam.ta.reportportal.ws.model.analyzer.IndexLaunch;
 import com.epam.ta.reportportal.ws.model.analyzer.IndexTestItem;
 import com.epam.ta.reportportal.ws.model.project.AnalyzerConfig;
+import com.epam.ta.reportportal.ws.reporting.ErrorType;
 import java.time.LocalDateTime;
 import java.util.List;
 import java.util.Map;
diff --git a/src/main/java/com/epam/ta/reportportal/core/analyzer/auto/starter/decorator/ExistingAnalyzerStarter.java b/src/main/java/com/epam/ta/reportportal/core/analyzer/auto/starter/decorator/ExistingAnalyzerStarter.java
index 0e9cdd30ee..ed32aa75ca 100644
--- a/src/main/java/com/epam/ta/reportportal/core/analyzer/auto/starter/decorator/ExistingAnalyzerStarter.java
+++ b/src/main/java/com/epam/ta/reportportal/core/analyzer/auto/starter/decorator/ExistingAnalyzerStarter.java
@@ -21,7 +21,7 @@
 import com.epam.ta.reportportal.core.analyzer.auto.AnalyzerService;
 import com.epam.ta.reportportal.core.analyzer.auto.starter.LaunchAutoAnalysisStarter;
 import com.epam.ta.reportportal.core.analyzer.config.StartLaunchAutoAnalysisConfig;
-import com.epam.ta.reportportal.ws.model.ErrorType;
+import com.epam.ta.reportportal.ws.reporting.ErrorType;
 import java.util.function.Predicate;
 
 /**
diff --git a/src/main/java/com/epam/ta/reportportal/core/analyzer/auto/strategy/analyze/AnalyzeItemsMode.java b/src/main/java/com/epam/ta/reportportal/core/analyzer/auto/strategy/analyze/AnalyzeItemsMode.java
index 5f4897cdf1..717e5cba11 100644
--- a/src/main/java/com/epam/ta/reportportal/core/analyzer/auto/strategy/analyze/AnalyzeItemsMode.java
+++ b/src/main/java/com/epam/ta/reportportal/core/analyzer/auto/strategy/analyze/AnalyzeItemsMode.java
@@ -17,7 +17,7 @@
 package com.epam.ta.reportportal.core.analyzer.auto.strategy.analyze;
 
 import com.epam.ta.reportportal.exception.ReportPortalException;
-import com.epam.ta.reportportal.ws.model.ErrorType;
+import com.epam.ta.reportportal.ws.reporting.ErrorType;
 import java.util.Arrays;
 import java.util.stream.Collectors;
 
diff --git a/src/main/java/com/epam/ta/reportportal/core/analyzer/auto/strategy/search/FilterCollector.java b/src/main/java/com/epam/ta/reportportal/core/analyzer/auto/strategy/search/FilterCollector.java
index f4dee7b67a..7c58409650 100644
--- a/src/main/java/com/epam/ta/reportportal/core/analyzer/auto/strategy/search/FilterCollector.java
+++ b/src/main/java/com/epam/ta/reportportal/core/analyzer/auto/strategy/search/FilterCollector.java
@@ -30,7 +30,7 @@
 import com.epam.ta.reportportal.entity.filter.UserFilter;
 import com.epam.ta.reportportal.entity.launch.Launch;
 import com.epam.ta.reportportal.exception.ReportPortalException;
-import com.epam.ta.reportportal.ws.model.ErrorType;
+import com.epam.ta.reportportal.ws.reporting.ErrorType;
 import com.google.common.collect.Lists;
 import java.util.List;
 import java.util.stream.Collectors;
diff --git a/src/main/java/com/epam/ta/reportportal/core/analyzer/config/AnalyzerType.java b/src/main/java/com/epam/ta/reportportal/core/analyzer/config/AnalyzerType.java
index a1894293c7..493f8018a6 100644
--- a/src/main/java/com/epam/ta/reportportal/core/analyzer/config/AnalyzerType.java
+++ b/src/main/java/com/epam/ta/reportportal/core/analyzer/config/AnalyzerType.java
@@ -17,7 +17,7 @@
 package com.epam.ta.reportportal.core.analyzer.config;
 
 import com.epam.ta.reportportal.exception.ReportPortalException;
-import com.epam.ta.reportportal.ws.model.ErrorType;
+import com.epam.ta.reportportal.ws.reporting.ErrorType;
 import java.util.Arrays;
 import java.util.stream.Collectors;
 
diff --git a/src/main/java/com/epam/ta/reportportal/core/analyzer/pattern/service/impl/CreatePatternTemplateHandlerImpl.java b/src/main/java/com/epam/ta/reportportal/core/analyzer/pattern/service/impl/CreatePatternTemplateHandlerImpl.java
index 4323f4a73f..3ed1fbe542 100644
--- a/src/main/java/com/epam/ta/reportportal/core/analyzer/pattern/service/impl/CreatePatternTemplateHandlerImpl.java
+++ b/src/main/java/com/epam/ta/reportportal/core/analyzer/pattern/service/impl/CreatePatternTemplateHandlerImpl.java
@@ -24,7 +24,7 @@
 import com.epam.ta.reportportal.entity.pattern.PatternTemplate;
 import com.epam.ta.reportportal.model.project.config.pattern.CreatePatternTemplateRQ;
 import com.epam.ta.reportportal.ws.converter.builders.PatternTemplateBuilder;
-import com.epam.ta.reportportal.ws.model.ErrorType;
+import com.epam.ta.reportportal.ws.reporting.ErrorType;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 
diff --git a/src/main/java/com/epam/ta/reportportal/core/analyzer/pattern/service/impl/CreateRegexPatternTemplateHandler.java b/src/main/java/com/epam/ta/reportportal/core/analyzer/pattern/service/impl/CreateRegexPatternTemplateHandler.java
index d539d863a9..1f8320af42 100644
--- a/src/main/java/com/epam/ta/reportportal/core/analyzer/pattern/service/impl/CreateRegexPatternTemplateHandler.java
+++ b/src/main/java/com/epam/ta/reportportal/core/analyzer/pattern/service/impl/CreateRegexPatternTemplateHandler.java
@@ -21,7 +21,7 @@
 import com.epam.ta.reportportal.entity.pattern.PatternTemplate;
 import com.epam.ta.reportportal.exception.ReportPortalException;
 import com.epam.ta.reportportal.model.project.config.pattern.CreatePatternTemplateRQ;
-import com.epam.ta.reportportal.ws.model.ErrorType;
+import com.epam.ta.reportportal.ws.reporting.ErrorType;
 import javax.persistence.PersistenceException;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
diff --git a/src/main/java/com/epam/ta/reportportal/core/analyzer/pattern/service/impl/LaunchPatternAnalyzerImpl.java b/src/main/java/com/epam/ta/reportportal/core/analyzer/pattern/service/impl/LaunchPatternAnalyzerImpl.java
index c4bb9a1643..6ec0c5a307 100644
--- a/src/main/java/com/epam/ta/reportportal/core/analyzer/pattern/service/impl/LaunchPatternAnalyzerImpl.java
+++ b/src/main/java/com/epam/ta/reportportal/core/analyzer/pattern/service/impl/LaunchPatternAnalyzerImpl.java
@@ -31,7 +31,7 @@
 import com.epam.ta.reportportal.entity.item.TestItem;
 import com.epam.ta.reportportal.entity.launch.Launch;
 import com.epam.ta.reportportal.exception.ReportPortalException;
-import com.epam.ta.reportportal.ws.model.ErrorType;
+import com.epam.ta.reportportal.ws.reporting.ErrorType;
 import java.util.Collections;
 import java.util.List;
 import java.util.Set;
diff --git a/src/main/java/com/epam/ta/reportportal/core/analyzer/strategy/AbstractLaunchAnalysisStrategy.java b/src/main/java/com/epam/ta/reportportal/core/analyzer/strategy/AbstractLaunchAnalysisStrategy.java
index 4a58a81262..572f83b20b 100644
--- a/src/main/java/com/epam/ta/reportportal/core/analyzer/strategy/AbstractLaunchAnalysisStrategy.java
+++ b/src/main/java/com/epam/ta/reportportal/core/analyzer/strategy/AbstractLaunchAnalysisStrategy.java
@@ -18,8 +18,8 @@
 
 import static com.epam.ta.reportportal.commons.Predicates.equalTo;
 import static com.epam.ta.reportportal.commons.validation.BusinessRule.expect;
-import static com.epam.ta.reportportal.ws.model.ErrorType.FORBIDDEN_OPERATION;
-import static com.epam.ta.reportportal.ws.model.ErrorType.INCORRECT_REQUEST;
+import static com.epam.ta.reportportal.ws.reporting.ErrorType.FORBIDDEN_OPERATION;
+import static com.epam.ta.reportportal.ws.reporting.ErrorType.INCORRECT_REQUEST;
 
 import com.epam.ta.reportportal.commons.ReportPortalUser;
 import com.epam.ta.reportportal.commons.validation.Suppliers;
diff --git a/src/main/java/com/epam/ta/reportportal/core/analyzer/strategy/LaunchAutoAnalysisStrategy.java b/src/main/java/com/epam/ta/reportportal/core/analyzer/strategy/LaunchAutoAnalysisStrategy.java
index 6705735f2c..b65596ac41 100644
--- a/src/main/java/com/epam/ta/reportportal/core/analyzer/strategy/LaunchAutoAnalysisStrategy.java
+++ b/src/main/java/com/epam/ta/reportportal/core/analyzer/strategy/LaunchAutoAnalysisStrategy.java
@@ -17,9 +17,9 @@
 package com.epam.ta.reportportal.core.analyzer.strategy;
 
 import static com.epam.ta.reportportal.core.analyzer.auto.impl.AnalyzerUtils.getAnalyzerConfig;
-import static com.epam.ta.reportportal.ws.model.ErrorType.BAD_REQUEST_ERROR;
-import static com.epam.ta.reportportal.ws.model.ErrorType.LAUNCH_NOT_FOUND;
-import static com.epam.ta.reportportal.ws.model.ErrorType.PROJECT_NOT_FOUND;
+import static com.epam.ta.reportportal.ws.reporting.ErrorType.BAD_REQUEST_ERROR;
+import static com.epam.ta.reportportal.ws.reporting.ErrorType.LAUNCH_NOT_FOUND;
+import static com.epam.ta.reportportal.ws.reporting.ErrorType.PROJECT_NOT_FOUND;
 
 import com.epam.ta.reportportal.commons.ReportPortalUser;
 import com.epam.ta.reportportal.core.analyzer.auto.starter.LaunchAutoAnalysisStarter;
diff --git a/src/main/java/com/epam/ta/reportportal/core/analyzer/strategy/LaunchPatternAnalysisStrategy.java b/src/main/java/com/epam/ta/reportportal/core/analyzer/strategy/LaunchPatternAnalysisStrategy.java
index b63b72eb97..0160c2706f 100644
--- a/src/main/java/com/epam/ta/reportportal/core/analyzer/strategy/LaunchPatternAnalysisStrategy.java
+++ b/src/main/java/com/epam/ta/reportportal/core/analyzer/strategy/LaunchPatternAnalysisStrategy.java
@@ -17,7 +17,7 @@
 package com.epam.ta.reportportal.core.analyzer.strategy;
 
 import static com.epam.ta.reportportal.commons.validation.BusinessRule.expect;
-import static com.epam.ta.reportportal.ws.model.ErrorType.LAUNCH_NOT_FOUND;
+import static com.epam.ta.reportportal.ws.reporting.ErrorType.LAUNCH_NOT_FOUND;
 import static java.util.stream.Collectors.toSet;
 
 import com.epam.ta.reportportal.commons.ReportPortalUser;
@@ -28,7 +28,7 @@
 import com.epam.ta.reportportal.entity.launch.Launch;
 import com.epam.ta.reportportal.exception.ReportPortalException;
 import com.epam.ta.reportportal.model.launch.AnalyzeLaunchRQ;
-import com.epam.ta.reportportal.ws.model.ErrorType;
+import com.epam.ta.reportportal.ws.reporting.ErrorType;
 import java.util.Set;
 import org.apache.commons.collections.CollectionUtils;
 import org.springframework.beans.factory.annotation.Autowired;
diff --git a/src/main/java/com/epam/ta/reportportal/core/bts/handler/impl/CreateTicketHandlerImpl.java b/src/main/java/com/epam/ta/reportportal/core/bts/handler/impl/CreateTicketHandlerImpl.java
index d00fc1a212..b16233c57e 100644
--- a/src/main/java/com/epam/ta/reportportal/core/bts/handler/impl/CreateTicketHandlerImpl.java
+++ b/src/main/java/com/epam/ta/reportportal/core/bts/handler/impl/CreateTicketHandlerImpl.java
@@ -19,8 +19,8 @@
 import static com.epam.ta.reportportal.commons.Predicates.notNull;
 import static com.epam.ta.reportportal.commons.validation.BusinessRule.expect;
 import static com.epam.ta.reportportal.ws.converter.converters.TestItemConverter.TO_ACTIVITY_RESOURCE;
-import static com.epam.ta.reportportal.ws.model.ErrorType.BAD_REQUEST_ERROR;
-import static com.epam.ta.reportportal.ws.model.ErrorType.UNABLE_POST_TICKET;
+import static com.epam.ta.reportportal.ws.reporting.ErrorType.BAD_REQUEST_ERROR;
+import static com.epam.ta.reportportal.ws.reporting.ErrorType.UNABLE_POST_TICKET;
 import static java.util.Optional.ofNullable;
 
 import com.epam.reportportal.extension.bugtracking.BtsConstants;
diff --git a/src/main/java/com/epam/ta/reportportal/core/bts/handler/impl/GetBugTrackingSystemHandlerImpl.java b/src/main/java/com/epam/ta/reportportal/core/bts/handler/impl/GetBugTrackingSystemHandlerImpl.java
index 8557f75b7f..3caac7493d 100644
--- a/src/main/java/com/epam/ta/reportportal/core/bts/handler/impl/GetBugTrackingSystemHandlerImpl.java
+++ b/src/main/java/com/epam/ta/reportportal/core/bts/handler/impl/GetBugTrackingSystemHandlerImpl.java
@@ -23,7 +23,7 @@
 import com.epam.ta.reportportal.dao.IntegrationRepository;
 import com.epam.ta.reportportal.entity.enums.IntegrationGroupEnum;
 import com.epam.ta.reportportal.entity.integration.Integration;
-import com.epam.ta.reportportal.ws.model.ErrorType;
+import com.epam.ta.reportportal.ws.reporting.ErrorType;
 import java.util.Optional;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
diff --git a/src/main/java/com/epam/ta/reportportal/core/bts/handler/impl/GetTicketHandlerImpl.java b/src/main/java/com/epam/ta/reportportal/core/bts/handler/impl/GetTicketHandlerImpl.java
index fa6ea54a0b..cd99ff241e 100644
--- a/src/main/java/com/epam/ta/reportportal/core/bts/handler/impl/GetTicketHandlerImpl.java
+++ b/src/main/java/com/epam/ta/reportportal/core/bts/handler/impl/GetTicketHandlerImpl.java
@@ -16,7 +16,8 @@
 
 package com.epam.ta.reportportal.core.bts.handler.impl;
 
-import static com.epam.ta.reportportal.ws.model.ErrorType.BAD_REQUEST_ERROR;
+
+import static com.epam.ta.reportportal.ws.reporting.ErrorType.BAD_REQUEST_ERROR;
 
 import com.epam.reportportal.extension.bugtracking.BtsExtension;
 import com.epam.ta.reportportal.commons.ReportPortalUser;
@@ -26,9 +27,9 @@
 import com.epam.ta.reportportal.core.plugin.PluginBox;
 import com.epam.ta.reportportal.entity.integration.Integration;
 import com.epam.ta.reportportal.exception.ReportPortalException;
-import com.epam.ta.reportportal.ws.model.ErrorType;
 import com.epam.ta.reportportal.ws.model.externalsystem.PostFormField;
 import com.epam.ta.reportportal.ws.model.externalsystem.Ticket;
+import com.epam.ta.reportportal.ws.reporting.ErrorType;
 import java.util.List;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
diff --git a/src/main/java/com/epam/ta/reportportal/core/configs/rabbit/AnalyzerRabbitMqConfiguration.java b/src/main/java/com/epam/ta/reportportal/core/configs/rabbit/AnalyzerRabbitMqConfiguration.java
index 89ba9e755e..bec5b510ce 100644
--- a/src/main/java/com/epam/ta/reportportal/core/configs/rabbit/AnalyzerRabbitMqConfiguration.java
+++ b/src/main/java/com/epam/ta/reportportal/core/configs/rabbit/AnalyzerRabbitMqConfiguration.java
@@ -20,7 +20,7 @@
 import com.epam.ta.reportportal.core.analyzer.auto.client.impl.RabbitMqManagementClientTemplate;
 import com.epam.ta.reportportal.core.configs.Conditions;
 import com.epam.ta.reportportal.exception.ReportPortalException;
-import com.epam.ta.reportportal.ws.model.ErrorType;
+import com.epam.ta.reportportal.ws.reporting.ErrorType;
 import com.rabbitmq.http.client.Client;
 import java.net.URI;
 import org.springframework.amqp.rabbit.connection.CachingConnectionFactory;
diff --git a/src/main/java/com/epam/ta/reportportal/core/configs/rabbit/RabbitMqConfiguration.java b/src/main/java/com/epam/ta/reportportal/core/configs/rabbit/RabbitMqConfiguration.java
index c82aeb9509..4c24f4c214 100644
--- a/src/main/java/com/epam/ta/reportportal/core/configs/rabbit/RabbitMqConfiguration.java
+++ b/src/main/java/com/epam/ta/reportportal/core/configs/rabbit/RabbitMqConfiguration.java
@@ -18,7 +18,7 @@
 
 import com.epam.ta.reportportal.core.configs.Conditions;
 import com.epam.ta.reportportal.exception.ReportPortalException;
-import com.epam.ta.reportportal.ws.model.ErrorType;
+import com.epam.ta.reportportal.ws.reporting.ErrorType;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.rabbitmq.http.client.Client;
 import java.net.URI;
diff --git a/src/main/java/com/epam/ta/reportportal/core/configs/resource/ResourceAttributeHandlerConfig.java b/src/main/java/com/epam/ta/reportportal/core/configs/resource/ResourceAttributeHandlerConfig.java
index 7361307741..ef1fed6cdf 100644
--- a/src/main/java/com/epam/ta/reportportal/core/configs/resource/ResourceAttributeHandlerConfig.java
+++ b/src/main/java/com/epam/ta/reportportal/core/configs/resource/ResourceAttributeHandlerConfig.java
@@ -28,7 +28,7 @@
 import com.epam.ta.reportportal.ws.converter.resource.handler.attribute.matcher.PredicateItemAttributeTypeMatcher;
 import com.epam.ta.reportportal.ws.converter.resource.handler.attribute.resolver.ItemAttributeTypeResolver;
 import com.epam.ta.reportportal.ws.converter.resource.handler.attribute.resolver.ItemAttributeTypeResolverDelegate;
-import com.epam.ta.reportportal.ws.model.launch.LaunchResource;
+import com.epam.ta.reportportal.ws.reporting.LaunchResource;
 import com.google.common.collect.ImmutableMap;
 import java.util.List;
 import java.util.Map;
diff --git a/src/main/java/com/epam/ta/reportportal/core/dashboard/DeleteDashboardHandler.java b/src/main/java/com/epam/ta/reportportal/core/dashboard/DeleteDashboardHandler.java
index 44a2ac46ed..b186045bce 100644
--- a/src/main/java/com/epam/ta/reportportal/core/dashboard/DeleteDashboardHandler.java
+++ b/src/main/java/com/epam/ta/reportportal/core/dashboard/DeleteDashboardHandler.java
@@ -17,7 +17,7 @@
 package com.epam.ta.reportportal.core.dashboard;
 
 import com.epam.ta.reportportal.commons.ReportPortalUser;
-import com.epam.ta.reportportal.ws.model.OperationCompletionRS;
+import com.epam.ta.reportportal.ws.reporting.OperationCompletionRS;
 
 /**
  * @author <a href="mailto:pavel_bortnik@epam.com">Pavel Bortnik</a>
diff --git a/src/main/java/com/epam/ta/reportportal/core/dashboard/UpdateDashboardHandler.java b/src/main/java/com/epam/ta/reportportal/core/dashboard/UpdateDashboardHandler.java
index d6f4a4e99c..d49ccc80ef 100644
--- a/src/main/java/com/epam/ta/reportportal/core/dashboard/UpdateDashboardHandler.java
+++ b/src/main/java/com/epam/ta/reportportal/core/dashboard/UpdateDashboardHandler.java
@@ -19,7 +19,7 @@
 import com.epam.ta.reportportal.commons.ReportPortalUser;
 import com.epam.ta.reportportal.model.dashboard.AddWidgetRq;
 import com.epam.ta.reportportal.model.dashboard.UpdateDashboardRQ;
-import com.epam.ta.reportportal.ws.model.OperationCompletionRS;
+import com.epam.ta.reportportal.ws.reporting.OperationCompletionRS;
 
 /**
  * @author Pavel Bortnik
diff --git a/src/main/java/com/epam/ta/reportportal/core/dashboard/impl/CreateDashboardHandlerImpl.java b/src/main/java/com/epam/ta/reportportal/core/dashboard/impl/CreateDashboardHandlerImpl.java
index 77c6f21a95..368275fb74 100644
--- a/src/main/java/com/epam/ta/reportportal/core/dashboard/impl/CreateDashboardHandlerImpl.java
+++ b/src/main/java/com/epam/ta/reportportal/core/dashboard/impl/CreateDashboardHandlerImpl.java
@@ -29,7 +29,7 @@
 import com.epam.ta.reportportal.model.EntryCreatedRS;
 import com.epam.ta.reportportal.model.dashboard.CreateDashboardRQ;
 import com.epam.ta.reportportal.ws.converter.builders.DashboardBuilder;
-import com.epam.ta.reportportal.ws.model.ErrorType;
+import com.epam.ta.reportportal.ws.reporting.ErrorType;
 import org.apache.commons.lang3.BooleanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
diff --git a/src/main/java/com/epam/ta/reportportal/core/dashboard/impl/DeleteDashboardHandlerImpl.java b/src/main/java/com/epam/ta/reportportal/core/dashboard/impl/DeleteDashboardHandlerImpl.java
index f0a1ef557c..c3eca2be71 100644
--- a/src/main/java/com/epam/ta/reportportal/core/dashboard/impl/DeleteDashboardHandlerImpl.java
+++ b/src/main/java/com/epam/ta/reportportal/core/dashboard/impl/DeleteDashboardHandlerImpl.java
@@ -16,6 +16,9 @@
 
 package com.epam.ta.reportportal.core.dashboard.impl;
 
+import static com.epam.ta.reportportal.ws.converter.converters.DashboardConverter.TO_ACTIVITY_RESOURCE;
+import static java.util.stream.Collectors.toSet;
+
 import com.epam.ta.reportportal.commons.ReportPortalUser;
 import com.epam.ta.reportportal.core.dashboard.DeleteDashboardHandler;
 import com.epam.ta.reportportal.core.events.MessageBus;
@@ -28,18 +31,14 @@
 import com.epam.ta.reportportal.entity.dashboard.DashboardWidget;
 import com.epam.ta.reportportal.entity.widget.Widget;
 import com.epam.ta.reportportal.exception.ReportPortalException;
-import com.epam.ta.reportportal.ws.model.ErrorType;
-import com.epam.ta.reportportal.ws.model.OperationCompletionRS;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Qualifier;
-import org.springframework.stereotype.Service;
-
+import com.epam.ta.reportportal.ws.reporting.ErrorType;
+import com.epam.ta.reportportal.ws.reporting.OperationCompletionRS;
 import java.util.List;
 import java.util.Set;
 import java.util.stream.Collectors;
-
-import static com.epam.ta.reportportal.ws.converter.converters.DashboardConverter.TO_ACTIVITY_RESOURCE;
-import static java.util.stream.Collectors.toSet;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Qualifier;
+import org.springframework.stereotype.Service;
 
 /**
  * @author <a href="mailto:pavel_bortnik@epam.com">Pavel Bortnik</a>
diff --git a/src/main/java/com/epam/ta/reportportal/core/dashboard/impl/GetDashboardHandlerImpl.java b/src/main/java/com/epam/ta/reportportal/core/dashboard/impl/GetDashboardHandlerImpl.java
index 2749289094..f088dc0d6c 100644
--- a/src/main/java/com/epam/ta/reportportal/core/dashboard/impl/GetDashboardHandlerImpl.java
+++ b/src/main/java/com/epam/ta/reportportal/core/dashboard/impl/GetDashboardHandlerImpl.java
@@ -26,7 +26,7 @@
 import com.epam.ta.reportportal.model.dashboard.DashboardResource;
 import com.epam.ta.reportportal.ws.converter.PagedResourcesAssembler;
 import com.epam.ta.reportportal.ws.converter.converters.DashboardConverter;
-import com.epam.ta.reportportal.ws.model.ErrorType;
+import com.epam.ta.reportportal.ws.reporting.ErrorType;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
diff --git a/src/main/java/com/epam/ta/reportportal/core/dashboard/impl/UpdateDashboardHandlerImpl.java b/src/main/java/com/epam/ta/reportportal/core/dashboard/impl/UpdateDashboardHandlerImpl.java
index 45271feec5..a84e8b725f 100644
--- a/src/main/java/com/epam/ta/reportportal/core/dashboard/impl/UpdateDashboardHandlerImpl.java
+++ b/src/main/java/com/epam/ta/reportportal/core/dashboard/impl/UpdateDashboardHandlerImpl.java
@@ -16,6 +16,8 @@
 
 package com.epam.ta.reportportal.core.dashboard.impl;
 
+import static com.epam.ta.reportportal.ws.converter.converters.DashboardConverter.TO_ACTIVITY_RESOURCE;
+
 import com.epam.ta.reportportal.commons.ReportPortalUser;
 import com.epam.ta.reportportal.commons.validation.BusinessRule;
 import com.epam.ta.reportportal.commons.validation.Suppliers;
@@ -36,8 +38,8 @@
 import com.epam.ta.reportportal.model.dashboard.UpdateDashboardRQ;
 import com.epam.ta.reportportal.ws.converter.builders.DashboardBuilder;
 import com.epam.ta.reportportal.ws.converter.converters.WidgetConverter;
-import com.epam.ta.reportportal.ws.model.ErrorType;
-import com.epam.ta.reportportal.ws.model.OperationCompletionRS;
+import com.epam.ta.reportportal.ws.reporting.ErrorType;
+import com.epam.ta.reportportal.ws.reporting.OperationCompletionRS;
 import java.util.Set;
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.lang3.BooleanUtils;
@@ -46,8 +48,6 @@
 import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.stereotype.Service;
 
-import static com.epam.ta.reportportal.ws.converter.converters.DashboardConverter.TO_ACTIVITY_RESOURCE;
-
 /**
  * @author Pavel Bortnik
  */
diff --git a/src/main/java/com/epam/ta/reportportal/core/events/handler/DefectTypeDeletedHandler.java b/src/main/java/com/epam/ta/reportportal/core/events/handler/DefectTypeDeletedHandler.java
index 190f6abe39..5eff3bd3fc 100644
--- a/src/main/java/com/epam/ta/reportportal/core/events/handler/DefectTypeDeletedHandler.java
+++ b/src/main/java/com/epam/ta/reportportal/core/events/handler/DefectTypeDeletedHandler.java
@@ -29,7 +29,7 @@
 import com.epam.ta.reportportal.dao.ProjectRepository;
 import com.epam.ta.reportportal.entity.project.Project;
 import com.epam.ta.reportportal.exception.ReportPortalException;
-import com.epam.ta.reportportal.ws.model.ErrorType;
+import com.epam.ta.reportportal.ws.reporting.ErrorType;
 import com.google.common.cache.Cache;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.retry.annotation.Backoff;
diff --git a/src/main/java/com/epam/ta/reportportal/core/events/handler/GenerateWidgetViewEventHandler.java b/src/main/java/com/epam/ta/reportportal/core/events/handler/GenerateWidgetViewEventHandler.java
index cfa1d63959..33d65c9187 100644
--- a/src/main/java/com/epam/ta/reportportal/core/events/handler/GenerateWidgetViewEventHandler.java
+++ b/src/main/java/com/epam/ta/reportportal/core/events/handler/GenerateWidgetViewEventHandler.java
@@ -14,7 +14,7 @@
 import com.epam.ta.reportportal.dao.WidgetRepository;
 import com.epam.ta.reportportal.entity.widget.WidgetType;
 import com.epam.ta.reportportal.exception.ReportPortalException;
-import com.epam.ta.reportportal.ws.model.ErrorType;
+import com.epam.ta.reportportal.ws.reporting.ErrorType;
 import java.util.Map;
 import org.apache.commons.lang3.BooleanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
diff --git a/src/main/java/com/epam/ta/reportportal/core/events/handler/launch/LaunchNotificationRunner.java b/src/main/java/com/epam/ta/reportportal/core/events/handler/launch/LaunchNotificationRunner.java
index 21f6530d54..05cb79e5ea 100644
--- a/src/main/java/com/epam/ta/reportportal/core/events/handler/launch/LaunchNotificationRunner.java
+++ b/src/main/java/com/epam/ta/reportportal/core/events/handler/launch/LaunchNotificationRunner.java
@@ -43,8 +43,8 @@
 import com.epam.ta.reportportal.util.email.EmailService;
 import com.epam.ta.reportportal.util.email.MailServiceFactory;
 import com.epam.ta.reportportal.ws.converter.converters.NotificationConfigConverter;
-import com.epam.ta.reportportal.ws.model.ErrorType;
-import com.epam.ta.reportportal.ws.model.attribute.ItemAttributeResource;
+import com.epam.ta.reportportal.ws.reporting.ItemAttributeResource;
+import com.epam.ta.reportportal.ws.reporting.ErrorType;
 import com.google.common.annotations.VisibleForTesting;
 import java.util.Map;
 import java.util.Objects;
@@ -109,8 +109,6 @@ public void handle(LaunchFinishedEvent launchFinishedEvent, Map<String, String>
   /**
    * Try to send email when it is needed
    *
-   * @param launch       Launch to be used
-   * @param project      Project
    * @param emailService Mail Service
    */
   private void sendEmail(LaunchFinishedEvent launchFinishedEvent, EmailService emailService) {
diff --git a/src/main/java/com/epam/ta/reportportal/core/file/DeleteFilesHandler.java b/src/main/java/com/epam/ta/reportportal/core/file/DeleteFilesHandler.java
index 49161f40a1..ff9d747a3b 100644
--- a/src/main/java/com/epam/ta/reportportal/core/file/DeleteFilesHandler.java
+++ b/src/main/java/com/epam/ta/reportportal/core/file/DeleteFilesHandler.java
@@ -6,8 +6,8 @@
 import com.epam.ta.reportportal.core.events.MessageBus;
 import com.epam.ta.reportportal.core.events.attachment.DeleteAttachmentEvent;
 import com.epam.ta.reportportal.exception.ReportPortalException;
-import com.epam.ta.reportportal.ws.model.ErrorType;
-import com.epam.ta.reportportal.ws.model.OperationCompletionRS;
+import com.epam.ta.reportportal.ws.reporting.ErrorType;
+import com.epam.ta.reportportal.ws.reporting.OperationCompletionRS;
 import com.google.api.client.util.Lists;
 import com.opencsv.CSVParser;
 import com.opencsv.CSVParserBuilder;
diff --git a/src/main/java/com/epam/ta/reportportal/core/file/impl/GetFileHandlerImpl.java b/src/main/java/com/epam/ta/reportportal/core/file/impl/GetFileHandlerImpl.java
index 3bc74f859e..479885dbde 100644
--- a/src/main/java/com/epam/ta/reportportal/core/file/impl/GetFileHandlerImpl.java
+++ b/src/main/java/com/epam/ta/reportportal/core/file/impl/GetFileHandlerImpl.java
@@ -29,7 +29,7 @@
 import com.epam.ta.reportportal.entity.user.UserRole;
 import com.epam.ta.reportportal.exception.ReportPortalException;
 import com.epam.ta.reportportal.util.ProjectExtractor;
-import com.epam.ta.reportportal.ws.model.ErrorType;
+import com.epam.ta.reportportal.ws.reporting.ErrorType;
 import java.util.function.Predicate;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
diff --git a/src/main/java/com/epam/ta/reportportal/core/filter/DeleteUserFilterHandler.java b/src/main/java/com/epam/ta/reportportal/core/filter/DeleteUserFilterHandler.java
index 81bbd11ada..770347ac00 100644
--- a/src/main/java/com/epam/ta/reportportal/core/filter/DeleteUserFilterHandler.java
+++ b/src/main/java/com/epam/ta/reportportal/core/filter/DeleteUserFilterHandler.java
@@ -17,7 +17,7 @@
 package com.epam.ta.reportportal.core.filter;
 
 import com.epam.ta.reportportal.commons.ReportPortalUser;
-import com.epam.ta.reportportal.ws.model.OperationCompletionRS;
+import com.epam.ta.reportportal.ws.reporting.OperationCompletionRS;
 
 /**
  * Delete complex filter handler
diff --git a/src/main/java/com/epam/ta/reportportal/core/filter/UpdateUserFilterHandler.java b/src/main/java/com/epam/ta/reportportal/core/filter/UpdateUserFilterHandler.java
index 6eb5f5cc55..be378c31b1 100644
--- a/src/main/java/com/epam/ta/reportportal/core/filter/UpdateUserFilterHandler.java
+++ b/src/main/java/com/epam/ta/reportportal/core/filter/UpdateUserFilterHandler.java
@@ -21,7 +21,7 @@
 import com.epam.ta.reportportal.model.EntryCreatedRS;
 import com.epam.ta.reportportal.model.filter.BulkUpdateFilterRQ;
 import com.epam.ta.reportportal.model.filter.UpdateUserFilterRQ;
-import com.epam.ta.reportportal.ws.model.OperationCompletionRS;
+import com.epam.ta.reportportal.ws.reporting.OperationCompletionRS;
 import java.util.List;
 
 /**
diff --git a/src/main/java/com/epam/ta/reportportal/core/filter/impl/DeleteUserFilterHandlerImpl.java b/src/main/java/com/epam/ta/reportportal/core/filter/impl/DeleteUserFilterHandlerImpl.java
index bb1a88f3a3..2ff17ccb60 100644
--- a/src/main/java/com/epam/ta/reportportal/core/filter/impl/DeleteUserFilterHandlerImpl.java
+++ b/src/main/java/com/epam/ta/reportportal/core/filter/impl/DeleteUserFilterHandlerImpl.java
@@ -16,6 +16,10 @@
 
 package com.epam.ta.reportportal.core.filter.impl;
 
+import static com.epam.ta.reportportal.commons.validation.BusinessRule.expect;
+import static com.epam.ta.reportportal.ws.converter.converters.UserFilterConverter.TO_ACTIVITY_RESOURCE;
+import static com.epam.ta.reportportal.ws.reporting.ErrorType.USER_FILTER_NOT_FOUND;
+
 import com.epam.ta.reportportal.commons.ReportPortalUser;
 import com.epam.ta.reportportal.core.events.MessageBus;
 import com.epam.ta.reportportal.core.events.activity.FilterDeletedEvent;
@@ -23,17 +27,12 @@
 import com.epam.ta.reportportal.dao.UserFilterRepository;
 import com.epam.ta.reportportal.entity.filter.UserFilter;
 import com.epam.ta.reportportal.exception.ReportPortalException;
-import com.epam.ta.reportportal.ws.model.ErrorType;
-import com.epam.ta.reportportal.ws.model.OperationCompletionRS;
+import com.epam.ta.reportportal.ws.reporting.ErrorType;
+import com.epam.ta.reportportal.ws.reporting.OperationCompletionRS;
+import java.util.function.Predicate;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-import java.util.function.Predicate;
-
-import static com.epam.ta.reportportal.commons.validation.BusinessRule.expect;
-import static com.epam.ta.reportportal.ws.converter.converters.UserFilterConverter.TO_ACTIVITY_RESOURCE;
-import static com.epam.ta.reportportal.ws.model.ErrorType.USER_FILTER_NOT_FOUND;
-
 @Service
 public class DeleteUserFilterHandlerImpl implements DeleteUserFilterHandler {
 
diff --git a/src/main/java/com/epam/ta/reportportal/core/filter/impl/GetUserFilterHandlerImpl.java b/src/main/java/com/epam/ta/reportportal/core/filter/impl/GetUserFilterHandlerImpl.java
index fb4cb05163..2a84b9a07e 100644
--- a/src/main/java/com/epam/ta/reportportal/core/filter/impl/GetUserFilterHandlerImpl.java
+++ b/src/main/java/com/epam/ta/reportportal/core/filter/impl/GetUserFilterHandlerImpl.java
@@ -28,7 +28,7 @@
 import com.epam.ta.reportportal.util.ProjectExtractor;
 import com.epam.ta.reportportal.ws.converter.PagedResourcesAssembler;
 import com.epam.ta.reportportal.ws.converter.converters.UserFilterConverter;
-import com.epam.ta.reportportal.ws.model.ErrorType;
+import com.epam.ta.reportportal.ws.reporting.ErrorType;
 import com.google.common.collect.Lists;
 import java.util.List;
 import org.springframework.beans.factory.annotation.Autowired;
diff --git a/src/main/java/com/epam/ta/reportportal/core/filter/impl/UpdateUserFilterHandlerImpl.java b/src/main/java/com/epam/ta/reportportal/core/filter/impl/UpdateUserFilterHandlerImpl.java
index 0c4029774c..8afa6180c0 100644
--- a/src/main/java/com/epam/ta/reportportal/core/filter/impl/UpdateUserFilterHandlerImpl.java
+++ b/src/main/java/com/epam/ta/reportportal/core/filter/impl/UpdateUserFilterHandlerImpl.java
@@ -19,7 +19,7 @@
 import static com.epam.ta.reportportal.commons.Preconditions.NOT_EMPTY_COLLECTION;
 import static com.epam.ta.reportportal.commons.validation.BusinessRule.expect;
 import static com.epam.ta.reportportal.ws.converter.converters.UserFilterConverter.TO_ACTIVITY_RESOURCE;
-import static com.epam.ta.reportportal.ws.model.ErrorType.USER_FILTER_NOT_FOUND;
+import static com.epam.ta.reportportal.ws.reporting.ErrorType.USER_FILTER_NOT_FOUND;
 
 import com.epam.ta.reportportal.commons.ReportPortalUser;
 import com.epam.ta.reportportal.commons.querygen.Condition;
@@ -42,8 +42,8 @@
 import com.epam.ta.reportportal.model.filter.UpdateUserFilterRQ;
 import com.epam.ta.reportportal.util.ProjectExtractor;
 import com.epam.ta.reportportal.ws.converter.builders.UserFilterBuilder;
-import com.epam.ta.reportportal.ws.model.ErrorType;
-import com.epam.ta.reportportal.ws.model.OperationCompletionRS;
+import com.epam.ta.reportportal.ws.reporting.ErrorType;
+import com.epam.ta.reportportal.ws.reporting.OperationCompletionRS;
 import com.epam.ta.reportportal.ws.model.ValidationConstraints;
 import java.util.List;
 import java.util.Optional;
diff --git a/src/main/java/com/epam/ta/reportportal/core/filter/predefined/PredefinedFilterBuilder.java b/src/main/java/com/epam/ta/reportportal/core/filter/predefined/PredefinedFilterBuilder.java
index 60404bfa17..c97103ef88 100644
--- a/src/main/java/com/epam/ta/reportportal/core/filter/predefined/PredefinedFilterBuilder.java
+++ b/src/main/java/com/epam/ta/reportportal/core/filter/predefined/PredefinedFilterBuilder.java
@@ -18,7 +18,7 @@
 
 import com.epam.ta.reportportal.commons.querygen.Queryable;
 import com.epam.ta.reportportal.exception.ReportPortalException;
-import com.epam.ta.reportportal.ws.model.ErrorType;
+import com.epam.ta.reportportal.ws.reporting.ErrorType;
 
 /**
  * @author Andrei Varabyeu
diff --git a/src/main/java/com/epam/ta/reportportal/core/hierarchy/AbstractFinishHierarchyHandler.java b/src/main/java/com/epam/ta/reportportal/core/hierarchy/AbstractFinishHierarchyHandler.java
index 716405f69f..af0a352df8 100644
--- a/src/main/java/com/epam/ta/reportportal/core/hierarchy/AbstractFinishHierarchyHandler.java
+++ b/src/main/java/com/epam/ta/reportportal/core/hierarchy/AbstractFinishHierarchyHandler.java
@@ -25,7 +25,7 @@
 import static com.epam.ta.reportportal.entity.enums.StatusEnum.SKIPPED;
 import static com.epam.ta.reportportal.entity.enums.TestItemIssueGroup.TO_INVESTIGATE;
 import static com.epam.ta.reportportal.entity.enums.TestItemTypeEnum.SUITE;
-import static com.epam.ta.reportportal.ws.model.ErrorType.INCORRECT_REQUEST;
+import static com.epam.ta.reportportal.ws.reporting.ErrorType.INCORRECT_REQUEST;
 import static java.util.Optional.ofNullable;
 
 import com.epam.ta.reportportal.commons.ReportPortalUser;
diff --git a/src/main/java/com/epam/ta/reportportal/core/imprt/ImportLaunchHandler.java b/src/main/java/com/epam/ta/reportportal/core/imprt/ImportLaunchHandler.java
index 613fdacc7d..c102362e2a 100644
--- a/src/main/java/com/epam/ta/reportportal/core/imprt/ImportLaunchHandler.java
+++ b/src/main/java/com/epam/ta/reportportal/core/imprt/ImportLaunchHandler.java
@@ -18,7 +18,7 @@
 
 import com.epam.ta.reportportal.commons.ReportPortalUser;
 import com.epam.ta.reportportal.model.launch.LaunchImportRQ;
-import com.epam.ta.reportportal.ws.model.OperationCompletionRS;
+import com.epam.ta.reportportal.ws.reporting.OperationCompletionRS;
 import org.springframework.web.multipart.MultipartFile;
 
 /**
diff --git a/src/main/java/com/epam/ta/reportportal/core/imprt/ImportLaunchHandlerImpl.java b/src/main/java/com/epam/ta/reportportal/core/imprt/ImportLaunchHandlerImpl.java
index e9928b2295..0476ea0170 100644
--- a/src/main/java/com/epam/ta/reportportal/core/imprt/ImportLaunchHandlerImpl.java
+++ b/src/main/java/com/epam/ta/reportportal/core/imprt/ImportLaunchHandlerImpl.java
@@ -20,7 +20,7 @@
 import static com.epam.ta.reportportal.commons.validation.BusinessRule.expect;
 import static com.epam.ta.reportportal.core.imprt.FileExtensionConstant.XML_EXTENSION;
 import static com.epam.ta.reportportal.core.imprt.FileExtensionConstant.ZIP_EXTENSION;
-import static com.epam.ta.reportportal.ws.model.ErrorType.INCORRECT_REQUEST;
+import static com.epam.ta.reportportal.ws.reporting.ErrorType.INCORRECT_REQUEST;
 import static org.apache.commons.io.FileUtils.ONE_MB;
 
 import com.epam.ta.reportportal.commons.ReportPortalUser;
@@ -34,8 +34,8 @@
 import com.epam.ta.reportportal.model.LaunchImportCompletionRS;
 import com.epam.ta.reportportal.model.LaunchImportData;
 import com.epam.ta.reportportal.model.launch.LaunchImportRQ;
-import com.epam.ta.reportportal.ws.model.ErrorType;
-import com.epam.ta.reportportal.ws.model.OperationCompletionRS;
+import com.epam.ta.reportportal.ws.reporting.ErrorType;
+import com.epam.ta.reportportal.ws.reporting.OperationCompletionRS;
 import java.io.File;
 import java.io.IOException;
 import java.util.Optional;
@@ -90,7 +90,7 @@ private LaunchImportRQ getBackCompatibleRq(LaunchImportRQ rq) {
   }
 
   private void validate(MultipartFile file) {
-    expect(file.getOriginalFilename(), notNull()).verify(ErrorType.INCORRECT_REQUEST,
+    expect(file.getOriginalFilename(), notNull()).verify(INCORRECT_REQUEST,
         "File name should be not empty."
     );
 
diff --git a/src/main/java/com/epam/ta/reportportal/core/imprt/impl/AbstractImportStrategy.java b/src/main/java/com/epam/ta/reportportal/core/imprt/impl/AbstractImportStrategy.java
index 96d76490c0..61cbffc9fb 100644
--- a/src/main/java/com/epam/ta/reportportal/core/imprt/impl/AbstractImportStrategy.java
+++ b/src/main/java/com/epam/ta/reportportal/core/imprt/impl/AbstractImportStrategy.java
@@ -26,11 +26,11 @@
 import com.epam.ta.reportportal.entity.launch.Launch;
 import com.epam.ta.reportportal.exception.ReportPortalException;
 import com.epam.ta.reportportal.model.launch.LaunchImportRQ;
-import com.epam.ta.reportportal.ws.model.ErrorType;
-import com.epam.ta.reportportal.ws.model.FinishExecutionRQ;
-import com.epam.ta.reportportal.ws.model.attribute.ItemAttributesRQ;
-import com.epam.ta.reportportal.ws.model.launch.Mode;
-import com.epam.ta.reportportal.ws.model.launch.StartLaunchRQ;
+import com.epam.ta.reportportal.ws.reporting.ErrorType;
+import com.epam.ta.reportportal.ws.reporting.FinishExecutionRQ;
+import com.epam.ta.reportportal.ws.reporting.ItemAttributesRQ;
+import com.epam.ta.reportportal.ws.reporting.Mode;
+import com.epam.ta.reportportal.ws.reporting.StartLaunchRQ;
 import com.google.common.collect.Sets;
 import java.time.LocalDateTime;
 import java.util.Arrays;
diff --git a/src/main/java/com/epam/ta/reportportal/core/imprt/impl/XmlImportStrategy.java b/src/main/java/com/epam/ta/reportportal/core/imprt/impl/XmlImportStrategy.java
index 74370908b8..d6165f31c1 100644
--- a/src/main/java/com/epam/ta/reportportal/core/imprt/impl/XmlImportStrategy.java
+++ b/src/main/java/com/epam/ta/reportportal/core/imprt/impl/XmlImportStrategy.java
@@ -23,7 +23,7 @@
 import com.epam.ta.reportportal.core.imprt.impl.junit.XunitParseJob;
 import com.epam.ta.reportportal.exception.ReportPortalException;
 import com.epam.ta.reportportal.model.launch.LaunchImportRQ;
-import com.epam.ta.reportportal.ws.model.ErrorType;
+import com.epam.ta.reportportal.ws.reporting.ErrorType;
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.InputStream;
diff --git a/src/main/java/com/epam/ta/reportportal/core/imprt/impl/ZipImportStrategy.java b/src/main/java/com/epam/ta/reportportal/core/imprt/impl/ZipImportStrategy.java
index 60d98d7635..2301355ad5 100644
--- a/src/main/java/com/epam/ta/reportportal/core/imprt/impl/ZipImportStrategy.java
+++ b/src/main/java/com/epam/ta/reportportal/core/imprt/impl/ZipImportStrategy.java
@@ -24,7 +24,7 @@
 import com.epam.ta.reportportal.core.imprt.impl.junit.XunitParseJob;
 import com.epam.ta.reportportal.exception.ReportPortalException;
 import com.epam.ta.reportportal.model.launch.LaunchImportRQ;
-import com.epam.ta.reportportal.ws.model.ErrorType;
+import com.epam.ta.reportportal.ws.reporting.ErrorType;
 import java.io.File;
 import java.io.IOException;
 import java.io.InputStream;
diff --git a/src/main/java/com/epam/ta/reportportal/core/imprt/impl/junit/XunitImportHandler.java b/src/main/java/com/epam/ta/reportportal/core/imprt/impl/junit/XunitImportHandler.java
index db64665f31..2054053f5b 100644
--- a/src/main/java/com/epam/ta/reportportal/core/imprt/impl/junit/XunitImportHandler.java
+++ b/src/main/java/com/epam/ta/reportportal/core/imprt/impl/junit/XunitImportHandler.java
@@ -27,10 +27,10 @@
 import com.epam.ta.reportportal.entity.enums.LogLevel;
 import com.epam.ta.reportportal.entity.enums.StatusEnum;
 import com.epam.ta.reportportal.entity.enums.TestItemTypeEnum;
-import com.epam.ta.reportportal.ws.model.FinishTestItemRQ;
-import com.epam.ta.reportportal.ws.model.StartTestItemRQ;
-import com.epam.ta.reportportal.ws.model.issue.Issue;
-import com.epam.ta.reportportal.ws.model.log.SaveLogRQ;
+import com.epam.ta.reportportal.ws.reporting.FinishTestItemRQ;
+import com.epam.ta.reportportal.ws.reporting.Issue;
+import com.epam.ta.reportportal.ws.reporting.SaveLogRQ;
+import com.epam.ta.reportportal.ws.reporting.StartTestItemRQ;
 import com.google.common.base.Strings;
 import java.time.Instant;
 import java.time.LocalDateTime;
diff --git a/src/main/java/com/epam/ta/reportportal/core/imprt/impl/junit/XunitParseJob.java b/src/main/java/com/epam/ta/reportportal/core/imprt/impl/junit/XunitParseJob.java
index 60880a5c9b..56d2158b6e 100644
--- a/src/main/java/com/epam/ta/reportportal/core/imprt/impl/junit/XunitParseJob.java
+++ b/src/main/java/com/epam/ta/reportportal/core/imprt/impl/junit/XunitParseJob.java
@@ -18,7 +18,7 @@
 import com.epam.ta.reportportal.commons.ReportPortalUser;
 import com.epam.ta.reportportal.core.imprt.impl.ParseResults;
 import com.epam.ta.reportportal.exception.ReportPortalException;
-import com.epam.ta.reportportal.ws.model.ErrorType;
+import com.epam.ta.reportportal.ws.reporting.ErrorType;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.config.ConfigurableBeanFactory;
 import org.springframework.context.annotation.Scope;
diff --git a/src/main/java/com/epam/ta/reportportal/core/integration/CreateIntegrationHandler.java b/src/main/java/com/epam/ta/reportportal/core/integration/CreateIntegrationHandler.java
index d6859e663c..ee52fbc877 100644
--- a/src/main/java/com/epam/ta/reportportal/core/integration/CreateIntegrationHandler.java
+++ b/src/main/java/com/epam/ta/reportportal/core/integration/CreateIntegrationHandler.java
@@ -20,7 +20,7 @@
 import com.epam.ta.reportportal.entity.integration.Integration;
 import com.epam.ta.reportportal.model.EntryCreatedRS;
 import com.epam.ta.reportportal.model.integration.IntegrationRQ;
-import com.epam.ta.reportportal.ws.model.OperationCompletionRS;
+import com.epam.ta.reportportal.ws.reporting.OperationCompletionRS;
 
 /**
  * @author <a href="mailto:ivan_budayeu@epam.com">Ivan Budayeu</a>
diff --git a/src/main/java/com/epam/ta/reportportal/core/integration/DeleteIntegrationHandler.java b/src/main/java/com/epam/ta/reportportal/core/integration/DeleteIntegrationHandler.java
index 924b57b745..87a2f88a51 100644
--- a/src/main/java/com/epam/ta/reportportal/core/integration/DeleteIntegrationHandler.java
+++ b/src/main/java/com/epam/ta/reportportal/core/integration/DeleteIntegrationHandler.java
@@ -17,7 +17,7 @@
 package com.epam.ta.reportportal.core.integration;
 
 import com.epam.ta.reportportal.commons.ReportPortalUser;
-import com.epam.ta.reportportal.ws.model.OperationCompletionRS;
+import com.epam.ta.reportportal.ws.reporting.OperationCompletionRS;
 
 /**
  * @author <a href="mailto:andrei_varabyeu@epam.com">Andrei Varabyeu</a>
diff --git a/src/main/java/com/epam/ta/reportportal/core/integration/impl/CreateIntegrationHandlerImpl.java b/src/main/java/com/epam/ta/reportportal/core/integration/impl/CreateIntegrationHandlerImpl.java
index e5075fac21..ec13644052 100644
--- a/src/main/java/com/epam/ta/reportportal/core/integration/impl/CreateIntegrationHandlerImpl.java
+++ b/src/main/java/com/epam/ta/reportportal/core/integration/impl/CreateIntegrationHandlerImpl.java
@@ -36,8 +36,8 @@
 import com.epam.ta.reportportal.model.EntryCreatedRS;
 import com.epam.ta.reportportal.model.activity.IntegrationActivityResource;
 import com.epam.ta.reportportal.model.integration.IntegrationRQ;
-import com.epam.ta.reportportal.ws.model.ErrorType;
-import com.epam.ta.reportportal.ws.model.OperationCompletionRS;
+import com.epam.ta.reportportal.ws.reporting.ErrorType;
+import com.epam.ta.reportportal.ws.reporting.OperationCompletionRS;
 import java.util.Map;
 import org.apache.commons.lang3.BooleanUtils;
 import org.apache.commons.lang3.StringUtils;
diff --git a/src/main/java/com/epam/ta/reportportal/core/integration/impl/DeleteIntegrationHandlerImpl.java b/src/main/java/com/epam/ta/reportportal/core/integration/impl/DeleteIntegrationHandlerImpl.java
index 4137032e78..19c4b400a1 100644
--- a/src/main/java/com/epam/ta/reportportal/core/integration/impl/DeleteIntegrationHandlerImpl.java
+++ b/src/main/java/com/epam/ta/reportportal/core/integration/impl/DeleteIntegrationHandlerImpl.java
@@ -27,8 +27,8 @@
 import com.epam.ta.reportportal.entity.integration.IntegrationType;
 import com.epam.ta.reportportal.entity.project.Project;
 import com.epam.ta.reportportal.exception.ReportPortalException;
-import com.epam.ta.reportportal.ws.model.ErrorType;
-import com.epam.ta.reportportal.ws.model.OperationCompletionRS;
+import com.epam.ta.reportportal.ws.reporting.ErrorType;
+import com.epam.ta.reportportal.ws.reporting.OperationCompletionRS;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.ApplicationEventPublisher;
 import org.springframework.stereotype.Service;
@@ -37,8 +37,8 @@
 import java.util.List;
 
 import static com.epam.ta.reportportal.ws.converter.converters.IntegrationConverter.TO_ACTIVITY_RESOURCE;
-import static com.epam.ta.reportportal.ws.model.ErrorType.INTEGRATION_NOT_FOUND;
-import static com.epam.ta.reportportal.ws.model.ErrorType.PROJECT_NOT_FOUND;
+import static com.epam.ta.reportportal.ws.reporting.ErrorType.INTEGRATION_NOT_FOUND;
+import static com.epam.ta.reportportal.ws.reporting.ErrorType.PROJECT_NOT_FOUND;
 
 /**
  * @author <a href="mailto:andrei_varabyeu@epam.com">Andrei Varabyeu</a>
diff --git a/src/main/java/com/epam/ta/reportportal/core/integration/impl/ExecuteIntegrationHandlerImpl.java b/src/main/java/com/epam/ta/reportportal/core/integration/impl/ExecuteIntegrationHandlerImpl.java
index 315d1692e6..e3fc47a608 100644
--- a/src/main/java/com/epam/ta/reportportal/core/integration/impl/ExecuteIntegrationHandlerImpl.java
+++ b/src/main/java/com/epam/ta/reportportal/core/integration/impl/ExecuteIntegrationHandlerImpl.java
@@ -17,9 +17,9 @@
 package com.epam.ta.reportportal.core.integration.impl;
 
 import static com.epam.ta.reportportal.commons.validation.Suppliers.formattedSupplier;
-import static com.epam.ta.reportportal.ws.model.ErrorType.ACCESS_DENIED;
-import static com.epam.ta.reportportal.ws.model.ErrorType.BAD_REQUEST_ERROR;
-import static com.epam.ta.reportportal.ws.model.ErrorType.INTEGRATION_NOT_FOUND;
+import static com.epam.ta.reportportal.ws.reporting.ErrorType.ACCESS_DENIED;
+import static com.epam.ta.reportportal.ws.reporting.ErrorType.BAD_REQUEST_ERROR;
+import static com.epam.ta.reportportal.ws.reporting.ErrorType.INTEGRATION_NOT_FOUND;
 import static java.util.Optional.ofNullable;
 
 import com.epam.reportportal.extension.ReportPortalExtensionPoint;
@@ -30,7 +30,7 @@
 import com.epam.ta.reportportal.dao.IntegrationRepository;
 import com.epam.ta.reportportal.entity.integration.Integration;
 import com.epam.ta.reportportal.exception.ReportPortalException;
-import com.epam.ta.reportportal.ws.model.OperationCompletionRS;
+import com.epam.ta.reportportal.ws.reporting.OperationCompletionRS;
 import java.util.Map;
 import java.util.function.Supplier;
 import org.springframework.scheduling.annotation.Async;
diff --git a/src/main/java/com/epam/ta/reportportal/core/integration/impl/GetIntegrationHandlerImpl.java b/src/main/java/com/epam/ta/reportportal/core/integration/impl/GetIntegrationHandlerImpl.java
index 887f3a205c..f3c78358ed 100644
--- a/src/main/java/com/epam/ta/reportportal/core/integration/impl/GetIntegrationHandlerImpl.java
+++ b/src/main/java/com/epam/ta/reportportal/core/integration/impl/GetIntegrationHandlerImpl.java
@@ -34,7 +34,7 @@
 import com.epam.ta.reportportal.entity.project.Project;
 import com.epam.ta.reportportal.exception.ReportPortalException;
 import com.epam.ta.reportportal.model.integration.IntegrationResource;
-import com.epam.ta.reportportal.ws.model.ErrorType;
+import com.epam.ta.reportportal.ws.reporting.ErrorType;
 import java.util.List;
 import java.util.Map;
 import java.util.Optional;
diff --git a/src/main/java/com/epam/ta/reportportal/core/integration/plugin/DeletePluginHandler.java b/src/main/java/com/epam/ta/reportportal/core/integration/plugin/DeletePluginHandler.java
index f0834476dc..2dcb7cb6c8 100644
--- a/src/main/java/com/epam/ta/reportportal/core/integration/plugin/DeletePluginHandler.java
+++ b/src/main/java/com/epam/ta/reportportal/core/integration/plugin/DeletePluginHandler.java
@@ -17,7 +17,7 @@
 package com.epam.ta.reportportal.core.integration.plugin;
 
 import com.epam.ta.reportportal.commons.ReportPortalUser;
-import com.epam.ta.reportportal.ws.model.OperationCompletionRS;
+import com.epam.ta.reportportal.ws.reporting.OperationCompletionRS;
 
 /**
  * @author <a href="mailto:ivan_budayeu@epam.com">Ivan Budayeu</a>
diff --git a/src/main/java/com/epam/ta/reportportal/core/integration/plugin/UpdatePluginHandler.java b/src/main/java/com/epam/ta/reportportal/core/integration/plugin/UpdatePluginHandler.java
index b4b237c4de..45e64f01da 100644
--- a/src/main/java/com/epam/ta/reportportal/core/integration/plugin/UpdatePluginHandler.java
+++ b/src/main/java/com/epam/ta/reportportal/core/integration/plugin/UpdatePluginHandler.java
@@ -18,7 +18,7 @@
 
 import com.epam.ta.reportportal.commons.ReportPortalUser;
 import com.epam.ta.reportportal.model.integration.UpdatePluginStateRQ;
-import com.epam.ta.reportportal.ws.model.OperationCompletionRS;
+import com.epam.ta.reportportal.ws.reporting.OperationCompletionRS;
 
 /**
  * @author <a href="mailto:ivan_budayeu@epam.com">Ivan Budayeu</a>
diff --git a/src/main/java/com/epam/ta/reportportal/core/integration/plugin/binary/PluginFilesProvider.java b/src/main/java/com/epam/ta/reportportal/core/integration/plugin/binary/PluginFilesProvider.java
index 20439cb983..09334d8595 100644
--- a/src/main/java/com/epam/ta/reportportal/core/integration/plugin/binary/PluginFilesProvider.java
+++ b/src/main/java/com/epam/ta/reportportal/core/integration/plugin/binary/PluginFilesProvider.java
@@ -20,7 +20,7 @@
 import com.epam.ta.reportportal.entity.attachment.BinaryData;
 import com.epam.ta.reportportal.entity.integration.IntegrationType;
 import com.epam.ta.reportportal.exception.ReportPortalException;
-import com.epam.ta.reportportal.ws.model.ErrorType;
+import com.epam.ta.reportportal.ws.reporting.ErrorType;
 import java.io.File;
 import java.io.IOException;
 import java.io.InputStream;
diff --git a/src/main/java/com/epam/ta/reportportal/core/integration/plugin/impl/CreatePluginHandlerImpl.java b/src/main/java/com/epam/ta/reportportal/core/integration/plugin/impl/CreatePluginHandlerImpl.java
index f1530ae489..bc40d5e10d 100644
--- a/src/main/java/com/epam/ta/reportportal/core/integration/plugin/impl/CreatePluginHandlerImpl.java
+++ b/src/main/java/com/epam/ta/reportportal/core/integration/plugin/impl/CreatePluginHandlerImpl.java
@@ -25,7 +25,7 @@
 import com.epam.ta.reportportal.exception.ReportPortalException;
 import com.epam.ta.reportportal.model.EntryCreatedRS;
 import com.epam.ta.reportportal.model.activity.PluginActivityResource;
-import com.epam.ta.reportportal.ws.model.ErrorType;
+import com.epam.ta.reportportal.ws.reporting.ErrorType;
 import java.io.IOException;
 import java.io.InputStream;
 import org.apache.commons.lang3.StringUtils;
diff --git a/src/main/java/com/epam/ta/reportportal/core/integration/plugin/impl/DeletePluginHandlerImpl.java b/src/main/java/com/epam/ta/reportportal/core/integration/plugin/impl/DeletePluginHandlerImpl.java
index 174ee91307..cc0a1b595f 100644
--- a/src/main/java/com/epam/ta/reportportal/core/integration/plugin/impl/DeletePluginHandlerImpl.java
+++ b/src/main/java/com/epam/ta/reportportal/core/integration/plugin/impl/DeletePluginHandlerImpl.java
@@ -28,8 +28,8 @@
 import com.epam.ta.reportportal.entity.integration.IntegrationType;
 import com.epam.ta.reportportal.exception.ReportPortalException;
 import com.epam.ta.reportportal.model.activity.PluginActivityResource;
-import com.epam.ta.reportportal.ws.model.ErrorType;
-import com.epam.ta.reportportal.ws.model.OperationCompletionRS;
+import com.epam.ta.reportportal.ws.reporting.ErrorType;
+import com.epam.ta.reportportal.ws.reporting.OperationCompletionRS;
 import java.util.Optional;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.ApplicationEventPublisher;
diff --git a/src/main/java/com/epam/ta/reportportal/core/integration/plugin/impl/PluginLoaderImpl.java b/src/main/java/com/epam/ta/reportportal/core/integration/plugin/impl/PluginLoaderImpl.java
index f165d7241e..a4837d2261 100644
--- a/src/main/java/com/epam/ta/reportportal/core/integration/plugin/impl/PluginLoaderImpl.java
+++ b/src/main/java/com/epam/ta/reportportal/core/integration/plugin/impl/PluginLoaderImpl.java
@@ -31,7 +31,7 @@
 import com.epam.ta.reportportal.filesystem.DataStore;
 import com.epam.ta.reportportal.util.FeatureFlagHandler;
 import com.epam.ta.reportportal.ws.converter.builders.IntegrationTypeBuilder;
-import com.epam.ta.reportportal.ws.model.ErrorType;
+import com.epam.ta.reportportal.ws.reporting.ErrorType;
 import java.io.File;
 import java.io.IOException;
 import java.io.InputStream;
diff --git a/src/main/java/com/epam/ta/reportportal/core/integration/plugin/impl/UpdatePluginHandlerImpl.java b/src/main/java/com/epam/ta/reportportal/core/integration/plugin/impl/UpdatePluginHandlerImpl.java
index 620bf87c98..3ccaace013 100644
--- a/src/main/java/com/epam/ta/reportportal/core/integration/plugin/impl/UpdatePluginHandlerImpl.java
+++ b/src/main/java/com/epam/ta/reportportal/core/integration/plugin/impl/UpdatePluginHandlerImpl.java
@@ -28,8 +28,8 @@
 import com.epam.ta.reportportal.exception.ReportPortalException;
 import com.epam.ta.reportportal.model.activity.PluginActivityResource;
 import com.epam.ta.reportportal.model.integration.UpdatePluginStateRQ;
-import com.epam.ta.reportportal.ws.model.ErrorType;
-import com.epam.ta.reportportal.ws.model.OperationCompletionRS;
+import com.epam.ta.reportportal.ws.reporting.ErrorType;
+import com.epam.ta.reportportal.ws.reporting.OperationCompletionRS;
 import org.apache.commons.lang3.BooleanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.ApplicationEventPublisher;
diff --git a/src/main/java/com/epam/ta/reportportal/core/integration/util/BasicIntegrationServiceImpl.java b/src/main/java/com/epam/ta/reportportal/core/integration/util/BasicIntegrationServiceImpl.java
index b592c27f0b..c332cbf785 100644
--- a/src/main/java/com/epam/ta/reportportal/core/integration/util/BasicIntegrationServiceImpl.java
+++ b/src/main/java/com/epam/ta/reportportal/core/integration/util/BasicIntegrationServiceImpl.java
@@ -16,7 +16,7 @@
 
 package com.epam.ta.reportportal.core.integration.util;
 
-import static com.epam.ta.reportportal.ws.model.ErrorType.BAD_REQUEST_ERROR;
+import static com.epam.ta.reportportal.ws.reporting.ErrorType.BAD_REQUEST_ERROR;
 import static java.util.Optional.ofNullable;
 
 import com.epam.reportportal.extension.CommonPluginCommand;
diff --git a/src/main/java/com/epam/ta/reportportal/core/integration/util/BtsIntegrationService.java b/src/main/java/com/epam/ta/reportportal/core/integration/util/BtsIntegrationService.java
index db252edcc9..9539903560 100644
--- a/src/main/java/com/epam/ta/reportportal/core/integration/util/BtsIntegrationService.java
+++ b/src/main/java/com/epam/ta/reportportal/core/integration/util/BtsIntegrationService.java
@@ -16,7 +16,7 @@
 package com.epam.ta.reportportal.core.integration.util;
 
 import static com.epam.ta.reportportal.commons.validation.BusinessRule.expect;
-import static com.epam.ta.reportportal.ws.model.ErrorType.UNABLE_INTERACT_WITH_INTEGRATION;
+import static com.epam.ta.reportportal.ws.reporting.ErrorType.UNABLE_INTERACT_WITH_INTEGRATION;
 
 import com.epam.reportportal.extension.bugtracking.BtsExtension;
 import com.epam.ta.reportportal.commons.validation.Suppliers;
@@ -26,7 +26,7 @@
 import com.epam.ta.reportportal.entity.enums.AuthType;
 import com.epam.ta.reportportal.entity.integration.Integration;
 import com.epam.ta.reportportal.exception.ReportPortalException;
-import com.epam.ta.reportportal.ws.model.ErrorType;
+import com.epam.ta.reportportal.ws.reporting.ErrorType;
 import com.google.common.collect.Maps;
 import java.util.Map;
 import java.util.Optional;
diff --git a/src/main/java/com/epam/ta/reportportal/core/integration/util/EmailServerIntegrationService.java b/src/main/java/com/epam/ta/reportportal/core/integration/util/EmailServerIntegrationService.java
index 595012e21e..6fce8a6926 100644
--- a/src/main/java/com/epam/ta/reportportal/core/integration/util/EmailServerIntegrationService.java
+++ b/src/main/java/com/epam/ta/reportportal/core/integration/util/EmailServerIntegrationService.java
@@ -18,8 +18,8 @@
 
 import static com.epam.ta.reportportal.commons.validation.BusinessRule.fail;
 import static com.epam.ta.reportportal.commons.validation.Suppliers.formattedSupplier;
-import static com.epam.ta.reportportal.ws.model.ErrorType.EMAIL_CONFIGURATION_IS_INCORRECT;
-import static com.epam.ta.reportportal.ws.model.ErrorType.FORBIDDEN_OPERATION;
+import static com.epam.ta.reportportal.ws.reporting.ErrorType.EMAIL_CONFIGURATION_IS_INCORRECT;
+import static com.epam.ta.reportportal.ws.reporting.ErrorType.FORBIDDEN_OPERATION;
 import static java.util.Optional.ofNullable;
 
 import com.epam.ta.reportportal.commons.validation.BusinessRule;
@@ -31,7 +31,7 @@
 import com.epam.ta.reportportal.exception.ReportPortalException;
 import com.epam.ta.reportportal.util.email.EmailService;
 import com.epam.ta.reportportal.util.email.MailServiceFactory;
-import com.epam.ta.reportportal.ws.model.ErrorType;
+import com.epam.ta.reportportal.ws.reporting.ErrorType;
 import com.google.common.collect.Maps;
 import com.mchange.lang.IntegerUtils;
 import java.util.Map;
diff --git a/src/main/java/com/epam/ta/reportportal/core/integration/util/SauceLabsIntegrationService.java b/src/main/java/com/epam/ta/reportportal/core/integration/util/SauceLabsIntegrationService.java
index 5e48b9d2b5..05f7cd2f4b 100644
--- a/src/main/java/com/epam/ta/reportportal/core/integration/util/SauceLabsIntegrationService.java
+++ b/src/main/java/com/epam/ta/reportportal/core/integration/util/SauceLabsIntegrationService.java
@@ -19,7 +19,7 @@
 import static com.epam.ta.reportportal.commons.validation.BusinessRule.expect;
 import static com.epam.ta.reportportal.core.integration.util.property.SauceLabsProperties.ACCESS_TOKEN;
 import static com.epam.ta.reportportal.core.integration.util.property.SauceLabsProperties.USERNAME;
-import static com.epam.ta.reportportal.ws.model.ErrorType.BAD_REQUEST_ERROR;
+import static com.epam.ta.reportportal.ws.reporting.ErrorType.BAD_REQUEST_ERROR;
 
 import com.epam.ta.reportportal.core.plugin.PluginBox;
 import com.epam.ta.reportportal.dao.IntegrationRepository;
diff --git a/src/main/java/com/epam/ta/reportportal/core/integration/util/validator/IntegrationValidator.java b/src/main/java/com/epam/ta/reportportal/core/integration/util/validator/IntegrationValidator.java
index 9ad4eea6b3..4b4fa0ca0e 100644
--- a/src/main/java/com/epam/ta/reportportal/core/integration/util/validator/IntegrationValidator.java
+++ b/src/main/java/com/epam/ta/reportportal/core/integration/util/validator/IntegrationValidator.java
@@ -23,7 +23,7 @@
 import com.epam.ta.reportportal.entity.integration.Integration;
 import com.epam.ta.reportportal.entity.integration.IntegrationType;
 import com.epam.ta.reportportal.entity.project.Project;
-import com.epam.ta.reportportal.ws.model.ErrorType;
+import com.epam.ta.reportportal.ws.reporting.ErrorType;
 import java.util.Objects;
 import org.apache.commons.lang3.StringUtils;
 
diff --git a/src/main/java/com/epam/ta/reportportal/core/item/DeleteTestItemHandler.java b/src/main/java/com/epam/ta/reportportal/core/item/DeleteTestItemHandler.java
index af63784c47..4c5ef18c1d 100644
--- a/src/main/java/com/epam/ta/reportportal/core/item/DeleteTestItemHandler.java
+++ b/src/main/java/com/epam/ta/reportportal/core/item/DeleteTestItemHandler.java
@@ -17,7 +17,7 @@
 package com.epam.ta.reportportal.core.item;
 
 import com.epam.ta.reportportal.commons.ReportPortalUser;
-import com.epam.ta.reportportal.ws.model.OperationCompletionRS;
+import com.epam.ta.reportportal.ws.reporting.OperationCompletionRS;
 import java.util.Collection;
 import java.util.List;
 
diff --git a/src/main/java/com/epam/ta/reportportal/core/item/ExternalTicketHandler.java b/src/main/java/com/epam/ta/reportportal/core/item/ExternalTicketHandler.java
index 1e55836014..50366a7aea 100644
--- a/src/main/java/com/epam/ta/reportportal/core/item/ExternalTicketHandler.java
+++ b/src/main/java/com/epam/ta/reportportal/core/item/ExternalTicketHandler.java
@@ -19,7 +19,7 @@
 import com.epam.ta.reportportal.entity.item.TestItem;
 import com.epam.ta.reportportal.entity.item.issue.IssueEntity;
 import com.epam.ta.reportportal.model.item.UnlinkExternalIssueRQ;
-import com.epam.ta.reportportal.ws.model.issue.Issue;
+import com.epam.ta.reportportal.ws.reporting.Issue;
 import java.util.List;
 import java.util.Set;
 
diff --git a/src/main/java/com/epam/ta/reportportal/core/item/FinishTestItemHandler.java b/src/main/java/com/epam/ta/reportportal/core/item/FinishTestItemHandler.java
index 52a1671278..5d4f84e113 100644
--- a/src/main/java/com/epam/ta/reportportal/core/item/FinishTestItemHandler.java
+++ b/src/main/java/com/epam/ta/reportportal/core/item/FinishTestItemHandler.java
@@ -17,8 +17,8 @@
 package com.epam.ta.reportportal.core.item;
 
 import com.epam.ta.reportportal.commons.ReportPortalUser;
-import com.epam.ta.reportportal.ws.model.FinishTestItemRQ;
-import com.epam.ta.reportportal.ws.model.OperationCompletionRS;
+import com.epam.ta.reportportal.ws.reporting.FinishTestItemRQ;
+import com.epam.ta.reportportal.ws.reporting.OperationCompletionRS;
 
 /**
  * Handler for finish test item operation
diff --git a/src/main/java/com/epam/ta/reportportal/core/item/GetTestItemHandler.java b/src/main/java/com/epam/ta/reportportal/core/item/GetTestItemHandler.java
index 5a3b8d757c..38dbf79c91 100644
--- a/src/main/java/com/epam/ta/reportportal/core/item/GetTestItemHandler.java
+++ b/src/main/java/com/epam/ta/reportportal/core/item/GetTestItemHandler.java
@@ -24,8 +24,8 @@
 import com.epam.ta.reportportal.entity.filter.UserFilter;
 import com.epam.ta.reportportal.entity.item.TestItem;
 import com.epam.ta.reportportal.entity.launch.Launch;
-import com.epam.ta.reportportal.model.TestItemResource;
-import com.epam.ta.reportportal.ws.model.statistics.StatisticsResource;
+import com.epam.ta.reportportal.ws.reporting.StatisticsResource;
+import com.epam.ta.reportportal.ws.reporting.TestItemResource;
 import java.util.List;
 import java.util.Map;
 import javax.annotation.Nullable;
diff --git a/src/main/java/com/epam/ta/reportportal/core/item/StartTestItemHandler.java b/src/main/java/com/epam/ta/reportportal/core/item/StartTestItemHandler.java
index af72cf97a3..7d86d4f0fb 100644
--- a/src/main/java/com/epam/ta/reportportal/core/item/StartTestItemHandler.java
+++ b/src/main/java/com/epam/ta/reportportal/core/item/StartTestItemHandler.java
@@ -17,8 +17,8 @@
 package com.epam.ta.reportportal.core.item;
 
 import com.epam.ta.reportportal.commons.ReportPortalUser;
-import com.epam.ta.reportportal.ws.model.StartTestItemRQ;
-import com.epam.ta.reportportal.ws.model.item.ItemCreatedRS;
+import com.epam.ta.reportportal.ws.reporting.ItemCreatedRS;
+import com.epam.ta.reportportal.ws.reporting.StartTestItemRQ;
 
 /**
  * Handler for start launch operation
diff --git a/src/main/java/com/epam/ta/reportportal/core/item/TestItemService.java b/src/main/java/com/epam/ta/reportportal/core/item/TestItemService.java
index 3a35654534..87e8c2867b 100644
--- a/src/main/java/com/epam/ta/reportportal/core/item/TestItemService.java
+++ b/src/main/java/com/epam/ta/reportportal/core/item/TestItemService.java
@@ -23,7 +23,7 @@
 import com.epam.ta.reportportal.entity.item.TestItem;
 import com.epam.ta.reportportal.entity.launch.Launch;
 import com.epam.ta.reportportal.exception.ReportPortalException;
-import com.epam.ta.reportportal.ws.model.ErrorType;
+import com.epam.ta.reportportal.ws.reporting.ErrorType;
 import java.util.Optional;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
diff --git a/src/main/java/com/epam/ta/reportportal/core/item/UpdateTestItemHandler.java b/src/main/java/com/epam/ta/reportportal/core/item/UpdateTestItemHandler.java
index 492a27277c..7007168b3b 100644
--- a/src/main/java/com/epam/ta/reportportal/core/item/UpdateTestItemHandler.java
+++ b/src/main/java/com/epam/ta/reportportal/core/item/UpdateTestItemHandler.java
@@ -20,9 +20,9 @@
 import com.epam.ta.reportportal.model.issue.DefineIssueRQ;
 import com.epam.ta.reportportal.model.item.ExternalIssueRQ;
 import com.epam.ta.reportportal.model.item.UpdateTestItemRQ;
-import com.epam.ta.reportportal.ws.model.BulkInfoUpdateRQ;
-import com.epam.ta.reportportal.ws.model.OperationCompletionRS;
-import com.epam.ta.reportportal.ws.model.issue.Issue;
+import com.epam.ta.reportportal.ws.reporting.BulkInfoUpdateRQ;
+import com.epam.ta.reportportal.ws.reporting.Issue;
+import com.epam.ta.reportportal.ws.reporting.OperationCompletionRS;
 import java.util.List;
 
 /**
diff --git a/src/main/java/com/epam/ta/reportportal/core/item/identity/IdentityUtil.java b/src/main/java/com/epam/ta/reportportal/core/item/identity/IdentityUtil.java
index 225c02851d..23d7bc19ac 100644
--- a/src/main/java/com/epam/ta/reportportal/core/item/identity/IdentityUtil.java
+++ b/src/main/java/com/epam/ta/reportportal/core/item/identity/IdentityUtil.java
@@ -2,7 +2,7 @@
 
 import com.epam.ta.reportportal.entity.item.TestItem;
 import com.epam.ta.reportportal.exception.ReportPortalException;
-import com.epam.ta.reportportal.ws.model.ErrorType;
+import com.epam.ta.reportportal.ws.reporting.ErrorType;
 import java.util.List;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
diff --git a/src/main/java/com/epam/ta/reportportal/core/item/impl/DeleteTestItemHandlerImpl.java b/src/main/java/com/epam/ta/reportportal/core/item/impl/DeleteTestItemHandlerImpl.java
index 38b6dc7fb9..f90708fe38 100644
--- a/src/main/java/com/epam/ta/reportportal/core/item/impl/DeleteTestItemHandlerImpl.java
+++ b/src/main/java/com/epam/ta/reportportal/core/item/impl/DeleteTestItemHandlerImpl.java
@@ -20,10 +20,10 @@
 import static com.epam.ta.reportportal.commons.Predicates.not;
 import static com.epam.ta.reportportal.commons.validation.BusinessRule.expect;
 import static com.epam.ta.reportportal.commons.validation.Suppliers.formattedSupplier;
-import static com.epam.ta.reportportal.ws.model.ErrorType.ACCESS_DENIED;
-import static com.epam.ta.reportportal.ws.model.ErrorType.FORBIDDEN_OPERATION;
-import static com.epam.ta.reportportal.ws.model.ErrorType.LAUNCH_IS_NOT_FINISHED;
-import static com.epam.ta.reportportal.ws.model.ErrorType.TEST_ITEM_IS_NOT_FINISHED;
+import static com.epam.ta.reportportal.ws.reporting.ErrorType.ACCESS_DENIED;
+import static com.epam.ta.reportportal.ws.reporting.ErrorType.FORBIDDEN_OPERATION;
+import static com.epam.ta.reportportal.ws.reporting.ErrorType.LAUNCH_IS_NOT_FINISHED;
+import static com.epam.ta.reportportal.ws.reporting.ErrorType.TEST_ITEM_IS_NOT_FINISHED;
 import static java.util.Optional.ofNullable;
 import static java.util.stream.Collectors.toList;
 import static java.util.stream.Collectors.toSet;
@@ -47,8 +47,8 @@
 import com.epam.ta.reportportal.entity.project.ProjectRole;
 import com.epam.ta.reportportal.entity.user.UserRole;
 import com.epam.ta.reportportal.exception.ReportPortalException;
-import com.epam.ta.reportportal.ws.model.ErrorType;
-import com.epam.ta.reportportal.ws.model.OperationCompletionRS;
+import com.epam.ta.reportportal.ws.reporting.ErrorType;
+import com.epam.ta.reportportal.ws.reporting.OperationCompletionRS;
 import com.google.common.collect.Sets;
 import java.util.Collection;
 import java.util.List;
diff --git a/src/main/java/com/epam/ta/reportportal/core/item/impl/ExternalTicketHandlerImpl.java b/src/main/java/com/epam/ta/reportportal/core/item/impl/ExternalTicketHandlerImpl.java
index a15a24fbd7..1c2b9bb067 100644
--- a/src/main/java/com/epam/ta/reportportal/core/item/impl/ExternalTicketHandlerImpl.java
+++ b/src/main/java/com/epam/ta/reportportal/core/item/impl/ExternalTicketHandlerImpl.java
@@ -27,7 +27,8 @@
 import com.epam.ta.reportportal.entity.item.issue.IssueEntity;
 import com.epam.ta.reportportal.model.item.UnlinkExternalIssueRQ;
 import com.epam.ta.reportportal.ws.converter.converters.TicketConverter;
-import com.epam.ta.reportportal.ws.model.issue.Issue;
+import com.epam.ta.reportportal.ws.reporting.Issue;
+import com.epam.ta.reportportal.ws.reporting.Issue.ExternalSystemIssue;
 import java.time.Instant;
 import java.time.LocalDateTime;
 import java.time.ZoneOffset;
@@ -82,11 +83,10 @@ public void updateLinking(String submitter, IssueEntity issueEntity,
   /**
    * Finds tickets that are existed in db and removes them from request.
    *
-   * @param externalIssues {@link
-   *                       com.epam.ta.reportportal.ws.model.issue.Issue.ExternalSystemIssue}
+   * @param externalIssues {@link com.epam.ta.reportportal.ws.reporting.Issue.ExternalSystemIssue}
    * @return List of existed tickets in db.
    */
-  private List<Ticket> collectExistedTickets(Collection<Issue.ExternalSystemIssue> externalIssues) {
+  private List<Ticket> collectExistedTickets(Collection<ExternalSystemIssue> externalIssues) {
     if (CollectionUtils.isEmpty(externalIssues)) {
       return Collections.emptyList();
     }
@@ -101,8 +101,7 @@ private List<Ticket> collectExistedTickets(Collection<Issue.ExternalSystemIssue>
   /**
    * TODO document this
    *
-   * @param externalIssues {@link
-   *                       com.epam.ta.reportportal.ws.model.issue.Issue.ExternalSystemIssue}
+   * @param externalIssues {@link com.epam.ta.reportportal.ws.reporting.Issue.ExternalSystemIssue}
    * @param username       {@link com.epam.ta.reportportal.entity.user.User#login}
    * @return {@link Set} of the {@link Ticket}
    */
diff --git a/src/main/java/com/epam/ta/reportportal/core/item/impl/FinishTestItemHandlerAsyncImpl.java b/src/main/java/com/epam/ta/reportportal/core/item/impl/FinishTestItemHandlerAsyncImpl.java
index 04dd74a2b7..40cdbd45ad 100644
--- a/src/main/java/com/epam/ta/reportportal/core/item/impl/FinishTestItemHandlerAsyncImpl.java
+++ b/src/main/java/com/epam/ta/reportportal/core/item/impl/FinishTestItemHandlerAsyncImpl.java
@@ -24,9 +24,9 @@
 import com.epam.ta.reportportal.core.item.FinishTestItemHandler;
 import com.epam.ta.reportportal.exception.ReportPortalException;
 import com.epam.ta.reportportal.util.ReportingQueueService;
-import com.epam.ta.reportportal.ws.model.ErrorType;
-import com.epam.ta.reportportal.ws.model.FinishTestItemRQ;
-import com.epam.ta.reportportal.ws.model.OperationCompletionRS;
+import com.epam.ta.reportportal.ws.reporting.ErrorType;
+import com.epam.ta.reportportal.ws.reporting.FinishTestItemRQ;
+import com.epam.ta.reportportal.ws.reporting.OperationCompletionRS;
 import com.epam.ta.reportportal.ws.rabbit.MessageHeaders;
 import com.epam.ta.reportportal.ws.rabbit.RequestType;
 import java.util.Map;
diff --git a/src/main/java/com/epam/ta/reportportal/core/item/impl/FinishTestItemHandlerImpl.java b/src/main/java/com/epam/ta/reportportal/core/item/impl/FinishTestItemHandlerImpl.java
index f40ff73621..70fc6c41f9 100644
--- a/src/main/java/com/epam/ta/reportportal/core/item/impl/FinishTestItemHandlerImpl.java
+++ b/src/main/java/com/epam/ta/reportportal/core/item/impl/FinishTestItemHandlerImpl.java
@@ -35,11 +35,11 @@
 import static com.epam.ta.reportportal.entity.project.ProjectRole.PROJECT_MANAGER;
 import static com.epam.ta.reportportal.util.Predicates.ITEM_CAN_BE_INDEXED;
 import static com.epam.ta.reportportal.ws.converter.converters.TestItemConverter.TO_ACTIVITY_RESOURCE;
-import static com.epam.ta.reportportal.ws.model.ErrorType.ACCESS_DENIED;
-import static com.epam.ta.reportportal.ws.model.ErrorType.AMBIGUOUS_TEST_ITEM_STATUS;
-import static com.epam.ta.reportportal.ws.model.ErrorType.FINISH_ITEM_NOT_ALLOWED;
-import static com.epam.ta.reportportal.ws.model.ErrorType.LAUNCH_NOT_FOUND;
-import static com.epam.ta.reportportal.ws.model.ErrorType.TEST_ITEM_NOT_FOUND;
+import static com.epam.ta.reportportal.ws.reporting.ErrorType.ACCESS_DENIED;
+import static com.epam.ta.reportportal.ws.reporting.ErrorType.AMBIGUOUS_TEST_ITEM_STATUS;
+import static com.epam.ta.reportportal.ws.reporting.ErrorType.FINISH_ITEM_NOT_ALLOWED;
+import static com.epam.ta.reportportal.ws.reporting.ErrorType.LAUNCH_NOT_FOUND;
+import static com.epam.ta.reportportal.ws.reporting.ErrorType.TEST_ITEM_NOT_FOUND;
 import static java.util.Optional.ofNullable;
 
 import com.epam.ta.reportportal.commons.Preconditions;
@@ -71,9 +71,9 @@
 import com.epam.ta.reportportal.model.activity.TestItemActivityResource;
 import com.epam.ta.reportportal.ws.converter.builders.TestItemBuilder;
 import com.epam.ta.reportportal.ws.converter.converters.IssueConverter;
-import com.epam.ta.reportportal.ws.model.FinishTestItemRQ;
-import com.epam.ta.reportportal.ws.model.OperationCompletionRS;
-import com.epam.ta.reportportal.ws.model.issue.Issue;
+import com.epam.ta.reportportal.ws.reporting.FinishTestItemRQ;
+import com.epam.ta.reportportal.ws.reporting.OperationCompletionRS;
+import com.epam.ta.reportportal.ws.reporting.Issue;
 import com.google.common.collect.Lists;
 import java.util.ArrayList;
 import java.util.Collections;
diff --git a/src/main/java/com/epam/ta/reportportal/core/item/impl/GetTestItemHandlerImpl.java b/src/main/java/com/epam/ta/reportportal/core/item/impl/GetTestItemHandlerImpl.java
index 16fd9804d7..42a82b801a 100644
--- a/src/main/java/com/epam/ta/reportportal/core/item/impl/GetTestItemHandlerImpl.java
+++ b/src/main/java/com/epam/ta/reportportal/core/item/impl/GetTestItemHandlerImpl.java
@@ -21,7 +21,7 @@
 import static com.epam.ta.reportportal.commons.querygen.constant.LaunchCriteriaConstant.CRITERIA_LAUNCH_MODE;
 import static com.epam.ta.reportportal.commons.validation.BusinessRule.expect;
 import static com.epam.ta.reportportal.entity.project.ProjectRole.OPERATOR;
-import static com.epam.ta.reportportal.ws.model.ErrorType.ACCESS_DENIED;
+import static com.epam.ta.reportportal.ws.reporting.ErrorType.ACCESS_DENIED;
 import static java.util.stream.Collectors.toList;
 
 import com.epam.ta.reportportal.commons.Predicates;
@@ -48,15 +48,15 @@
 import com.epam.ta.reportportal.entity.project.ProjectRole;
 import com.epam.ta.reportportal.entity.user.UserRole;
 import com.epam.ta.reportportal.exception.ReportPortalException;
-import com.epam.ta.reportportal.model.TestItemResource;
 import com.epam.ta.reportportal.ws.converter.PagedResourcesAssembler;
 import com.epam.ta.reportportal.ws.converter.converters.StatisticsConverter;
 import com.epam.ta.reportportal.ws.converter.converters.TestItemConverter;
 import com.epam.ta.reportportal.ws.converter.utils.ResourceUpdater;
 import com.epam.ta.reportportal.ws.converter.utils.ResourceUpdaterProvider;
 import com.epam.ta.reportportal.ws.converter.utils.item.content.TestItemUpdaterContent;
-import com.epam.ta.reportportal.ws.model.ErrorType;
-import com.epam.ta.reportportal.ws.model.statistics.StatisticsResource;
+import com.epam.ta.reportportal.ws.reporting.ErrorType;
+import com.epam.ta.reportportal.ws.reporting.StatisticsResource;
+import com.epam.ta.reportportal.ws.reporting.TestItemResource;
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
diff --git a/src/main/java/com/epam/ta/reportportal/core/item/impl/IssueTypeHandler.java b/src/main/java/com/epam/ta/reportportal/core/item/impl/IssueTypeHandler.java
index e8b4553b21..6cd80bdb40 100644
--- a/src/main/java/com/epam/ta/reportportal/core/item/impl/IssueTypeHandler.java
+++ b/src/main/java/com/epam/ta/reportportal/core/item/impl/IssueTypeHandler.java
@@ -17,7 +17,7 @@
 package com.epam.ta.reportportal.core.item.impl;
 
 import static com.epam.ta.reportportal.commons.validation.Suppliers.formattedSupplier;
-import static com.epam.ta.reportportal.ws.model.ErrorType.FAILED_TEST_ITEM_ISSUE_TYPE_DEFINITION;
+import static com.epam.ta.reportportal.ws.reporting.ErrorType.FAILED_TEST_ITEM_ISSUE_TYPE_DEFINITION;
 import static java.util.Optional.ofNullable;
 import static java.util.stream.Collectors.toList;
 
diff --git a/src/main/java/com/epam/ta/reportportal/core/item/impl/LaunchAccessValidatorImpl.java b/src/main/java/com/epam/ta/reportportal/core/item/impl/LaunchAccessValidatorImpl.java
index 5ccf992ff4..7a27a7521d 100644
--- a/src/main/java/com/epam/ta/reportportal/core/item/impl/LaunchAccessValidatorImpl.java
+++ b/src/main/java/com/epam/ta/reportportal/core/item/impl/LaunchAccessValidatorImpl.java
@@ -20,9 +20,9 @@
 import static com.epam.ta.reportportal.commons.validation.BusinessRule.expect;
 import static com.epam.ta.reportportal.commons.validation.Suppliers.formattedSupplier;
 import static com.epam.ta.reportportal.entity.project.ProjectRole.OPERATOR;
-import static com.epam.ta.reportportal.ws.model.ErrorType.ACCESS_DENIED;
-import static com.epam.ta.reportportal.ws.model.ErrorType.FORBIDDEN_OPERATION;
-import static com.epam.ta.reportportal.ws.model.ErrorType.LAUNCH_NOT_FOUND;
+import static com.epam.ta.reportportal.ws.reporting.ErrorType.ACCESS_DENIED;
+import static com.epam.ta.reportportal.ws.reporting.ErrorType.FORBIDDEN_OPERATION;
+import static com.epam.ta.reportportal.ws.reporting.ErrorType.LAUNCH_NOT_FOUND;
 
 import com.epam.ta.reportportal.commons.ReportPortalUser;
 import com.epam.ta.reportportal.dao.LaunchRepository;
diff --git a/src/main/java/com/epam/ta/reportportal/core/item/impl/StartTestItemHandlerAsyncImpl.java b/src/main/java/com/epam/ta/reportportal/core/item/impl/StartTestItemHandlerAsyncImpl.java
index ffa9eef04d..44b9f7e811 100644
--- a/src/main/java/com/epam/ta/reportportal/core/item/impl/StartTestItemHandlerAsyncImpl.java
+++ b/src/main/java/com/epam/ta/reportportal/core/item/impl/StartTestItemHandlerAsyncImpl.java
@@ -21,8 +21,8 @@
 import com.epam.ta.reportportal.commons.ReportPortalUser;
 import com.epam.ta.reportportal.core.item.StartTestItemHandler;
 import com.epam.ta.reportportal.util.ReportingQueueService;
-import com.epam.ta.reportportal.ws.model.StartTestItemRQ;
-import com.epam.ta.reportportal.ws.model.item.ItemCreatedRS;
+import com.epam.ta.reportportal.ws.reporting.StartTestItemRQ;
+import com.epam.ta.reportportal.ws.reporting.ItemCreatedRS;
 import com.epam.ta.reportportal.ws.rabbit.MessageHeaders;
 import com.epam.ta.reportportal.ws.rabbit.RequestType;
 import java.util.Map;
diff --git a/src/main/java/com/epam/ta/reportportal/core/item/impl/StartTestItemHandlerImpl.java b/src/main/java/com/epam/ta/reportportal/core/item/impl/StartTestItemHandlerImpl.java
index c53070507f..b34dad2357 100644
--- a/src/main/java/com/epam/ta/reportportal/core/item/impl/StartTestItemHandlerImpl.java
+++ b/src/main/java/com/epam/ta/reportportal/core/item/impl/StartTestItemHandlerImpl.java
@@ -18,11 +18,11 @@
 
 import static com.epam.ta.reportportal.commons.Predicates.equalTo;
 import static com.epam.ta.reportportal.commons.validation.BusinessRule.expect;
-import static com.epam.ta.reportportal.ws.model.ErrorType.ACCESS_DENIED;
-import static com.epam.ta.reportportal.ws.model.ErrorType.BAD_REQUEST_ERROR;
-import static com.epam.ta.reportportal.ws.model.ErrorType.CHILD_START_TIME_EARLIER_THAN_PARENT;
-import static com.epam.ta.reportportal.ws.model.ErrorType.LAUNCH_NOT_FOUND;
-import static com.epam.ta.reportportal.ws.model.ErrorType.TEST_ITEM_NOT_FOUND;
+import static com.epam.ta.reportportal.ws.reporting.ErrorType.ACCESS_DENIED;
+import static com.epam.ta.reportportal.ws.reporting.ErrorType.BAD_REQUEST_ERROR;
+import static com.epam.ta.reportportal.ws.reporting.ErrorType.CHILD_START_TIME_EARLIER_THAN_PARENT;
+import static com.epam.ta.reportportal.ws.reporting.ErrorType.LAUNCH_NOT_FOUND;
+import static com.epam.ta.reportportal.ws.reporting.ErrorType.TEST_ITEM_NOT_FOUND;
 import static java.util.Optional.ofNullable;
 import static org.apache.commons.lang3.BooleanUtils.isTrue;
 
@@ -44,8 +44,8 @@
 import com.epam.ta.reportportal.entity.user.UserRole;
 import com.epam.ta.reportportal.exception.ReportPortalException;
 import com.epam.ta.reportportal.ws.converter.builders.TestItemBuilder;
-import com.epam.ta.reportportal.ws.model.StartTestItemRQ;
-import com.epam.ta.reportportal.ws.model.item.ItemCreatedRS;
+import com.epam.ta.reportportal.ws.reporting.StartTestItemRQ;
+import com.epam.ta.reportportal.ws.reporting.ItemCreatedRS;
 import java.util.List;
 import java.util.Objects;
 import java.util.Optional;
diff --git a/src/main/java/com/epam/ta/reportportal/core/item/impl/UpdateTestItemHandlerImpl.java b/src/main/java/com/epam/ta/reportportal/core/item/impl/UpdateTestItemHandlerImpl.java
index bc5848c94c..dfd80a6aa1 100644
--- a/src/main/java/com/epam/ta/reportportal/core/item/impl/UpdateTestItemHandlerImpl.java
+++ b/src/main/java/com/epam/ta/reportportal/core/item/impl/UpdateTestItemHandlerImpl.java
@@ -25,11 +25,11 @@
 import static com.epam.ta.reportportal.util.ItemInfoUtils.extractAttributeResource;
 import static com.epam.ta.reportportal.util.Predicates.ITEM_CAN_BE_INDEXED;
 import static com.epam.ta.reportportal.ws.converter.converters.TestItemConverter.TO_ACTIVITY_RESOURCE;
-import static com.epam.ta.reportportal.ws.model.ErrorType.ACCESS_DENIED;
-import static com.epam.ta.reportportal.ws.model.ErrorType.FAILED_TEST_ITEM_ISSUE_TYPE_DEFINITION;
-import static com.epam.ta.reportportal.ws.model.ErrorType.INCORRECT_REQUEST;
-import static com.epam.ta.reportportal.ws.model.ErrorType.PROJECT_NOT_FOUND;
-import static com.epam.ta.reportportal.ws.model.ErrorType.TEST_ITEM_NOT_FOUND;
+import static com.epam.ta.reportportal.ws.reporting.ErrorType.ACCESS_DENIED;
+import static com.epam.ta.reportportal.ws.reporting.ErrorType.FAILED_TEST_ITEM_ISSUE_TYPE_DEFINITION;
+import static com.epam.ta.reportportal.ws.reporting.ErrorType.INCORRECT_REQUEST;
+import static com.epam.ta.reportportal.ws.reporting.ErrorType.PROJECT_NOT_FOUND;
+import static com.epam.ta.reportportal.ws.reporting.ErrorType.TEST_ITEM_NOT_FOUND;
 import static java.lang.Boolean.FALSE;
 import static java.lang.Boolean.TRUE;
 import static java.util.stream.Collectors.toList;
@@ -73,10 +73,10 @@
 import com.epam.ta.reportportal.ws.converter.builders.TestItemBuilder;
 import com.epam.ta.reportportal.ws.converter.converters.IssueConverter;
 import com.epam.ta.reportportal.ws.converter.converters.ItemAttributeConverter;
-import com.epam.ta.reportportal.ws.model.BulkInfoUpdateRQ;
-import com.epam.ta.reportportal.ws.model.ErrorType;
-import com.epam.ta.reportportal.ws.model.OperationCompletionRS;
-import com.epam.ta.reportportal.ws.model.issue.Issue;
+import com.epam.ta.reportportal.ws.reporting.BulkInfoUpdateRQ;
+import com.epam.ta.reportportal.ws.reporting.ErrorType;
+import com.epam.ta.reportportal.ws.reporting.OperationCompletionRS;
+import com.epam.ta.reportportal.ws.reporting.Issue;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
diff --git a/src/main/java/com/epam/ta/reportportal/core/item/impl/history/TestItemsHistoryHandlerImpl.java b/src/main/java/com/epam/ta/reportportal/core/item/impl/history/TestItemsHistoryHandlerImpl.java
index f84870a0de..67e8c6fc19 100644
--- a/src/main/java/com/epam/ta/reportportal/core/item/impl/history/TestItemsHistoryHandlerImpl.java
+++ b/src/main/java/com/epam/ta/reportportal/core/item/impl/history/TestItemsHistoryHandlerImpl.java
@@ -19,9 +19,9 @@
 import static com.epam.ta.reportportal.commons.querygen.constant.GeneralCriteriaConstant.CRITERIA_PROJECT_ID;
 import static com.epam.ta.reportportal.commons.querygen.constant.LaunchCriteriaConstant.CRITERIA_LAUNCH_MODE;
 import static com.epam.ta.reportportal.commons.querygen.constant.TestItemCriteriaConstant.CRITERIA_HAS_STATS;
-import static com.epam.ta.reportportal.ws.model.ErrorType.UNABLE_LOAD_TEST_ITEM_HISTORY;
 import static com.epam.ta.reportportal.ws.model.ValidationConstraints.MAX_HISTORY_DEPTH_BOUND;
 import static com.epam.ta.reportportal.ws.model.ValidationConstraints.MIN_HISTORY_DEPTH_BOUND;
+import static com.epam.ta.reportportal.ws.reporting.ErrorType.UNABLE_LOAD_TEST_ITEM_HISTORY;
 import static java.util.Optional.ofNullable;
 import static java.util.stream.Collectors.groupingBy;
 import static java.util.stream.Collectors.toList;
@@ -43,12 +43,12 @@
 import com.epam.ta.reportportal.entity.item.history.TestItemHistory;
 import com.epam.ta.reportportal.exception.ReportPortalException;
 import com.epam.ta.reportportal.model.TestItemHistoryElement;
-import com.epam.ta.reportportal.model.TestItemResource;
 import com.epam.ta.reportportal.ws.converter.PagedResourcesAssembler;
 import com.epam.ta.reportportal.ws.converter.converters.TestItemConverter;
 import com.epam.ta.reportportal.ws.converter.utils.ResourceUpdater;
 import com.epam.ta.reportportal.ws.converter.utils.ResourceUpdaterProvider;
 import com.epam.ta.reportportal.ws.converter.utils.item.content.TestItemUpdaterContent;
+import com.epam.ta.reportportal.ws.reporting.TestItemResource;
 import com.google.common.collect.Lists;
 import java.util.List;
 import java.util.Map;
diff --git a/src/main/java/com/epam/ta/reportportal/core/item/impl/history/param/HistoryRequestParams.java b/src/main/java/com/epam/ta/reportportal/core/item/impl/history/param/HistoryRequestParams.java
index 368db777c4..0e1417780d 100644
--- a/src/main/java/com/epam/ta/reportportal/core/item/impl/history/param/HistoryRequestParams.java
+++ b/src/main/java/com/epam/ta/reportportal/core/item/impl/history/param/HistoryRequestParams.java
@@ -20,7 +20,7 @@
 
 import com.epam.ta.reportportal.commons.validation.Suppliers;
 import com.epam.ta.reportportal.exception.ReportPortalException;
-import com.epam.ta.reportportal.ws.model.ErrorType;
+import com.epam.ta.reportportal.ws.reporting.ErrorType;
 import java.util.Arrays;
 import java.util.Optional;
 
diff --git a/src/main/java/com/epam/ta/reportportal/core/item/impl/history/provider/impl/ComparingBaselineHistoryProvider.java b/src/main/java/com/epam/ta/reportportal/core/item/impl/history/provider/impl/ComparingBaselineHistoryProvider.java
index 0060c2782d..f5e168c158 100644
--- a/src/main/java/com/epam/ta/reportportal/core/item/impl/history/provider/impl/ComparingBaselineHistoryProvider.java
+++ b/src/main/java/com/epam/ta/reportportal/core/item/impl/history/provider/impl/ComparingBaselineHistoryProvider.java
@@ -28,7 +28,7 @@
 import com.epam.ta.reportportal.entity.item.history.TestItemHistory;
 import com.epam.ta.reportportal.entity.launch.Launch;
 import com.epam.ta.reportportal.exception.ReportPortalException;
-import com.epam.ta.reportportal.ws.model.ErrorType;
+import com.epam.ta.reportportal.ws.reporting.ErrorType;
 import org.apache.commons.lang3.tuple.Pair;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
diff --git a/src/main/java/com/epam/ta/reportportal/core/item/impl/history/provider/impl/FilterBaselineHistoryProvider.java b/src/main/java/com/epam/ta/reportportal/core/item/impl/history/provider/impl/FilterBaselineHistoryProvider.java
index f266e30c35..e85055c03a 100644
--- a/src/main/java/com/epam/ta/reportportal/core/item/impl/history/provider/impl/FilterBaselineHistoryProvider.java
+++ b/src/main/java/com/epam/ta/reportportal/core/item/impl/history/provider/impl/FilterBaselineHistoryProvider.java
@@ -29,7 +29,7 @@
 import com.epam.ta.reportportal.entity.item.history.TestItemHistory;
 import com.epam.ta.reportportal.entity.launch.Launch;
 import com.epam.ta.reportportal.exception.ReportPortalException;
-import com.epam.ta.reportportal.ws.model.ErrorType;
+import com.epam.ta.reportportal.ws.reporting.ErrorType;
 import org.apache.commons.lang3.tuple.Pair;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.Page;
diff --git a/src/main/java/com/epam/ta/reportportal/core/item/impl/history/provider/impl/LaunchBaselineHistoryProvider.java b/src/main/java/com/epam/ta/reportportal/core/item/impl/history/provider/impl/LaunchBaselineHistoryProvider.java
index ec7c80627b..1d1c2f0b61 100644
--- a/src/main/java/com/epam/ta/reportportal/core/item/impl/history/provider/impl/LaunchBaselineHistoryProvider.java
+++ b/src/main/java/com/epam/ta/reportportal/core/item/impl/history/provider/impl/LaunchBaselineHistoryProvider.java
@@ -26,7 +26,7 @@
 import com.epam.ta.reportportal.entity.item.history.TestItemHistory;
 import com.epam.ta.reportportal.entity.launch.Launch;
 import com.epam.ta.reportportal.exception.ReportPortalException;
-import com.epam.ta.reportportal.ws.model.ErrorType;
+import com.epam.ta.reportportal.ws.reporting.ErrorType;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
 import org.springframework.stereotype.Service;
diff --git a/src/main/java/com/epam/ta/reportportal/core/item/impl/history/provider/impl/TestItemBaselineHistoryProvider.java b/src/main/java/com/epam/ta/reportportal/core/item/impl/history/provider/impl/TestItemBaselineHistoryProvider.java
index b1512142d9..1564b2be5a 100644
--- a/src/main/java/com/epam/ta/reportportal/core/item/impl/history/provider/impl/TestItemBaselineHistoryProvider.java
+++ b/src/main/java/com/epam/ta/reportportal/core/item/impl/history/provider/impl/TestItemBaselineHistoryProvider.java
@@ -35,7 +35,7 @@
 import com.epam.ta.reportportal.entity.item.history.TestItemHistory;
 import com.epam.ta.reportportal.entity.launch.Launch;
 import com.epam.ta.reportportal.exception.ReportPortalException;
-import com.epam.ta.reportportal.ws.model.ErrorType;
+import com.epam.ta.reportportal.ws.reporting.ErrorType;
 import java.util.List;
 import java.util.stream.Collectors;
 import org.apache.commons.lang3.BooleanUtils;
diff --git a/src/main/java/com/epam/ta/reportportal/core/item/impl/merge/strategy/AbstractLaunchMergeStrategy.java b/src/main/java/com/epam/ta/reportportal/core/item/impl/merge/strategy/AbstractLaunchMergeStrategy.java
index 610d56528c..77d251ca76 100644
--- a/src/main/java/com/epam/ta/reportportal/core/item/impl/merge/strategy/AbstractLaunchMergeStrategy.java
+++ b/src/main/java/com/epam/ta/reportportal/core/item/impl/merge/strategy/AbstractLaunchMergeStrategy.java
@@ -20,7 +20,7 @@
 import static com.epam.ta.reportportal.commons.validation.BusinessRule.expect;
 import static com.epam.ta.reportportal.entity.enums.StatusEnum.IN_PROGRESS;
 import static com.epam.ta.reportportal.ws.converter.converters.ItemAttributeConverter.FROM_RESOURCE;
-import static com.epam.ta.reportportal.ws.model.ErrorType.FINISH_TIME_EARLIER_THAN_START_TIME;
+import static com.epam.ta.reportportal.ws.reporting.ErrorType.FINISH_TIME_EARLIER_THAN_START_TIME;
 import static java.util.Optional.ofNullable;
 import static java.util.stream.Collectors.joining;
 import static java.util.stream.Collectors.toList;
@@ -41,12 +41,12 @@
 import com.epam.ta.reportportal.entity.launch.Launch;
 import com.epam.ta.reportportal.entity.project.Project;
 import com.epam.ta.reportportal.exception.ReportPortalException;
-import com.epam.ta.reportportal.model.launch.MergeLaunchesRQ;
 import com.epam.ta.reportportal.ws.converter.builders.LaunchBuilder;
-import com.epam.ta.reportportal.ws.model.ErrorType;
-import com.epam.ta.reportportal.ws.model.attribute.ItemAttributeResource;
-import com.epam.ta.reportportal.ws.model.launch.Mode;
-import com.epam.ta.reportportal.ws.model.launch.StartLaunchRQ;
+import com.epam.ta.reportportal.ws.reporting.ErrorType;
+import com.epam.ta.reportportal.ws.reporting.ItemAttributeResource;
+import com.epam.ta.reportportal.ws.reporting.MergeLaunchesRQ;
+import com.epam.ta.reportportal.ws.reporting.Mode;
+import com.epam.ta.reportportal.ws.reporting.StartLaunchRQ;
 import com.google.common.collect.Sets;
 import java.util.Collection;
 import java.util.Comparator;
diff --git a/src/main/java/com/epam/ta/reportportal/core/item/impl/merge/strategy/BasicLaunchMergeStrategy.java b/src/main/java/com/epam/ta/reportportal/core/item/impl/merge/strategy/BasicLaunchMergeStrategy.java
index dd2cb27a35..7c0cde8793 100644
--- a/src/main/java/com/epam/ta/reportportal/core/item/impl/merge/strategy/BasicLaunchMergeStrategy.java
+++ b/src/main/java/com/epam/ta/reportportal/core/item/impl/merge/strategy/BasicLaunchMergeStrategy.java
@@ -23,7 +23,7 @@
 import com.epam.ta.reportportal.dao.LogRepository;
 import com.epam.ta.reportportal.dao.TestItemRepository;
 import com.epam.ta.reportportal.entity.launch.Launch;
-import com.epam.ta.reportportal.model.launch.MergeLaunchesRQ;
+import com.epam.ta.reportportal.ws.reporting.MergeLaunchesRQ;
 import java.util.List;
 
 /**
diff --git a/src/main/java/com/epam/ta/reportportal/core/item/impl/merge/strategy/DeepLaunchMergeStrategy.java b/src/main/java/com/epam/ta/reportportal/core/item/impl/merge/strategy/DeepLaunchMergeStrategy.java
index 00a488d917..4e7c2a069c 100644
--- a/src/main/java/com/epam/ta/reportportal/core/item/impl/merge/strategy/DeepLaunchMergeStrategy.java
+++ b/src/main/java/com/epam/ta/reportportal/core/item/impl/merge/strategy/DeepLaunchMergeStrategy.java
@@ -23,7 +23,7 @@
 import com.epam.ta.reportportal.dao.LogRepository;
 import com.epam.ta.reportportal.dao.TestItemRepository;
 import com.epam.ta.reportportal.entity.launch.Launch;
-import com.epam.ta.reportportal.model.launch.MergeLaunchesRQ;
+import com.epam.ta.reportportal.ws.reporting.MergeLaunchesRQ;
 import java.util.List;
 
 /**
diff --git a/src/main/java/com/epam/ta/reportportal/core/item/impl/provider/FilterDataProviderImpl.java b/src/main/java/com/epam/ta/reportportal/core/item/impl/provider/FilterDataProviderImpl.java
index a223249c75..d7c4b2ccf9 100644
--- a/src/main/java/com/epam/ta/reportportal/core/item/impl/provider/FilterDataProviderImpl.java
+++ b/src/main/java/com/epam/ta/reportportal/core/item/impl/provider/FilterDataProviderImpl.java
@@ -27,7 +27,7 @@
 import com.epam.ta.reportportal.entity.user.UserRole;
 import com.epam.ta.reportportal.exception.ReportPortalException;
 import com.epam.ta.reportportal.util.ControllerUtils;
-import com.epam.ta.reportportal.ws.model.ErrorType;
+import com.epam.ta.reportportal.ws.reporting.ErrorType;
 import org.apache.commons.lang3.tuple.Pair;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.Page;
@@ -43,7 +43,7 @@
 import static com.epam.ta.reportportal.entity.project.ProjectRole.OPERATOR;
 import static com.epam.ta.reportportal.ws.controller.TestItemController.IS_LATEST_LAUNCHES_REQUEST_PARAM;
 import static com.epam.ta.reportportal.ws.controller.TestItemController.LAUNCHES_LIMIT_REQUEST_PARAM;
-import static com.epam.ta.reportportal.ws.model.ErrorType.ACCESS_DENIED;
+import static com.epam.ta.reportportal.ws.reporting.ErrorType.ACCESS_DENIED;
 
 /**
  * @author <a href="mailto:pavel_bortnik@epam.com">Pavel Bortnik</a>
diff --git a/src/main/java/com/epam/ta/reportportal/core/item/impl/provider/impl/BaselineLaunchDataProvider.java b/src/main/java/com/epam/ta/reportportal/core/item/impl/provider/impl/BaselineLaunchDataProvider.java
index 1173a2da6f..907eb58685 100644
--- a/src/main/java/com/epam/ta/reportportal/core/item/impl/provider/impl/BaselineLaunchDataProvider.java
+++ b/src/main/java/com/epam/ta/reportportal/core/item/impl/provider/impl/BaselineLaunchDataProvider.java
@@ -31,7 +31,7 @@
 import com.epam.ta.reportportal.entity.statistics.Statistics;
 import com.epam.ta.reportportal.exception.ReportPortalException;
 import com.epam.ta.reportportal.util.ControllerUtils;
-import com.epam.ta.reportportal.ws.model.ErrorType;
+import com.epam.ta.reportportal.ws.reporting.ErrorType;
 import java.util.Map;
 import java.util.Optional;
 import java.util.Set;
diff --git a/src/main/java/com/epam/ta/reportportal/core/item/impl/provider/impl/CumulativeTestItemDataProviderImpl.java b/src/main/java/com/epam/ta/reportportal/core/item/impl/provider/impl/CumulativeTestItemDataProviderImpl.java
index 8b06c0881c..567f430371 100644
--- a/src/main/java/com/epam/ta/reportportal/core/item/impl/provider/impl/CumulativeTestItemDataProviderImpl.java
+++ b/src/main/java/com/epam/ta/reportportal/core/item/impl/provider/impl/CumulativeTestItemDataProviderImpl.java
@@ -33,7 +33,7 @@
 import com.epam.ta.reportportal.dao.WidgetContentRepository;
 import com.epam.ta.reportportal.entity.item.TestItem;
 import com.epam.ta.reportportal.entity.statistics.Statistics;
-import com.epam.ta.reportportal.ws.model.ErrorType;
+import com.epam.ta.reportportal.ws.reporting.ErrorType;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
diff --git a/src/main/java/com/epam/ta/reportportal/core/item/impl/provider/impl/DelegatingClusterDataProviderHandler.java b/src/main/java/com/epam/ta/reportportal/core/item/impl/provider/impl/DelegatingClusterDataProviderHandler.java
index d05d1ff697..c2aea512d5 100644
--- a/src/main/java/com/epam/ta/reportportal/core/item/impl/provider/impl/DelegatingClusterDataProviderHandler.java
+++ b/src/main/java/com/epam/ta/reportportal/core/item/impl/provider/impl/DelegatingClusterDataProviderHandler.java
@@ -22,7 +22,7 @@
 import com.epam.ta.reportportal.core.item.impl.provider.DataProviderHandler;
 import com.epam.ta.reportportal.entity.item.TestItem;
 import com.epam.ta.reportportal.entity.statistics.Statistics;
-import com.epam.ta.reportportal.ws.model.ErrorType;
+import com.epam.ta.reportportal.ws.reporting.ErrorType;
 import java.util.Map;
 import java.util.Set;
 import org.apache.commons.lang3.BooleanUtils;
diff --git a/src/main/java/com/epam/ta/reportportal/core/item/impl/provider/impl/LaunchDataProviderHandlerImpl.java b/src/main/java/com/epam/ta/reportportal/core/item/impl/provider/impl/LaunchDataProviderHandlerImpl.java
index c3eb72781d..e0e001b020 100644
--- a/src/main/java/com/epam/ta/reportportal/core/item/impl/provider/impl/LaunchDataProviderHandlerImpl.java
+++ b/src/main/java/com/epam/ta/reportportal/core/item/impl/provider/impl/LaunchDataProviderHandlerImpl.java
@@ -31,7 +31,7 @@
 import com.epam.ta.reportportal.entity.statistics.Statistics;
 import com.epam.ta.reportportal.exception.ReportPortalException;
 import com.epam.ta.reportportal.util.ControllerUtils;
-import com.epam.ta.reportportal.ws.model.ErrorType;
+import com.epam.ta.reportportal.ws.reporting.ErrorType;
 import java.util.Map;
 import java.util.Optional;
 import java.util.Set;
diff --git a/src/main/java/com/epam/ta/reportportal/core/item/impl/provider/impl/MaterializedWidgetProviderHandlerImpl.java b/src/main/java/com/epam/ta/reportportal/core/item/impl/provider/impl/MaterializedWidgetProviderHandlerImpl.java
index bd207f6aa7..470239f88a 100644
--- a/src/main/java/com/epam/ta/reportportal/core/item/impl/provider/impl/MaterializedWidgetProviderHandlerImpl.java
+++ b/src/main/java/com/epam/ta/reportportal/core/item/impl/provider/impl/MaterializedWidgetProviderHandlerImpl.java
@@ -30,7 +30,7 @@
 import com.epam.ta.reportportal.entity.widget.WidgetType;
 import com.epam.ta.reportportal.exception.ReportPortalException;
 import com.epam.ta.reportportal.util.ControllerUtils;
-import com.epam.ta.reportportal.ws.model.ErrorType;
+import com.epam.ta.reportportal.ws.reporting.ErrorType;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
diff --git a/src/main/java/com/epam/ta/reportportal/core/item/impl/retry/DefaultRetryHandler.java b/src/main/java/com/epam/ta/reportportal/core/item/impl/retry/DefaultRetryHandler.java
index cdfd718ca6..9dc31d4a43 100644
--- a/src/main/java/com/epam/ta/reportportal/core/item/impl/retry/DefaultRetryHandler.java
+++ b/src/main/java/com/epam/ta/reportportal/core/item/impl/retry/DefaultRetryHandler.java
@@ -7,7 +7,7 @@
 import com.epam.ta.reportportal.entity.item.TestItem;
 import com.epam.ta.reportportal.entity.launch.Launch;
 import com.epam.ta.reportportal.jooq.enums.JStatusEnum;
-import com.epam.ta.reportportal.ws.model.ErrorType;
+import com.epam.ta.reportportal.ws.reporting.ErrorType;
 import java.time.LocalDateTime;
 import java.util.Objects;
 import org.springframework.context.ApplicationEventPublisher;
diff --git a/src/main/java/com/epam/ta/reportportal/core/item/impl/status/AbstractStatusChangingStrategy.java b/src/main/java/com/epam/ta/reportportal/core/item/impl/status/AbstractStatusChangingStrategy.java
index 989b9076eb..9f2dd39951 100644
--- a/src/main/java/com/epam/ta/reportportal/core/item/impl/status/AbstractStatusChangingStrategy.java
+++ b/src/main/java/com/epam/ta/reportportal/core/item/impl/status/AbstractStatusChangingStrategy.java
@@ -23,8 +23,8 @@
 import static com.epam.ta.reportportal.entity.enums.StatusEnum.WARN;
 import static com.epam.ta.reportportal.entity.enums.TestItemIssueGroup.TO_INVESTIGATE;
 import static com.epam.ta.reportportal.ws.converter.converters.TestItemConverter.TO_ACTIVITY_RESOURCE;
-import static com.epam.ta.reportportal.ws.model.ErrorType.INCORRECT_REQUEST;
-import static com.epam.ta.reportportal.ws.model.ErrorType.PROJECT_NOT_FOUND;
+import static com.epam.ta.reportportal.ws.reporting.ErrorType.INCORRECT_REQUEST;
+import static com.epam.ta.reportportal.ws.reporting.ErrorType.PROJECT_NOT_FOUND;
 import static java.util.Optional.ofNullable;
 
 import com.epam.ta.reportportal.commons.ReportPortalUser;
@@ -48,7 +48,7 @@
 import com.epam.ta.reportportal.entity.project.Project;
 import com.epam.ta.reportportal.exception.ReportPortalException;
 import com.epam.ta.reportportal.model.activity.TestItemActivityResource;
-import com.epam.ta.reportportal.ws.model.ErrorType;
+import com.epam.ta.reportportal.ws.reporting.ErrorType;
 import com.google.common.collect.Lists;
 import java.util.Collections;
 import java.util.List;
diff --git a/src/main/java/com/epam/ta/reportportal/core/item/impl/status/ToFailedStatusChangingStrategy.java b/src/main/java/com/epam/ta/reportportal/core/item/impl/status/ToFailedStatusChangingStrategy.java
index f1fb3a84a8..48290899a6 100644
--- a/src/main/java/com/epam/ta/reportportal/core/item/impl/status/ToFailedStatusChangingStrategy.java
+++ b/src/main/java/com/epam/ta/reportportal/core/item/impl/status/ToFailedStatusChangingStrategy.java
@@ -17,7 +17,7 @@
 package com.epam.ta.reportportal.core.item.impl.status;
 
 import static com.epam.ta.reportportal.commons.Preconditions.statusIn;
-import static com.epam.ta.reportportal.ws.model.ErrorType.INCORRECT_REQUEST;
+import static com.epam.ta.reportportal.ws.reporting.ErrorType.INCORRECT_REQUEST;
 
 import com.epam.ta.reportportal.commons.ReportPortalUser;
 import com.epam.ta.reportportal.commons.validation.BusinessRule;
diff --git a/src/main/java/com/epam/ta/reportportal/core/item/impl/status/ToPassedStatusChangingStrategy.java b/src/main/java/com/epam/ta/reportportal/core/item/impl/status/ToPassedStatusChangingStrategy.java
index babcc18e7e..a9c23082c2 100644
--- a/src/main/java/com/epam/ta/reportportal/core/item/impl/status/ToPassedStatusChangingStrategy.java
+++ b/src/main/java/com/epam/ta/reportportal/core/item/impl/status/ToPassedStatusChangingStrategy.java
@@ -17,7 +17,7 @@
 package com.epam.ta.reportportal.core.item.impl.status;
 
 import static com.epam.ta.reportportal.commons.Preconditions.statusIn;
-import static com.epam.ta.reportportal.ws.model.ErrorType.INCORRECT_REQUEST;
+import static com.epam.ta.reportportal.ws.reporting.ErrorType.INCORRECT_REQUEST;
 import static java.util.Optional.ofNullable;
 
 import com.epam.ta.reportportal.commons.ReportPortalUser;
diff --git a/src/main/java/com/epam/ta/reportportal/core/item/impl/status/ToSkippedStatusChangingStrategy.java b/src/main/java/com/epam/ta/reportportal/core/item/impl/status/ToSkippedStatusChangingStrategy.java
index 863896daff..ebea065f7f 100644
--- a/src/main/java/com/epam/ta/reportportal/core/item/impl/status/ToSkippedStatusChangingStrategy.java
+++ b/src/main/java/com/epam/ta/reportportal/core/item/impl/status/ToSkippedStatusChangingStrategy.java
@@ -18,7 +18,7 @@
 
 import static com.epam.ta.reportportal.commons.Preconditions.statusIn;
 import static com.epam.ta.reportportal.entity.enums.StatusEnum.FAILED;
-import static com.epam.ta.reportportal.ws.model.ErrorType.INCORRECT_REQUEST;
+import static com.epam.ta.reportportal.ws.reporting.ErrorType.INCORRECT_REQUEST;
 import static java.util.Optional.ofNullable;
 
 import com.epam.ta.reportportal.commons.ReportPortalUser;
diff --git a/src/main/java/com/epam/ta/reportportal/core/item/merge/LaunchMergeStrategy.java b/src/main/java/com/epam/ta/reportportal/core/item/merge/LaunchMergeStrategy.java
index 714d02ec2c..5ce7bdfec3 100644
--- a/src/main/java/com/epam/ta/reportportal/core/item/merge/LaunchMergeStrategy.java
+++ b/src/main/java/com/epam/ta/reportportal/core/item/merge/LaunchMergeStrategy.java
@@ -18,7 +18,7 @@
 
 import com.epam.ta.reportportal.commons.ReportPortalUser;
 import com.epam.ta.reportportal.entity.launch.Launch;
-import com.epam.ta.reportportal.model.launch.MergeLaunchesRQ;
+import com.epam.ta.reportportal.ws.reporting.MergeLaunchesRQ;
 import java.util.List;
 
 /**
diff --git a/src/main/java/com/epam/ta/reportportal/core/item/utils/DefaultLaunchFilterProvider.java b/src/main/java/com/epam/ta/reportportal/core/item/utils/DefaultLaunchFilterProvider.java
index b1fdecff05..891ba6fe35 100644
--- a/src/main/java/com/epam/ta/reportportal/core/item/utils/DefaultLaunchFilterProvider.java
+++ b/src/main/java/com/epam/ta/reportportal/core/item/utils/DefaultLaunchFilterProvider.java
@@ -32,8 +32,8 @@
 import com.epam.ta.reportportal.entity.enums.StatusEnum;
 import com.epam.ta.reportportal.entity.filter.ObjectType;
 import com.epam.ta.reportportal.entity.filter.UserFilter;
-import com.epam.ta.reportportal.ws.model.ErrorType;
-import com.epam.ta.reportportal.ws.model.launch.Mode;
+import com.epam.ta.reportportal.ws.reporting.ErrorType;
+import com.epam.ta.reportportal.ws.reporting.Mode;
 import org.apache.commons.lang3.tuple.Pair;
 import org.springframework.data.domain.PageRequest;
 import org.springframework.data.domain.Pageable;
diff --git a/src/main/java/com/epam/ta/reportportal/core/item/validator/parent/NestedStepConditionValidator.java b/src/main/java/com/epam/ta/reportportal/core/item/validator/parent/NestedStepConditionValidator.java
index 87338a1f1d..1ac1640450 100644
--- a/src/main/java/com/epam/ta/reportportal/core/item/validator/parent/NestedStepConditionValidator.java
+++ b/src/main/java/com/epam/ta/reportportal/core/item/validator/parent/NestedStepConditionValidator.java
@@ -2,11 +2,11 @@
 
 import static com.epam.ta.reportportal.commons.Predicates.equalTo;
 import static com.epam.ta.reportportal.commons.validation.BusinessRule.expect;
-import static com.epam.ta.reportportal.ws.model.ErrorType.BAD_REQUEST_ERROR;
+import static com.epam.ta.reportportal.ws.reporting.ErrorType.BAD_REQUEST_ERROR;
 
 import com.epam.ta.reportportal.commons.validation.Suppliers;
 import com.epam.ta.reportportal.entity.item.TestItem;
-import com.epam.ta.reportportal.ws.model.StartTestItemRQ;
+import com.epam.ta.reportportal.ws.reporting.StartTestItemRQ;
 import org.springframework.core.Ordered;
 import org.springframework.stereotype.Service;
 
diff --git a/src/main/java/com/epam/ta/reportportal/core/item/validator/parent/ParentItemValidator.java b/src/main/java/com/epam/ta/reportportal/core/item/validator/parent/ParentItemValidator.java
index ef29f979df..0512ad8070 100644
--- a/src/main/java/com/epam/ta/reportportal/core/item/validator/parent/ParentItemValidator.java
+++ b/src/main/java/com/epam/ta/reportportal/core/item/validator/parent/ParentItemValidator.java
@@ -17,7 +17,7 @@
 package com.epam.ta.reportportal.core.item.validator.parent;
 
 import com.epam.ta.reportportal.entity.item.TestItem;
-import com.epam.ta.reportportal.ws.model.StartTestItemRQ;
+import com.epam.ta.reportportal.ws.reporting.StartTestItemRQ;
 
 public interface ParentItemValidator {
 
diff --git a/src/main/java/com/epam/ta/reportportal/core/item/validator/parent/PathLengthValidator.java b/src/main/java/com/epam/ta/reportportal/core/item/validator/parent/PathLengthValidator.java
index 774e87f54c..630ef509a1 100644
--- a/src/main/java/com/epam/ta/reportportal/core/item/validator/parent/PathLengthValidator.java
+++ b/src/main/java/com/epam/ta/reportportal/core/item/validator/parent/PathLengthValidator.java
@@ -17,11 +17,11 @@
 package com.epam.ta.reportportal.core.item.validator.parent;
 
 import static com.epam.ta.reportportal.commons.validation.BusinessRule.expect;
-import static com.epam.ta.reportportal.ws.model.ErrorType.BAD_REQUEST_ERROR;
+import static com.epam.ta.reportportal.ws.reporting.ErrorType.BAD_REQUEST_ERROR;
 
 import com.epam.ta.reportportal.commons.Predicates;
 import com.epam.ta.reportportal.entity.item.TestItem;
-import com.epam.ta.reportportal.ws.model.StartTestItemRQ;
+import com.epam.ta.reportportal.ws.reporting.StartTestItemRQ;
 import org.springframework.core.Ordered;
 import org.springframework.stereotype.Service;
 
diff --git a/src/main/java/com/epam/ta/reportportal/core/item/validator/parent/RetryConditionValidator.java b/src/main/java/com/epam/ta/reportportal/core/item/validator/parent/RetryConditionValidator.java
index 485eabcec5..3fa5f7167c 100644
--- a/src/main/java/com/epam/ta/reportportal/core/item/validator/parent/RetryConditionValidator.java
+++ b/src/main/java/com/epam/ta/reportportal/core/item/validator/parent/RetryConditionValidator.java
@@ -2,10 +2,10 @@
 
 import static com.epam.ta.reportportal.commons.Predicates.isNull;
 import static com.epam.ta.reportportal.commons.validation.BusinessRule.expect;
-import static com.epam.ta.reportportal.ws.model.ErrorType.UNABLE_TO_SAVE_CHILD_ITEM_FOR_THE_RETRY;
+import static com.epam.ta.reportportal.ws.reporting.ErrorType.UNABLE_TO_SAVE_CHILD_ITEM_FOR_THE_RETRY;
 
 import com.epam.ta.reportportal.entity.item.TestItem;
-import com.epam.ta.reportportal.ws.model.StartTestItemRQ;
+import com.epam.ta.reportportal.ws.reporting.StartTestItemRQ;
 import org.springframework.core.Ordered;
 import org.springframework.stereotype.Service;
 
diff --git a/src/main/java/com/epam/ta/reportportal/core/item/validator/parent/StartTimeConditionValidator.java b/src/main/java/com/epam/ta/reportportal/core/item/validator/parent/StartTimeConditionValidator.java
index ed453d8b9e..ab95b6de7b 100644
--- a/src/main/java/com/epam/ta/reportportal/core/item/validator/parent/StartTimeConditionValidator.java
+++ b/src/main/java/com/epam/ta/reportportal/core/item/validator/parent/StartTimeConditionValidator.java
@@ -1,11 +1,11 @@
 package com.epam.ta.reportportal.core.item.validator.parent;
 
 import static com.epam.ta.reportportal.commons.validation.BusinessRule.expect;
-import static com.epam.ta.reportportal.ws.model.ErrorType.CHILD_START_TIME_EARLIER_THAN_PARENT;
+import static com.epam.ta.reportportal.ws.reporting.ErrorType.CHILD_START_TIME_EARLIER_THAN_PARENT;
 
 import com.epam.ta.reportportal.commons.Preconditions;
 import com.epam.ta.reportportal.entity.item.TestItem;
-import com.epam.ta.reportportal.ws.model.StartTestItemRQ;
+import com.epam.ta.reportportal.ws.reporting.StartTestItemRQ;
 import org.springframework.core.Ordered;
 import org.springframework.stereotype.Service;
 
diff --git a/src/main/java/com/epam/ta/reportportal/core/jasper/impl/AbstractJasperReportHandler.java b/src/main/java/com/epam/ta/reportportal/core/jasper/impl/AbstractJasperReportHandler.java
index 73773ec557..8af901ae70 100644
--- a/src/main/java/com/epam/ta/reportportal/core/jasper/impl/AbstractJasperReportHandler.java
+++ b/src/main/java/com/epam/ta/reportportal/core/jasper/impl/AbstractJasperReportHandler.java
@@ -15,14 +15,14 @@
  */
 package com.epam.ta.reportportal.core.jasper.impl;
 
-import static com.epam.ta.reportportal.ws.model.ErrorType.BAD_REQUEST_ERROR;
+import static com.epam.ta.reportportal.ws.reporting.ErrorType.BAD_REQUEST_ERROR;
 
 import com.epam.ta.reportportal.commons.validation.BusinessRule;
 import com.epam.ta.reportportal.commons.validation.Suppliers;
 import com.epam.ta.reportportal.core.jasper.GetJasperReportHandler;
 import com.epam.ta.reportportal.entity.jasper.ReportFormat;
 import com.epam.ta.reportportal.exception.ReportPortalException;
-import com.epam.ta.reportportal.ws.model.ErrorType;
+import com.epam.ta.reportportal.ws.reporting.ErrorType;
 import java.io.OutputStream;
 import java.util.Set;
 import net.sf.jasperreports.engine.JRException;
diff --git a/src/main/java/com/epam/ta/reportportal/core/launch/DeleteLaunchHandler.java b/src/main/java/com/epam/ta/reportportal/core/launch/DeleteLaunchHandler.java
index 6e29be827b..1e4a7ee675 100644
--- a/src/main/java/com/epam/ta/reportportal/core/launch/DeleteLaunchHandler.java
+++ b/src/main/java/com/epam/ta/reportportal/core/launch/DeleteLaunchHandler.java
@@ -19,7 +19,7 @@
 import com.epam.ta.reportportal.commons.ReportPortalUser;
 import com.epam.ta.reportportal.model.DeleteBulkRQ;
 import com.epam.ta.reportportal.model.DeleteBulkRS;
-import com.epam.ta.reportportal.ws.model.OperationCompletionRS;
+import com.epam.ta.reportportal.ws.reporting.OperationCompletionRS;
 
 /**
  * Delete Launch request handler
diff --git a/src/main/java/com/epam/ta/reportportal/core/launch/FinishLaunchHandler.java b/src/main/java/com/epam/ta/reportportal/core/launch/FinishLaunchHandler.java
index 5c0b719e05..b2a5770a89 100644
--- a/src/main/java/com/epam/ta/reportportal/core/launch/FinishLaunchHandler.java
+++ b/src/main/java/com/epam/ta/reportportal/core/launch/FinishLaunchHandler.java
@@ -19,7 +19,7 @@
 import com.epam.ta.reportportal.commons.ReportPortalUser;
 import com.epam.ta.reportportal.entity.launch.Launch;
 import com.epam.ta.reportportal.model.launch.FinishLaunchRS;
-import com.epam.ta.reportportal.ws.model.FinishExecutionRQ;
+import com.epam.ta.reportportal.ws.reporting.FinishExecutionRQ;
 
 /**
  * {@link FinishExecutionRQ} request handler
diff --git a/src/main/java/com/epam/ta/reportportal/core/launch/GetLaunchHandler.java b/src/main/java/com/epam/ta/reportportal/core/launch/GetLaunchHandler.java
index 3d0bc531c5..cea26cc441 100644
--- a/src/main/java/com/epam/ta/reportportal/core/launch/GetLaunchHandler.java
+++ b/src/main/java/com/epam/ta/reportportal/core/launch/GetLaunchHandler.java
@@ -21,8 +21,8 @@
 import com.epam.ta.reportportal.entity.jasper.ReportFormat;
 import com.epam.ta.reportportal.entity.launch.Launch;
 import com.epam.ta.reportportal.entity.widget.content.ChartStatisticsContent;
-import com.epam.ta.reportportal.ws.model.launch.LaunchResource;
 import com.epam.ta.reportportal.ws.model.launch.cluster.ClusterInfoResource;
+import com.epam.ta.reportportal.ws.reporting.LaunchResource;
 import java.io.OutputStream;
 import java.util.List;
 import java.util.Map;
diff --git a/src/main/java/com/epam/ta/reportportal/core/launch/MergeLaunchHandler.java b/src/main/java/com/epam/ta/reportportal/core/launch/MergeLaunchHandler.java
index fe895aadae..6aab3985aa 100644
--- a/src/main/java/com/epam/ta/reportportal/core/launch/MergeLaunchHandler.java
+++ b/src/main/java/com/epam/ta/reportportal/core/launch/MergeLaunchHandler.java
@@ -17,8 +17,8 @@
 package com.epam.ta.reportportal.core.launch;
 
 import com.epam.ta.reportportal.commons.ReportPortalUser;
-import com.epam.ta.reportportal.model.launch.MergeLaunchesRQ;
-import com.epam.ta.reportportal.ws.model.launch.LaunchResource;
+import com.epam.ta.reportportal.ws.reporting.LaunchResource;
+import com.epam.ta.reportportal.ws.reporting.MergeLaunchesRQ;
 
 /**
  * Merge launches handler in common one
diff --git a/src/main/java/com/epam/ta/reportportal/core/launch/StartLaunchHandler.java b/src/main/java/com/epam/ta/reportportal/core/launch/StartLaunchHandler.java
index b5c551b266..51b1604b99 100644
--- a/src/main/java/com/epam/ta/reportportal/core/launch/StartLaunchHandler.java
+++ b/src/main/java/com/epam/ta/reportportal/core/launch/StartLaunchHandler.java
@@ -20,10 +20,10 @@
 
 import com.epam.ta.reportportal.commons.ReportPortalUser;
 import com.epam.ta.reportportal.entity.project.ProjectRole;
-import com.epam.ta.reportportal.ws.model.ErrorType;
-import com.epam.ta.reportportal.ws.model.launch.Mode;
-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.ErrorType;
+import com.epam.ta.reportportal.ws.reporting.Mode;
+import com.epam.ta.reportportal.ws.reporting.StartLaunchRQ;
+import com.epam.ta.reportportal.ws.reporting.StartLaunchRS;
 import java.util.function.Predicate;
 
 /**
diff --git a/src/main/java/com/epam/ta/reportportal/core/launch/StopLaunchHandler.java b/src/main/java/com/epam/ta/reportportal/core/launch/StopLaunchHandler.java
index 5ed167fda8..98c4538a23 100644
--- a/src/main/java/com/epam/ta/reportportal/core/launch/StopLaunchHandler.java
+++ b/src/main/java/com/epam/ta/reportportal/core/launch/StopLaunchHandler.java
@@ -18,8 +18,8 @@
 
 import com.epam.ta.reportportal.commons.ReportPortalUser;
 import com.epam.ta.reportportal.model.BulkRQ;
-import com.epam.ta.reportportal.ws.model.FinishExecutionRQ;
-import com.epam.ta.reportportal.ws.model.OperationCompletionRS;
+import com.epam.ta.reportportal.ws.reporting.FinishExecutionRQ;
+import com.epam.ta.reportportal.ws.reporting.OperationCompletionRS;
 import java.util.List;
 
 /**
diff --git a/src/main/java/com/epam/ta/reportportal/core/launch/UpdateLaunchHandler.java b/src/main/java/com/epam/ta/reportportal/core/launch/UpdateLaunchHandler.java
index 487812963f..9105b19a4d 100644
--- a/src/main/java/com/epam/ta/reportportal/core/launch/UpdateLaunchHandler.java
+++ b/src/main/java/com/epam/ta/reportportal/core/launch/UpdateLaunchHandler.java
@@ -21,8 +21,8 @@
 import com.epam.ta.reportportal.model.launch.AnalyzeLaunchRQ;
 import com.epam.ta.reportportal.model.launch.UpdateLaunchRQ;
 import com.epam.ta.reportportal.model.launch.cluster.CreateClustersRQ;
-import com.epam.ta.reportportal.ws.model.BulkInfoUpdateRQ;
-import com.epam.ta.reportportal.ws.model.OperationCompletionRS;
+import com.epam.ta.reportportal.ws.reporting.BulkInfoUpdateRQ;
+import com.epam.ta.reportportal.ws.reporting.OperationCompletionRS;
 import java.util.List;
 
 /**
diff --git a/src/main/java/com/epam/ta/reportportal/core/launch/cluster/GetClusterHandlerImpl.java b/src/main/java/com/epam/ta/reportportal/core/launch/cluster/GetClusterHandlerImpl.java
index c8734e03a9..27f52530ab 100644
--- a/src/main/java/com/epam/ta/reportportal/core/launch/cluster/GetClusterHandlerImpl.java
+++ b/src/main/java/com/epam/ta/reportportal/core/launch/cluster/GetClusterHandlerImpl.java
@@ -25,7 +25,7 @@
 import com.epam.ta.reportportal.entity.launch.Launch;
 import com.epam.ta.reportportal.exception.ReportPortalException;
 import com.epam.ta.reportportal.ws.converter.PagedResourcesAssembler;
-import com.epam.ta.reportportal.ws.model.ErrorType;
+import com.epam.ta.reportportal.ws.reporting.ErrorType;
 import com.epam.ta.reportportal.ws.model.launch.cluster.ClusterInfoResource;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.ApplicationEventPublisher;
diff --git a/src/main/java/com/epam/ta/reportportal/core/launch/cluster/UniqueErrorGenerator.java b/src/main/java/com/epam/ta/reportportal/core/launch/cluster/UniqueErrorGenerator.java
index ae2e4432c2..23374d56c0 100644
--- a/src/main/java/com/epam/ta/reportportal/core/launch/cluster/UniqueErrorGenerator.java
+++ b/src/main/java/com/epam/ta/reportportal/core/launch/cluster/UniqueErrorGenerator.java
@@ -24,7 +24,7 @@
 import com.epam.ta.reportportal.pipeline.PipelineConstructor;
 import com.epam.ta.reportportal.pipeline.PipelinePart;
 import com.epam.ta.reportportal.pipeline.TransactionalPipeline;
-import com.epam.ta.reportportal.ws.model.ErrorType;
+import com.epam.ta.reportportal.ws.reporting.ErrorType;
 import java.util.List;
 import java.util.function.Predicate;
 import org.slf4j.Logger;
diff --git a/src/main/java/com/epam/ta/reportportal/core/launch/cluster/pipeline/data/AnalyzerClusterDataProvider.java b/src/main/java/com/epam/ta/reportportal/core/launch/cluster/pipeline/data/AnalyzerClusterDataProvider.java
index f1fea1c8b4..6ccec8ca9b 100644
--- a/src/main/java/com/epam/ta/reportportal/core/launch/cluster/pipeline/data/AnalyzerClusterDataProvider.java
+++ b/src/main/java/com/epam/ta/reportportal/core/launch/cluster/pipeline/data/AnalyzerClusterDataProvider.java
@@ -23,9 +23,9 @@
 import com.epam.ta.reportportal.core.analyzer.auto.client.model.cluster.GenerateClustersRq;
 import com.epam.ta.reportportal.core.launch.cluster.config.ClusterEntityContext;
 import com.epam.ta.reportportal.core.launch.cluster.config.GenerateClustersConfig;
-import com.epam.ta.reportportal.ws.model.ErrorType;
 import com.epam.ta.reportportal.ws.model.analyzer.IndexLaunch;
 import com.epam.ta.reportportal.ws.model.project.AnalyzerConfig;
+import com.epam.ta.reportportal.ws.reporting.ErrorType;
 import java.util.Optional;
 import java.util.function.Predicate;
 
diff --git a/src/main/java/com/epam/ta/reportportal/core/launch/impl/DeleteLaunchHandlerImpl.java b/src/main/java/com/epam/ta/reportportal/core/launch/impl/DeleteLaunchHandlerImpl.java
index f0408037a0..178c4a5b41 100644
--- a/src/main/java/com/epam/ta/reportportal/core/launch/impl/DeleteLaunchHandlerImpl.java
+++ b/src/main/java/com/epam/ta/reportportal/core/launch/impl/DeleteLaunchHandlerImpl.java
@@ -22,9 +22,9 @@
 import static com.epam.ta.reportportal.commons.validation.Suppliers.formattedSupplier;
 import static com.epam.ta.reportportal.entity.project.ProjectRole.PROJECT_MANAGER;
 import static com.epam.ta.reportportal.ws.converter.converters.LaunchConverter.TO_ACTIVITY_RESOURCE;
-import static com.epam.ta.reportportal.ws.model.ErrorType.ACCESS_DENIED;
-import static com.epam.ta.reportportal.ws.model.ErrorType.FORBIDDEN_OPERATION;
-import static com.epam.ta.reportportal.ws.model.ErrorType.LAUNCH_IS_NOT_FINISHED;
+import static com.epam.ta.reportportal.ws.reporting.ErrorType.ACCESS_DENIED;
+import static com.epam.ta.reportportal.ws.reporting.ErrorType.FORBIDDEN_OPERATION;
+import static com.epam.ta.reportportal.ws.reporting.ErrorType.LAUNCH_IS_NOT_FINISHED;
 
 import com.epam.reportportal.events.ElementsDeletedEvent;
 import com.epam.ta.reportportal.commons.ReportPortalUser;
@@ -44,9 +44,9 @@
 import com.epam.ta.reportportal.model.DeleteBulkRQ;
 import com.epam.ta.reportportal.model.DeleteBulkRS;
 import com.epam.ta.reportportal.model.activity.LaunchActivityResource;
-import com.epam.ta.reportportal.ws.model.ErrorRS;
-import com.epam.ta.reportportal.ws.model.ErrorType;
-import com.epam.ta.reportportal.ws.model.OperationCompletionRS;
+import com.epam.ta.reportportal.ws.reporting.ErrorRS;
+import com.epam.ta.reportportal.ws.reporting.ErrorType;
+import com.epam.ta.reportportal.ws.reporting.OperationCompletionRS;
 import com.google.api.client.util.Maps;
 import com.google.common.collect.Lists;
 import java.util.List;
diff --git a/src/main/java/com/epam/ta/reportportal/core/launch/impl/FinishLaunchHandlerAsyncImpl.java b/src/main/java/com/epam/ta/reportportal/core/launch/impl/FinishLaunchHandlerAsyncImpl.java
index 0460ef054b..274fc65202 100644
--- a/src/main/java/com/epam/ta/reportportal/core/launch/impl/FinishLaunchHandlerAsyncImpl.java
+++ b/src/main/java/com/epam/ta/reportportal/core/launch/impl/FinishLaunchHandlerAsyncImpl.java
@@ -22,9 +22,9 @@
 import com.epam.ta.reportportal.core.launch.FinishLaunchHandler;
 import com.epam.ta.reportportal.model.launch.FinishLaunchRS;
 import com.epam.ta.reportportal.util.ReportingQueueService;
-import com.epam.ta.reportportal.ws.model.FinishExecutionRQ;
 import com.epam.ta.reportportal.ws.rabbit.MessageHeaders;
 import com.epam.ta.reportportal.ws.rabbit.RequestType;
+import com.epam.ta.reportportal.ws.reporting.FinishExecutionRQ;
 import java.util.Map;
 import org.springframework.amqp.core.AmqpTemplate;
 import org.springframework.beans.factory.annotation.Autowired;
diff --git a/src/main/java/com/epam/ta/reportportal/core/launch/impl/FinishLaunchHandlerImpl.java b/src/main/java/com/epam/ta/reportportal/core/launch/impl/FinishLaunchHandlerImpl.java
index be6d10999f..460664bd98 100644
--- a/src/main/java/com/epam/ta/reportportal/core/launch/impl/FinishLaunchHandlerImpl.java
+++ b/src/main/java/com/epam/ta/reportportal/core/launch/impl/FinishLaunchHandlerImpl.java
@@ -21,7 +21,7 @@
 import static com.epam.ta.reportportal.core.launch.util.LinkGenerator.generateLaunchLink;
 import static com.epam.ta.reportportal.entity.enums.StatusEnum.FAILED;
 import static com.epam.ta.reportportal.entity.enums.StatusEnum.PASSED;
-import static com.epam.ta.reportportal.ws.model.ErrorType.LAUNCH_NOT_FOUND;
+import static com.epam.ta.reportportal.ws.reporting.ErrorType.LAUNCH_NOT_FOUND;
 
 import com.epam.reportportal.extension.event.LaunchFinishedPluginEvent;
 import com.epam.ta.reportportal.commons.ReportPortalUser;
@@ -34,7 +34,7 @@
 import com.epam.ta.reportportal.exception.ReportPortalException;
 import com.epam.ta.reportportal.model.launch.FinishLaunchRS;
 import com.epam.ta.reportportal.ws.converter.builders.LaunchBuilder;
-import com.epam.ta.reportportal.ws.model.FinishExecutionRQ;
+import com.epam.ta.reportportal.ws.reporting.FinishExecutionRQ;
 import java.util.Optional;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
diff --git a/src/main/java/com/epam/ta/reportportal/core/launch/impl/GetLaunchHandlerImpl.java b/src/main/java/com/epam/ta/reportportal/core/launch/impl/GetLaunchHandlerImpl.java
index 666232300e..137aa655e8 100644
--- a/src/main/java/com/epam/ta/reportportal/core/launch/impl/GetLaunchHandlerImpl.java
+++ b/src/main/java/com/epam/ta/reportportal/core/launch/impl/GetLaunchHandlerImpl.java
@@ -37,12 +37,10 @@
 import static com.epam.ta.reportportal.dao.constant.WidgetContentRepositoryConstants.EXECUTIONS_PASSED;
 import static com.epam.ta.reportportal.dao.constant.WidgetContentRepositoryConstants.EXECUTIONS_SKIPPED;
 import static com.epam.ta.reportportal.entity.enums.StatusEnum.IN_PROGRESS;
-import static com.epam.ta.reportportal.ws.model.ErrorType.ACCESS_DENIED;
-import static com.epam.ta.reportportal.ws.model.ErrorType.INCORRECT_FILTER_PARAMETERS;
-import static com.epam.ta.reportportal.ws.model.ErrorType.LAUNCH_NOT_FOUND;
 import static com.epam.ta.reportportal.ws.model.ValidationConstraints.MAX_LAUNCH_NAME_LENGTH;
-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.ErrorType.ACCESS_DENIED;
+import static com.epam.ta.reportportal.ws.reporting.ErrorType.INCORRECT_FILTER_PARAMETERS;
+import static com.epam.ta.reportportal.ws.reporting.ErrorType.LAUNCH_NOT_FOUND;
 import static java.util.Collections.singletonMap;
 import static java.util.Optional.ofNullable;
 
@@ -77,10 +75,10 @@
 import com.epam.ta.reportportal.exception.ReportPortalException;
 import com.epam.ta.reportportal.ws.converter.PagedResourcesAssembler;
 import com.epam.ta.reportportal.ws.converter.converters.LaunchConverter;
-import com.epam.ta.reportportal.ws.model.ErrorType;
-import com.epam.ta.reportportal.ws.model.launch.LaunchResource;
-import com.epam.ta.reportportal.ws.model.launch.Mode;
 import com.epam.ta.reportportal.ws.model.launch.cluster.ClusterInfoResource;
+import com.epam.ta.reportportal.ws.reporting.ErrorType;
+import com.epam.ta.reportportal.ws.reporting.LaunchResource;
+import com.epam.ta.reportportal.ws.reporting.Mode;
 import com.google.common.base.Preconditions;
 import com.google.common.collect.Lists;
 import java.io.OutputStream;
@@ -196,7 +194,7 @@ public Iterable<LaunchResource> getProjectLaunches(ReportPortalUser.ProjectDetai
             projectDetails.getProjectId()
         ));
 
-    filter = addLaunchCommonCriteria(DEFAULT, filter);
+    filter = addLaunchCommonCriteria(Mode.DEFAULT, filter);
     Page<Launch> launches =
         launchRepository.findByFilter(ProjectFilter.of(filter, project.getId()), pageable);
     return getLaunchResources(launches);
@@ -210,7 +208,7 @@ public Iterable<LaunchResource> getProjectLaunches(ReportPortalUser.ProjectDetai
   public Iterable<LaunchResource> getDebugLaunches(ReportPortalUser.ProjectDetails projectDetails,
       Filter filter, Pageable pageable) {
     validateModeConditions(filter);
-    filter = addLaunchCommonCriteria(DEBUG, filter);
+    filter = addLaunchCommonCriteria(Mode.DEBUG, filter);
     Page<Launch> launches =
         launchRepository.findByFilter(ProjectFilter.of(filter, projectDetails.getProjectId()),
             pageable
@@ -245,7 +243,7 @@ public Iterable<LaunchResource> getLatestLaunches(ReportPortalUser.ProjectDetail
             projectDetails.getProjectId()
         ));
 
-    filter = addLaunchCommonCriteria(DEFAULT, filter);
+    filter = addLaunchCommonCriteria(Mode.DEFAULT, filter);
 
     Page<Launch> launches =
         launchRepository.findAllLatestByFilter(ProjectFilter.of(filter, project.getId()), pageable);
diff --git a/src/main/java/com/epam/ta/reportportal/core/launch/impl/MergeLaunchHandlerImpl.java b/src/main/java/com/epam/ta/reportportal/core/launch/impl/MergeLaunchHandlerImpl.java
index de317400f3..80011c059c 100644
--- a/src/main/java/com/epam/ta/reportportal/core/launch/impl/MergeLaunchHandlerImpl.java
+++ b/src/main/java/com/epam/ta/reportportal/core/launch/impl/MergeLaunchHandlerImpl.java
@@ -22,34 +22,32 @@
 import static com.epam.ta.reportportal.commons.validation.BusinessRule.expect;
 import static com.epam.ta.reportportal.entity.enums.StatusEnum.IN_PROGRESS;
 import static com.epam.ta.reportportal.entity.user.UserRole.ADMINISTRATOR;
-import static com.epam.ta.reportportal.ws.model.ErrorType.ACCESS_DENIED;
-import static com.epam.ta.reportportal.ws.model.ErrorType.FORBIDDEN_OPERATION;
-import static com.epam.ta.reportportal.ws.model.ErrorType.LAUNCH_IS_NOT_FINISHED;
-import static com.epam.ta.reportportal.ws.model.ErrorType.LAUNCH_NOT_FOUND;
-import static com.epam.ta.reportportal.ws.model.ErrorType.PROJECT_NOT_FOUND;
-import static com.epam.ta.reportportal.ws.model.ErrorType.UNSUPPORTED_MERGE_STRATEGY_TYPE;
+import static com.epam.ta.reportportal.ws.reporting.ErrorType.ACCESS_DENIED;
+import static com.epam.ta.reportportal.ws.reporting.ErrorType.FORBIDDEN_OPERATION;
+import static com.epam.ta.reportportal.ws.reporting.ErrorType.LAUNCH_IS_NOT_FINISHED;
+import static com.epam.ta.reportportal.ws.reporting.ErrorType.LAUNCH_NOT_FOUND;
+import static com.epam.ta.reportportal.ws.reporting.ErrorType.PROJECT_NOT_FOUND;
+import static com.epam.ta.reportportal.ws.reporting.ErrorType.UNSUPPORTED_MERGE_STRATEGY_TYPE;
 
 import com.epam.ta.reportportal.commons.Preconditions;
 import com.epam.ta.reportportal.commons.ReportPortalUser;
 import com.epam.ta.reportportal.commons.validation.Suppliers;
 import com.epam.ta.reportportal.core.analyzer.auto.LogIndexer;
 import com.epam.ta.reportportal.core.analyzer.auto.impl.AnalyzerUtils;
-import com.epam.ta.reportportal.core.analyzer.auto.impl.preparer.LaunchPreparerService;
 import com.epam.ta.reportportal.core.item.impl.merge.strategy.LaunchMergeFactory;
 import com.epam.ta.reportportal.core.item.impl.merge.strategy.MergeStrategyType;
 import com.epam.ta.reportportal.core.launch.MergeLaunchHandler;
 import com.epam.ta.reportportal.core.statistics.StatisticsHelper;
 import com.epam.ta.reportportal.dao.LaunchRepository;
 import com.epam.ta.reportportal.dao.ProjectRepository;
-import com.epam.ta.reportportal.dao.TestItemRepository;
 import com.epam.ta.reportportal.entity.launch.Launch;
 import com.epam.ta.reportportal.entity.project.Project;
 import com.epam.ta.reportportal.entity.project.ProjectRole;
 import com.epam.ta.reportportal.exception.ReportPortalException;
-import com.epam.ta.reportportal.model.launch.MergeLaunchesRQ;
 import com.epam.ta.reportportal.ws.converter.converters.LaunchConverter;
-import com.epam.ta.reportportal.ws.model.ErrorType;
-import com.epam.ta.reportportal.ws.model.launch.LaunchResource;
+import com.epam.ta.reportportal.ws.reporting.ErrorType;
+import com.epam.ta.reportportal.ws.reporting.LaunchResource;
+import com.epam.ta.reportportal.ws.reporting.MergeLaunchesRQ;
 import java.util.List;
 import java.util.Set;
 import org.apache.commons.collections.CollectionUtils;
@@ -66,29 +64,23 @@ public class MergeLaunchHandlerImpl implements MergeLaunchHandler {
 
   private final LaunchRepository launchRepository;
 
-  private final TestItemRepository testItemRepository;
-
   private final ProjectRepository projectRepository;
 
   private final LaunchMergeFactory launchMergeFactory;
 
   private final LaunchConverter launchConverter;
 
-  private final LaunchPreparerService launchPreparerService;
-
   private final LogIndexer logIndexer;
 
   @Autowired
   public MergeLaunchHandlerImpl(LaunchRepository launchRepository,
-      TestItemRepository testItemRepository, ProjectRepository projectRepository,
+      ProjectRepository projectRepository,
       LaunchMergeFactory launchMergeFactory, LaunchConverter launchConverter,
-      LaunchPreparerService launchPreparerService, LogIndexer logIndexer) {
+      LogIndexer logIndexer) {
     this.launchRepository = launchRepository;
-    this.testItemRepository = testItemRepository;
     this.projectRepository = projectRepository;
     this.launchMergeFactory = launchMergeFactory;
     this.launchConverter = launchConverter;
-    this.launchPreparerService = launchPreparerService;
     this.logIndexer = logIndexer;
   }
 
diff --git a/src/main/java/com/epam/ta/reportportal/core/launch/impl/MetadataUpdater.java b/src/main/java/com/epam/ta/reportportal/core/launch/impl/MetadataUpdater.java
index 61e1470955..cf6c74cb07 100644
--- a/src/main/java/com/epam/ta/reportportal/core/launch/impl/MetadataUpdater.java
+++ b/src/main/java/com/epam/ta/reportportal/core/launch/impl/MetadataUpdater.java
@@ -16,7 +16,7 @@
 
 package com.epam.ta.reportportal.core.launch.impl;
 
-import com.epam.ta.reportportal.ws.model.launch.LaunchResource;
+import com.epam.ta.reportportal.ws.reporting.LaunchResource;
 import java.util.Collection;
 
 /**
diff --git a/src/main/java/com/epam/ta/reportportal/core/launch/impl/StartLaunchHandlerAsyncImpl.java b/src/main/java/com/epam/ta/reportportal/core/launch/impl/StartLaunchHandlerAsyncImpl.java
index 9f90037d19..e837e76031 100644
--- a/src/main/java/com/epam/ta/reportportal/core/launch/impl/StartLaunchHandlerAsyncImpl.java
+++ b/src/main/java/com/epam/ta/reportportal/core/launch/impl/StartLaunchHandlerAsyncImpl.java
@@ -21,8 +21,8 @@
 import com.epam.ta.reportportal.commons.ReportPortalUser;
 import com.epam.ta.reportportal.core.launch.StartLaunchHandler;
 import com.epam.ta.reportportal.util.ReportingQueueService;
-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.StartLaunchRQ;
+import com.epam.ta.reportportal.ws.reporting.StartLaunchRS;
 import com.epam.ta.reportportal.ws.rabbit.MessageHeaders;
 import com.epam.ta.reportportal.ws.rabbit.RequestType;
 import java.util.Map;
diff --git a/src/main/java/com/epam/ta/reportportal/core/launch/impl/StartLaunchHandlerImpl.java b/src/main/java/com/epam/ta/reportportal/core/launch/impl/StartLaunchHandlerImpl.java
index 43abc35b67..20ad6631a7 100644
--- a/src/main/java/com/epam/ta/reportportal/core/launch/impl/StartLaunchHandlerImpl.java
+++ b/src/main/java/com/epam/ta/reportportal/core/launch/impl/StartLaunchHandlerImpl.java
@@ -27,8 +27,8 @@
 import com.epam.ta.reportportal.dao.LaunchRepository;
 import com.epam.ta.reportportal.entity.launch.Launch;
 import com.epam.ta.reportportal.ws.converter.builders.LaunchBuilder;
-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.StartLaunchRQ;
+import com.epam.ta.reportportal.ws.reporting.StartLaunchRS;
 import java.util.Optional;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.ApplicationEventPublisher;
diff --git a/src/main/java/com/epam/ta/reportportal/core/launch/impl/StopLaunchHandlerImpl.java b/src/main/java/com/epam/ta/reportportal/core/launch/impl/StopLaunchHandlerImpl.java
index 29208f1a5b..f6a8ef9ebe 100644
--- a/src/main/java/com/epam/ta/reportportal/core/launch/impl/StopLaunchHandlerImpl.java
+++ b/src/main/java/com/epam/ta/reportportal/core/launch/impl/StopLaunchHandlerImpl.java
@@ -31,10 +31,10 @@
 import com.epam.ta.reportportal.exception.ReportPortalException;
 import com.epam.ta.reportportal.model.BulkRQ;
 import com.epam.ta.reportportal.ws.converter.builders.LaunchBuilder;
-import com.epam.ta.reportportal.ws.model.ErrorType;
-import com.epam.ta.reportportal.ws.model.FinishExecutionRQ;
-import com.epam.ta.reportportal.ws.model.OperationCompletionRS;
-import com.epam.ta.reportportal.ws.model.attribute.ItemAttributeResource;
+import com.epam.ta.reportportal.ws.reporting.ErrorType;
+import com.epam.ta.reportportal.ws.reporting.FinishExecutionRQ;
+import com.epam.ta.reportportal.ws.reporting.OperationCompletionRS;
+import com.epam.ta.reportportal.ws.reporting.ItemAttributeResource;
 import java.util.Date;
 import java.util.List;
 import org.springframework.beans.factory.annotation.Autowired;
diff --git a/src/main/java/com/epam/ta/reportportal/core/launch/impl/UpdateLaunchHandlerImpl.java b/src/main/java/com/epam/ta/reportportal/core/launch/impl/UpdateLaunchHandlerImpl.java
index 0752e1a998..347e9b6e35 100644
--- a/src/main/java/com/epam/ta/reportportal/core/launch/impl/UpdateLaunchHandlerImpl.java
+++ b/src/main/java/com/epam/ta/reportportal/core/launch/impl/UpdateLaunchHandlerImpl.java
@@ -22,10 +22,10 @@
 import static com.epam.ta.reportportal.commons.validation.BusinessRule.expect;
 import static com.epam.ta.reportportal.entity.project.ProjectRole.PROJECT_MANAGER;
 import static com.epam.ta.reportportal.entity.project.ProjectUtils.getConfigParameters;
-import static com.epam.ta.reportportal.ws.model.ErrorType.ACCESS_DENIED;
-import static com.epam.ta.reportportal.ws.model.ErrorType.INCORRECT_REQUEST;
-import static com.epam.ta.reportportal.ws.model.ErrorType.LAUNCH_NOT_FOUND;
-import static com.epam.ta.reportportal.ws.model.ErrorType.PROJECT_NOT_FOUND;
+import static com.epam.ta.reportportal.ws.reporting.ErrorType.ACCESS_DENIED;
+import static com.epam.ta.reportportal.ws.reporting.ErrorType.INCORRECT_REQUEST;
+import static com.epam.ta.reportportal.ws.reporting.ErrorType.LAUNCH_NOT_FOUND;
+import static com.epam.ta.reportportal.ws.reporting.ErrorType.PROJECT_NOT_FOUND;
 import static java.util.stream.Collectors.toList;
 
 import com.epam.ta.reportportal.commons.ReportPortalUser;
@@ -57,9 +57,9 @@
 import com.epam.ta.reportportal.util.ItemInfoUtils;
 import com.epam.ta.reportportal.ws.converter.builders.LaunchBuilder;
 import com.epam.ta.reportportal.ws.converter.converters.ItemAttributeConverter;
-import com.epam.ta.reportportal.ws.model.BulkInfoUpdateRQ;
-import com.epam.ta.reportportal.ws.model.OperationCompletionRS;
-import com.epam.ta.reportportal.ws.model.launch.Mode;
+import com.epam.ta.reportportal.ws.reporting.BulkInfoUpdateRQ;
+import com.epam.ta.reportportal.ws.reporting.OperationCompletionRS;
+import com.epam.ta.reportportal.ws.reporting.Mode;
 import com.epam.ta.reportportal.ws.model.project.AnalyzerConfig;
 import com.google.common.collect.Lists;
 import java.util.List;
diff --git a/src/main/java/com/epam/ta/reportportal/core/launch/rerun/RerunHandler.java b/src/main/java/com/epam/ta/reportportal/core/launch/rerun/RerunHandler.java
index 031ac97508..e438b57cdf 100644
--- a/src/main/java/com/epam/ta/reportportal/core/launch/rerun/RerunHandler.java
+++ b/src/main/java/com/epam/ta/reportportal/core/launch/rerun/RerunHandler.java
@@ -19,9 +19,9 @@
 import com.epam.ta.reportportal.commons.ReportPortalUser;
 import com.epam.ta.reportportal.entity.item.TestItem;
 import com.epam.ta.reportportal.entity.launch.Launch;
-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.StartLaunchRQ;
+import com.epam.ta.reportportal.ws.reporting.StartTestItemRQ;
+import com.epam.ta.reportportal.ws.reporting.ItemCreatedRS;
+import com.epam.ta.reportportal.ws.reporting.StartLaunchRQ;
 import java.util.Optional;
 
 /**
diff --git a/src/main/java/com/epam/ta/reportportal/core/launch/rerun/RerunHandlerImpl.java b/src/main/java/com/epam/ta/reportportal/core/launch/rerun/RerunHandlerImpl.java
index 7933d0421e..d7b67ec675 100644
--- a/src/main/java/com/epam/ta/reportportal/core/launch/rerun/RerunHandlerImpl.java
+++ b/src/main/java/com/epam/ta/reportportal/core/launch/rerun/RerunHandlerImpl.java
@@ -43,10 +43,10 @@
 import com.epam.ta.reportportal.exception.ReportPortalException;
 import com.epam.ta.reportportal.ws.converter.builders.TestCaseIdEntry;
 import com.epam.ta.reportportal.ws.converter.builders.TestItemBuilder;
-import com.epam.ta.reportportal.ws.model.ErrorType;
-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.StartLaunchRQ;
+import com.epam.ta.reportportal.ws.reporting.ErrorType;
+import com.epam.ta.reportportal.ws.reporting.StartTestItemRQ;
+import com.epam.ta.reportportal.ws.reporting.ItemCreatedRS;
+import com.epam.ta.reportportal.ws.reporting.StartLaunchRQ;
 import java.util.Collections;
 import java.util.List;
 import java.util.Objects;
diff --git a/src/main/java/com/epam/ta/reportportal/core/launch/util/LaunchValidator.java b/src/main/java/com/epam/ta/reportportal/core/launch/util/LaunchValidator.java
index e8825eafd2..9f116a3e25 100644
--- a/src/main/java/com/epam/ta/reportportal/core/launch/util/LaunchValidator.java
+++ b/src/main/java/com/epam/ta/reportportal/core/launch/util/LaunchValidator.java
@@ -26,10 +26,10 @@
 import static com.epam.ta.reportportal.entity.enums.StatusEnum.PASSED;
 import static com.epam.ta.reportportal.entity.enums.StatusEnum.SKIPPED;
 import static com.epam.ta.reportportal.entity.project.ProjectRole.PROJECT_MANAGER;
-import static com.epam.ta.reportportal.ws.model.ErrorType.ACCESS_DENIED;
-import static com.epam.ta.reportportal.ws.model.ErrorType.FINISH_LAUNCH_NOT_ALLOWED;
-import static com.epam.ta.reportportal.ws.model.ErrorType.FINISH_TIME_EARLIER_THAN_START_TIME;
-import static com.epam.ta.reportportal.ws.model.ErrorType.INCORRECT_FINISH_STATUS;
+import static com.epam.ta.reportportal.ws.reporting.ErrorType.ACCESS_DENIED;
+import static com.epam.ta.reportportal.ws.reporting.ErrorType.FINISH_LAUNCH_NOT_ALLOWED;
+import static com.epam.ta.reportportal.ws.reporting.ErrorType.FINISH_TIME_EARLIER_THAN_START_TIME;
+import static com.epam.ta.reportportal.ws.reporting.ErrorType.INCORRECT_FINISH_STATUS;
 
 import com.epam.ta.reportportal.commons.Preconditions;
 import com.epam.ta.reportportal.commons.ReportPortalUser;
@@ -37,7 +37,7 @@
 import com.epam.ta.reportportal.entity.launch.Launch;
 import com.epam.ta.reportportal.entity.project.Project;
 import com.epam.ta.reportportal.entity.user.UserRole;
-import com.epam.ta.reportportal.ws.model.FinishExecutionRQ;
+import com.epam.ta.reportportal.ws.reporting.FinishExecutionRQ;
 import java.util.function.Predicate;
 
 /**
diff --git a/src/main/java/com/epam/ta/reportportal/core/log/CreateLogHandler.java b/src/main/java/com/epam/ta/reportportal/core/log/CreateLogHandler.java
index 4e584d1504..8570ecad24 100644
--- a/src/main/java/com/epam/ta/reportportal/core/log/CreateLogHandler.java
+++ b/src/main/java/com/epam/ta/reportportal/core/log/CreateLogHandler.java
@@ -22,9 +22,9 @@
 import com.epam.ta.reportportal.commons.ReportPortalUser;
 import com.epam.ta.reportportal.commons.validation.Suppliers;
 import com.epam.ta.reportportal.entity.enums.LogLevel;
-import com.epam.ta.reportportal.ws.model.EntryCreatedAsyncRS;
-import com.epam.ta.reportportal.ws.model.ErrorType;
-import com.epam.ta.reportportal.ws.model.log.SaveLogRQ;
+import com.epam.ta.reportportal.ws.reporting.EntryCreatedAsyncRS;
+import com.epam.ta.reportportal.ws.reporting.ErrorType;
+import com.epam.ta.reportportal.ws.reporting.SaveLogRQ;
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
 import org.springframework.web.multipart.MultipartFile;
diff --git a/src/main/java/com/epam/ta/reportportal/core/log/DeleteLogHandler.java b/src/main/java/com/epam/ta/reportportal/core/log/DeleteLogHandler.java
index d212f2129e..8493624fa2 100644
--- a/src/main/java/com/epam/ta/reportportal/core/log/DeleteLogHandler.java
+++ b/src/main/java/com/epam/ta/reportportal/core/log/DeleteLogHandler.java
@@ -17,7 +17,7 @@
 package com.epam.ta.reportportal.core.log;
 
 import com.epam.ta.reportportal.commons.ReportPortalUser;
-import com.epam.ta.reportportal.ws.model.OperationCompletionRS;
+import com.epam.ta.reportportal.ws.reporting.OperationCompletionRS;
 
 public interface DeleteLogHandler {
 
diff --git a/src/main/java/com/epam/ta/reportportal/core/log/impl/CreateLogHandlerAsyncImpl.java b/src/main/java/com/epam/ta/reportportal/core/log/impl/CreateLogHandlerAsyncImpl.java
index 371d492f8b..9524b53465 100644
--- a/src/main/java/com/epam/ta/reportportal/core/log/impl/CreateLogHandlerAsyncImpl.java
+++ b/src/main/java/com/epam/ta/reportportal/core/log/impl/CreateLogHandlerAsyncImpl.java
@@ -23,8 +23,8 @@
 import com.epam.ta.reportportal.core.configs.rabbit.DeserializablePair;
 import com.epam.ta.reportportal.core.log.CreateLogHandler;
 import com.epam.ta.reportportal.util.ReportingQueueService;
-import com.epam.ta.reportportal.ws.model.EntryCreatedAsyncRS;
-import com.epam.ta.reportportal.ws.model.log.SaveLogRQ;
+import com.epam.ta.reportportal.ws.reporting.EntryCreatedAsyncRS;
+import com.epam.ta.reportportal.ws.reporting.SaveLogRQ;
 import com.epam.ta.reportportal.ws.rabbit.MessageHeaders;
 import com.epam.ta.reportportal.ws.rabbit.RequestType;
 import java.util.Map;
diff --git a/src/main/java/com/epam/ta/reportportal/core/log/impl/CreateLogHandlerImpl.java b/src/main/java/com/epam/ta/reportportal/core/log/impl/CreateLogHandlerImpl.java
index 8b2817ca35..a10dbf6a8e 100644
--- a/src/main/java/com/epam/ta/reportportal/core/log/impl/CreateLogHandlerImpl.java
+++ b/src/main/java/com/epam/ta/reportportal/core/log/impl/CreateLogHandlerImpl.java
@@ -34,9 +34,9 @@
 import com.epam.ta.reportportal.entity.log.LogFull;
 import com.epam.ta.reportportal.exception.ReportPortalException;
 import com.epam.ta.reportportal.ws.converter.builders.LogFullBuilder;
-import com.epam.ta.reportportal.ws.model.EntryCreatedAsyncRS;
-import com.epam.ta.reportportal.ws.model.ErrorType;
-import com.epam.ta.reportportal.ws.model.log.SaveLogRQ;
+import com.epam.ta.reportportal.ws.reporting.SaveLogRQ;
+import com.epam.ta.reportportal.ws.reporting.EntryCreatedAsyncRS;
+import com.epam.ta.reportportal.ws.reporting.ErrorType;
 import java.time.LocalDateTime;
 import java.time.ZoneOffset;
 import java.util.concurrent.CompletableFuture;
diff --git a/src/main/java/com/epam/ta/reportportal/core/log/impl/DeleteLogHandlerImpl.java b/src/main/java/com/epam/ta/reportportal/core/log/impl/DeleteLogHandlerImpl.java
index a305082dd3..baece541f8 100644
--- a/src/main/java/com/epam/ta/reportportal/core/log/impl/DeleteLogHandlerImpl.java
+++ b/src/main/java/com/epam/ta/reportportal/core/log/impl/DeleteLogHandlerImpl.java
@@ -22,11 +22,11 @@
 import static com.epam.ta.reportportal.commons.Predicates.notNull;
 import static com.epam.ta.reportportal.commons.validation.BusinessRule.expect;
 import static com.epam.ta.reportportal.commons.validation.Suppliers.formattedSupplier;
-import static com.epam.ta.reportportal.ws.model.ErrorType.ACCESS_DENIED;
-import static com.epam.ta.reportportal.ws.model.ErrorType.FORBIDDEN_OPERATION;
-import static com.epam.ta.reportportal.ws.model.ErrorType.LAUNCH_IS_NOT_FINISHED;
-import static com.epam.ta.reportportal.ws.model.ErrorType.PROJECT_NOT_FOUND;
-import static com.epam.ta.reportportal.ws.model.ErrorType.TEST_ITEM_IS_NOT_FINISHED;
+import static com.epam.ta.reportportal.ws.reporting.ErrorType.ACCESS_DENIED;
+import static com.epam.ta.reportportal.ws.reporting.ErrorType.FORBIDDEN_OPERATION;
+import static com.epam.ta.reportportal.ws.reporting.ErrorType.LAUNCH_IS_NOT_FINISHED;
+import static com.epam.ta.reportportal.ws.reporting.ErrorType.PROJECT_NOT_FOUND;
+import static com.epam.ta.reportportal.ws.reporting.ErrorType.TEST_ITEM_IS_NOT_FINISHED;
 import static java.util.Optional.ofNullable;
 
 import com.epam.ta.reportportal.commons.ReportPortalUser;
@@ -45,8 +45,8 @@
 import com.epam.ta.reportportal.entity.project.ProjectRole;
 import com.epam.ta.reportportal.entity.user.UserRole;
 import com.epam.ta.reportportal.exception.ReportPortalException;
-import com.epam.ta.reportportal.ws.model.ErrorType;
-import com.epam.ta.reportportal.ws.model.OperationCompletionRS;
+import com.epam.ta.reportportal.ws.reporting.ErrorType;
+import com.epam.ta.reportportal.ws.reporting.OperationCompletionRS;
 import java.util.Collections;
 import java.util.Objects;
 import java.util.Optional;
diff --git a/src/main/java/com/epam/ta/reportportal/core/log/impl/GetLogHandlerImpl.java b/src/main/java/com/epam/ta/reportportal/core/log/impl/GetLogHandlerImpl.java
index 3e104b9fe4..c0ee9fe615 100644
--- a/src/main/java/com/epam/ta/reportportal/core/log/impl/GetLogHandlerImpl.java
+++ b/src/main/java/com/epam/ta/reportportal/core/log/impl/GetLogHandlerImpl.java
@@ -22,8 +22,8 @@
 import static com.epam.ta.reportportal.commons.querygen.constant.TestItemCriteriaConstant.CRITERIA_RETRY_PARENT_LAUNCH_ID;
 import static com.epam.ta.reportportal.commons.validation.BusinessRule.expect;
 import static com.epam.ta.reportportal.commons.validation.Suppliers.formattedSupplier;
-import static com.epam.ta.reportportal.ws.model.ErrorType.FORBIDDEN_OPERATION;
-import static com.epam.ta.reportportal.ws.model.ErrorType.LOG_NOT_FOUND;
+import static com.epam.ta.reportportal.ws.reporting.ErrorType.FORBIDDEN_OPERATION;
+import static com.epam.ta.reportportal.ws.reporting.ErrorType.LOG_NOT_FOUND;
 import static java.util.Optional.ofNullable;
 import static java.util.stream.Collectors.groupingBy;
 import static java.util.stream.Collectors.toMap;
@@ -58,7 +58,7 @@
 import com.epam.ta.reportportal.ws.converter.PagedResourcesAssembler;
 import com.epam.ta.reportportal.ws.converter.converters.LogConverter;
 import com.epam.ta.reportportal.ws.converter.converters.TestItemConverter;
-import com.epam.ta.reportportal.ws.model.ErrorType;
+import com.epam.ta.reportportal.ws.reporting.ErrorType;
 import com.google.common.collect.Lists;
 import java.util.AbstractMap;
 import java.util.Collections;
diff --git a/src/main/java/com/epam/ta/reportportal/core/log/impl/SaveLogBinaryDataTaskAsync.java b/src/main/java/com/epam/ta/reportportal/core/log/impl/SaveLogBinaryDataTaskAsync.java
index e7ff9292b2..9bdf7190f9 100644
--- a/src/main/java/com/epam/ta/reportportal/core/log/impl/SaveLogBinaryDataTaskAsync.java
+++ b/src/main/java/com/epam/ta/reportportal/core/log/impl/SaveLogBinaryDataTaskAsync.java
@@ -20,8 +20,8 @@
 import com.epam.ta.reportportal.commons.BinaryDataMetaInfo;
 import com.epam.ta.reportportal.entity.attachment.AttachmentMetaInfo;
 import com.epam.ta.reportportal.exception.ReportPortalException;
-import com.epam.ta.reportportal.ws.model.ErrorType;
-import com.epam.ta.reportportal.ws.model.log.SaveLogRQ;
+import com.epam.ta.reportportal.ws.reporting.ErrorType;
+import com.epam.ta.reportportal.ws.reporting.SaveLogRQ;
 import com.google.common.base.Preconditions;
 import java.util.Optional;
 import java.util.function.Supplier;
diff --git a/src/main/java/com/epam/ta/reportportal/core/onboarding/OnboardingService.java b/src/main/java/com/epam/ta/reportportal/core/onboarding/OnboardingService.java
index 11cb4d0d80..fe3d559ae7 100644
--- a/src/main/java/com/epam/ta/reportportal/core/onboarding/OnboardingService.java
+++ b/src/main/java/com/epam/ta/reportportal/core/onboarding/OnboardingService.java
@@ -18,7 +18,7 @@
 import com.epam.ta.reportportal.dao.OnboardingRepository;
 import com.epam.ta.reportportal.entity.onboarding.Onboarding;
 import com.epam.ta.reportportal.exception.ReportPortalException;
-import com.epam.ta.reportportal.ws.model.ErrorType;
+import com.epam.ta.reportportal.ws.reporting.ErrorType;
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.core.type.TypeReference;
 import com.fasterxml.jackson.databind.ObjectMapper;
diff --git a/src/main/java/com/epam/ta/reportportal/core/preference/UpdatePreferenceHandler.java b/src/main/java/com/epam/ta/reportportal/core/preference/UpdatePreferenceHandler.java
index cfb3c7fdf3..2dc5b9159d 100644
--- a/src/main/java/com/epam/ta/reportportal/core/preference/UpdatePreferenceHandler.java
+++ b/src/main/java/com/epam/ta/reportportal/core/preference/UpdatePreferenceHandler.java
@@ -17,7 +17,7 @@
 package com.epam.ta.reportportal.core.preference;
 
 import com.epam.ta.reportportal.commons.ReportPortalUser;
-import com.epam.ta.reportportal.ws.model.OperationCompletionRS;
+import com.epam.ta.reportportal.ws.reporting.OperationCompletionRS;
 
 /**
  * Update user preference handler
diff --git a/src/main/java/com/epam/ta/reportportal/core/preference/impl/UpdatePreferenceHandlerImpl.java b/src/main/java/com/epam/ta/reportportal/core/preference/impl/UpdatePreferenceHandlerImpl.java
index 3d446ad73a..0c5706e0f0 100644
--- a/src/main/java/com/epam/ta/reportportal/core/preference/impl/UpdatePreferenceHandlerImpl.java
+++ b/src/main/java/com/epam/ta/reportportal/core/preference/impl/UpdatePreferenceHandlerImpl.java
@@ -24,8 +24,8 @@
 import com.epam.ta.reportportal.entity.preference.UserPreference;
 import com.epam.ta.reportportal.exception.ReportPortalException;
 import com.epam.ta.reportportal.ws.converter.builders.UserPreferenceBuilder;
-import com.epam.ta.reportportal.ws.model.ErrorType;
-import com.epam.ta.reportportal.ws.model.OperationCompletionRS;
+import com.epam.ta.reportportal.ws.reporting.ErrorType;
+import com.epam.ta.reportportal.ws.reporting.OperationCompletionRS;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
diff --git a/src/main/java/com/epam/ta/reportportal/core/project/DeleteProjectHandler.java b/src/main/java/com/epam/ta/reportportal/core/project/DeleteProjectHandler.java
index b24d61f5ca..d6c1b0990c 100644
--- a/src/main/java/com/epam/ta/reportportal/core/project/DeleteProjectHandler.java
+++ b/src/main/java/com/epam/ta/reportportal/core/project/DeleteProjectHandler.java
@@ -19,7 +19,7 @@
 import com.epam.ta.reportportal.commons.ReportPortalUser;
 import com.epam.ta.reportportal.exception.ReportPortalException;
 import com.epam.ta.reportportal.model.DeleteBulkRS;
-import com.epam.ta.reportportal.ws.model.OperationCompletionRS;
+import com.epam.ta.reportportal.ws.reporting.OperationCompletionRS;
 import java.util.List;
 
 /**
diff --git a/src/main/java/com/epam/ta/reportportal/core/project/UpdateProjectHandler.java b/src/main/java/com/epam/ta/reportportal/core/project/UpdateProjectHandler.java
index ddce49b0af..a3dca955e5 100644
--- a/src/main/java/com/epam/ta/reportportal/core/project/UpdateProjectHandler.java
+++ b/src/main/java/com/epam/ta/reportportal/core/project/UpdateProjectHandler.java
@@ -23,7 +23,7 @@
 import com.epam.ta.reportportal.model.project.UnassignUsersRQ;
 import com.epam.ta.reportportal.model.project.UpdateProjectRQ;
 import com.epam.ta.reportportal.model.project.email.ProjectNotificationConfigDTO;
-import com.epam.ta.reportportal.ws.model.OperationCompletionRS;
+import com.epam.ta.reportportal.ws.reporting.OperationCompletionRS;
 
 /**
  * Update {@link com.epam.ta.reportportal.entity.project.Project} request handler
diff --git a/src/main/java/com/epam/ta/reportportal/core/project/impl/CreateProjectHandlerImpl.java b/src/main/java/com/epam/ta/reportportal/core/project/impl/CreateProjectHandlerImpl.java
index 29aa901691..a8fa04c139 100644
--- a/src/main/java/com/epam/ta/reportportal/core/project/impl/CreateProjectHandlerImpl.java
+++ b/src/main/java/com/epam/ta/reportportal/core/project/impl/CreateProjectHandlerImpl.java
@@ -43,7 +43,7 @@
 import com.epam.ta.reportportal.model.EntryCreatedRS;
 import com.epam.ta.reportportal.model.project.CreateProjectRQ;
 import com.epam.ta.reportportal.util.PersonalProjectService;
-import com.epam.ta.reportportal.ws.model.ErrorType;
+import com.epam.ta.reportportal.ws.reporting.ErrorType;
 import java.util.Date;
 import java.util.Optional;
 import java.util.Set;
diff --git a/src/main/java/com/epam/ta/reportportal/core/project/impl/DeleteProjectHandlerImpl.java b/src/main/java/com/epam/ta/reportportal/core/project/impl/DeleteProjectHandlerImpl.java
index 117f156ff8..586b0be6af 100644
--- a/src/main/java/com/epam/ta/reportportal/core/project/impl/DeleteProjectHandlerImpl.java
+++ b/src/main/java/com/epam/ta/reportportal/core/project/impl/DeleteProjectHandlerImpl.java
@@ -44,8 +44,8 @@
 import com.epam.ta.reportportal.exception.ReportPortalException;
 import com.epam.ta.reportportal.model.DeleteBulkRS;
 import com.epam.ta.reportportal.util.FeatureFlagHandler;
-import com.epam.ta.reportportal.ws.model.ErrorType;
-import com.epam.ta.reportportal.ws.model.OperationCompletionRS;
+import com.epam.ta.reportportal.ws.reporting.ErrorType;
+import com.epam.ta.reportportal.ws.reporting.OperationCompletionRS;
 import com.google.common.cache.Cache;
 import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
diff --git a/src/main/java/com/epam/ta/reportportal/core/project/impl/GetProjectHandlerImpl.java b/src/main/java/com/epam/ta/reportportal/core/project/impl/GetProjectHandlerImpl.java
index 77a69d497a..ce1ba05391 100644
--- a/src/main/java/com/epam/ta/reportportal/core/project/impl/GetProjectHandlerImpl.java
+++ b/src/main/java/com/epam/ta/reportportal/core/project/impl/GetProjectHandlerImpl.java
@@ -22,7 +22,7 @@
 import static com.epam.ta.reportportal.commons.querygen.constant.UserCriteriaConstant.CRITERIA_FULL_NAME;
 import static com.epam.ta.reportportal.commons.querygen.constant.UserCriteriaConstant.CRITERIA_USER;
 import static com.epam.ta.reportportal.core.analyzer.auto.impl.AnalyzerUtils.getAnalyzerConfig;
-import static com.epam.ta.reportportal.ws.model.ErrorType.PROJECT_NOT_FOUND;
+import static com.epam.ta.reportportal.ws.reporting.ErrorType.PROJECT_NOT_FOUND;
 
 import com.epam.ta.reportportal.commons.Predicates;
 import com.epam.ta.reportportal.commons.ReportPortalUser;
@@ -48,7 +48,7 @@
 import com.epam.ta.reportportal.ws.converter.PagedResourcesAssembler;
 import com.epam.ta.reportportal.ws.converter.converters.ProjectConverter;
 import com.epam.ta.reportportal.ws.converter.converters.UserConverter;
-import com.epam.ta.reportportal.ws.model.ErrorType;
+import com.epam.ta.reportportal.ws.reporting.ErrorType;
 import java.io.OutputStream;
 import java.util.Collections;
 import java.util.List;
diff --git a/src/main/java/com/epam/ta/reportportal/core/project/impl/GetProjectInfoHandlerImpl.java b/src/main/java/com/epam/ta/reportportal/core/project/impl/GetProjectInfoHandlerImpl.java
index 8cc2dcae97..4f58e10dea 100644
--- a/src/main/java/com/epam/ta/reportportal/core/project/impl/GetProjectInfoHandlerImpl.java
+++ b/src/main/java/com/epam/ta/reportportal/core/project/impl/GetProjectInfoHandlerImpl.java
@@ -35,8 +35,8 @@
 import static com.epam.ta.reportportal.entity.activity.ActivityAction.UPDATE_ITEM;
 import static com.epam.ta.reportportal.ws.converter.converters.ActivityConverter.TO_RESOURCE;
 import static com.epam.ta.reportportal.ws.converter.converters.ActivityConverter.TO_RESOURCE_WITH_USER;
-import static com.epam.ta.reportportal.ws.model.ErrorType.BAD_REQUEST_ERROR;
-import static com.epam.ta.reportportal.ws.model.ErrorType.PROJECT_NOT_FOUND;
+import static com.epam.ta.reportportal.ws.reporting.ErrorType.BAD_REQUEST_ERROR;
+import static com.epam.ta.reportportal.ws.reporting.ErrorType.PROJECT_NOT_FOUND;
 import static java.util.Optional.ofNullable;
 import static java.util.stream.Collectors.joining;
 import static java.util.stream.Collectors.toList;
@@ -68,7 +68,7 @@
 import com.epam.ta.reportportal.ws.converter.converters.LaunchConverter;
 import com.epam.ta.reportportal.ws.converter.converters.ProjectSettingsConverter;
 import com.epam.ta.reportportal.ws.model.ActivityResource;
-import com.epam.ta.reportportal.ws.model.launch.Mode;
+import com.epam.ta.reportportal.ws.reporting.Mode;
 import com.google.common.collect.Lists;
 import java.math.RoundingMode;
 import java.sql.Timestamp;
diff --git a/src/main/java/com/epam/ta/reportportal/core/project/impl/UpdateProjectHandlerImpl.java b/src/main/java/com/epam/ta/reportportal/core/project/impl/UpdateProjectHandlerImpl.java
index 743ec71b59..14c5e5b498 100644
--- a/src/main/java/com/epam/ta/reportportal/core/project/impl/UpdateProjectHandlerImpl.java
+++ b/src/main/java/com/epam/ta/reportportal/core/project/impl/UpdateProjectHandlerImpl.java
@@ -31,12 +31,12 @@
 import static com.epam.ta.reportportal.entity.enums.ProjectAttributeEnum.AUTO_PATTERN_ANALYZER_ENABLED;
 import static com.epam.ta.reportportal.entity.enums.SendCase.findByName;
 import static com.epam.ta.reportportal.ws.converter.converters.ProjectActivityConverter.TO_ACTIVITY_RESOURCE;
-import static com.epam.ta.reportportal.ws.model.ErrorType.ACCESS_DENIED;
-import static com.epam.ta.reportportal.ws.model.ErrorType.BAD_REQUEST_ERROR;
-import static com.epam.ta.reportportal.ws.model.ErrorType.PROJECT_NOT_FOUND;
-import static com.epam.ta.reportportal.ws.model.ErrorType.ROLE_NOT_FOUND;
-import static com.epam.ta.reportportal.ws.model.ErrorType.UNABLE_ASSIGN_UNASSIGN_USER_TO_PROJECT;
-import static com.epam.ta.reportportal.ws.model.ErrorType.USER_NOT_FOUND;
+import static com.epam.ta.reportportal.ws.reporting.ErrorType.ACCESS_DENIED;
+import static com.epam.ta.reportportal.ws.reporting.ErrorType.BAD_REQUEST_ERROR;
+import static com.epam.ta.reportportal.ws.reporting.ErrorType.PROJECT_NOT_FOUND;
+import static com.epam.ta.reportportal.ws.reporting.ErrorType.ROLE_NOT_FOUND;
+import static com.epam.ta.reportportal.ws.reporting.ErrorType.UNABLE_ASSIGN_UNASSIGN_USER_TO_PROJECT;
+import static com.epam.ta.reportportal.ws.reporting.ErrorType.USER_NOT_FOUND;
 import static java.util.Optional.ofNullable;
 import static java.util.stream.Collectors.toList;
 import static java.util.stream.Collectors.toSet;
@@ -92,10 +92,10 @@
 import com.epam.ta.reportportal.ws.converter.converters.NotificationConfigConverter;
 import com.epam.ta.reportportal.ws.converter.converters.ProjectConverter;
 import com.epam.ta.reportportal.ws.converter.converters.UserConverter;
-import com.epam.ta.reportportal.ws.model.ErrorType;
-import com.epam.ta.reportportal.ws.model.OperationCompletionRS;
+import com.epam.ta.reportportal.ws.reporting.ErrorType;
+import com.epam.ta.reportportal.ws.reporting.OperationCompletionRS;
 import com.epam.ta.reportportal.ws.model.ValidationConstraints;
-import com.epam.ta.reportportal.ws.model.attribute.ItemAttributeResource;
+import com.epam.ta.reportportal.ws.reporting.ItemAttributeResource;
 import com.google.common.cache.Cache;
 import com.google.common.collect.Lists;
 import java.util.List;
diff --git a/src/main/java/com/epam/ta/reportportal/core/project/settings/DeleteProjectSettingsHandler.java b/src/main/java/com/epam/ta/reportportal/core/project/settings/DeleteProjectSettingsHandler.java
index 92cc4db052..1386e34521 100644
--- a/src/main/java/com/epam/ta/reportportal/core/project/settings/DeleteProjectSettingsHandler.java
+++ b/src/main/java/com/epam/ta/reportportal/core/project/settings/DeleteProjectSettingsHandler.java
@@ -17,7 +17,7 @@
 package com.epam.ta.reportportal.core.project.settings;
 
 import com.epam.ta.reportportal.commons.ReportPortalUser;
-import com.epam.ta.reportportal.ws.model.OperationCompletionRS;
+import com.epam.ta.reportportal.ws.reporting.OperationCompletionRS;
 
 /**
  * @author <a href="mailto:ihar_kahadouski@epam.com">Ihar Kahadouski</a>
diff --git a/src/main/java/com/epam/ta/reportportal/core/project/settings/UpdateProjectSettingsHandler.java b/src/main/java/com/epam/ta/reportportal/core/project/settings/UpdateProjectSettingsHandler.java
index c068466e09..01876b8d0a 100644
--- a/src/main/java/com/epam/ta/reportportal/core/project/settings/UpdateProjectSettingsHandler.java
+++ b/src/main/java/com/epam/ta/reportportal/core/project/settings/UpdateProjectSettingsHandler.java
@@ -19,7 +19,7 @@
 import com.epam.ta.reportportal.commons.ReportPortalUser;
 import com.epam.ta.reportportal.model.project.config.UpdateIssueSubTypeRQ;
 import com.epam.ta.reportportal.model.project.config.pattern.UpdatePatternTemplateRQ;
-import com.epam.ta.reportportal.ws.model.OperationCompletionRS;
+import com.epam.ta.reportportal.ws.reporting.OperationCompletionRS;
 
 /**
  * @author <a href="mailto:ihar_kahadouski@epam.com">Ihar Kahadouski</a>
diff --git a/src/main/java/com/epam/ta/reportportal/core/project/settings/impl/CreateProjectSettingsHandlerImpl.java b/src/main/java/com/epam/ta/reportportal/core/project/settings/impl/CreateProjectSettingsHandlerImpl.java
index 74f41a536a..deafb9cace 100644
--- a/src/main/java/com/epam/ta/reportportal/core/project/settings/impl/CreateProjectSettingsHandlerImpl.java
+++ b/src/main/java/com/epam/ta/reportportal/core/project/settings/impl/CreateProjectSettingsHandlerImpl.java
@@ -25,9 +25,9 @@
 import static com.epam.ta.reportportal.entity.enums.TestItemIssueGroup.SYSTEM_ISSUE;
 import static com.epam.ta.reportportal.entity.enums.TestItemIssueGroup.TO_INVESTIGATE;
 import static com.epam.ta.reportportal.ws.converter.converters.IssueTypeConverter.TO_ACTIVITY_RESOURCE;
-import static com.epam.ta.reportportal.ws.model.ErrorType.BAD_REQUEST_ERROR;
-import static com.epam.ta.reportportal.ws.model.ErrorType.INCORRECT_REQUEST;
-import static com.epam.ta.reportportal.ws.model.ErrorType.PROJECT_NOT_FOUND;
+import static com.epam.ta.reportportal.ws.reporting.ErrorType.BAD_REQUEST_ERROR;
+import static com.epam.ta.reportportal.ws.reporting.ErrorType.INCORRECT_REQUEST;
+import static com.epam.ta.reportportal.ws.reporting.ErrorType.PROJECT_NOT_FOUND;
 
 import com.epam.ta.reportportal.commons.ReportPortalUser;
 import com.epam.ta.reportportal.commons.validation.Suppliers;
@@ -56,7 +56,7 @@
 import com.epam.ta.reportportal.model.project.config.pattern.CreatePatternTemplateRQ;
 import com.epam.ta.reportportal.ws.converter.builders.IssueTypeBuilder;
 import com.epam.ta.reportportal.ws.converter.converters.PatternTemplateConverter;
-import com.epam.ta.reportportal.ws.model.ErrorType;
+import com.epam.ta.reportportal.ws.reporting.ErrorType;
 import com.epam.ta.reportportal.ws.model.ValidationConstraints;
 import com.google.common.base.Charsets;
 import com.google.common.collect.ImmutableMap;
diff --git a/src/main/java/com/epam/ta/reportportal/core/project/settings/impl/DeleteProjectSettingsHandlerImpl.java b/src/main/java/com/epam/ta/reportportal/core/project/settings/impl/DeleteProjectSettingsHandlerImpl.java
index 487e53bb15..e16baa848b 100644
--- a/src/main/java/com/epam/ta/reportportal/core/project/settings/impl/DeleteProjectSettingsHandlerImpl.java
+++ b/src/main/java/com/epam/ta/reportportal/core/project/settings/impl/DeleteProjectSettingsHandlerImpl.java
@@ -33,8 +33,8 @@
 import com.epam.ta.reportportal.exception.ReportPortalException;
 import com.epam.ta.reportportal.model.activity.PatternTemplateActivityResource;
 import com.epam.ta.reportportal.ws.converter.converters.PatternTemplateConverter;
-import com.epam.ta.reportportal.ws.model.ErrorType;
-import com.epam.ta.reportportal.ws.model.OperationCompletionRS;
+import com.epam.ta.reportportal.ws.reporting.ErrorType;
+import com.epam.ta.reportportal.ws.reporting.OperationCompletionRS;
 import com.google.common.collect.Sets;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.ApplicationEventPublisher;
@@ -50,7 +50,7 @@
 import static com.epam.ta.reportportal.commons.validation.BusinessRule.expect;
 import static com.epam.ta.reportportal.entity.enums.TestItemIssueGroup.*;
 import static com.epam.ta.reportportal.ws.converter.converters.IssueTypeConverter.TO_ACTIVITY_RESOURCE;
-import static com.epam.ta.reportportal.ws.model.ErrorType.*;
+import static com.epam.ta.reportportal.ws.reporting.ErrorType.*;
 
 /**
  * @author <a href="mailto:ihar_kahadouski@epam.com">Ihar Kahadouski</a>
diff --git a/src/main/java/com/epam/ta/reportportal/core/project/settings/impl/GetProjectSettingsHandlerImpl.java b/src/main/java/com/epam/ta/reportportal/core/project/settings/impl/GetProjectSettingsHandlerImpl.java
index 692c78d1de..376f9451db 100644
--- a/src/main/java/com/epam/ta/reportportal/core/project/settings/impl/GetProjectSettingsHandlerImpl.java
+++ b/src/main/java/com/epam/ta/reportportal/core/project/settings/impl/GetProjectSettingsHandlerImpl.java
@@ -22,7 +22,7 @@
 import com.epam.ta.reportportal.exception.ReportPortalException;
 import com.epam.ta.reportportal.model.project.config.ProjectSettingsResource;
 import com.epam.ta.reportportal.ws.converter.converters.ProjectSettingsConverter;
-import com.epam.ta.reportportal.ws.model.ErrorType;
+import com.epam.ta.reportportal.ws.reporting.ErrorType;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
diff --git a/src/main/java/com/epam/ta/reportportal/core/project/settings/impl/UpdateProjectSettingsHandlerImpl.java b/src/main/java/com/epam/ta/reportportal/core/project/settings/impl/UpdateProjectSettingsHandlerImpl.java
index ce46d5e925..0588a9117d 100644
--- a/src/main/java/com/epam/ta/reportportal/core/project/settings/impl/UpdateProjectSettingsHandlerImpl.java
+++ b/src/main/java/com/epam/ta/reportportal/core/project/settings/impl/UpdateProjectSettingsHandlerImpl.java
@@ -26,9 +26,9 @@
 import static com.epam.ta.reportportal.entity.enums.TestItemIssueGroup.SYSTEM_ISSUE;
 import static com.epam.ta.reportportal.entity.enums.TestItemIssueGroup.TO_INVESTIGATE;
 import static com.epam.ta.reportportal.ws.converter.converters.IssueTypeConverter.TO_ACTIVITY_RESOURCE;
-import static com.epam.ta.reportportal.ws.model.ErrorType.FORBIDDEN_OPERATION;
-import static com.epam.ta.reportportal.ws.model.ErrorType.ISSUE_TYPE_NOT_FOUND;
-import static com.epam.ta.reportportal.ws.model.ErrorType.PROJECT_NOT_FOUND;
+import static com.epam.ta.reportportal.ws.reporting.ErrorType.FORBIDDEN_OPERATION;
+import static com.epam.ta.reportportal.ws.reporting.ErrorType.ISSUE_TYPE_NOT_FOUND;
+import static com.epam.ta.reportportal.ws.reporting.ErrorType.PROJECT_NOT_FOUND;
 import static java.util.Optional.ofNullable;
 
 import com.epam.ta.reportportal.commons.ReportPortalUser;
@@ -52,8 +52,8 @@
 import com.epam.ta.reportportal.model.project.config.UpdateOneIssueSubTypeRQ;
 import com.epam.ta.reportportal.model.project.config.pattern.UpdatePatternTemplateRQ;
 import com.epam.ta.reportportal.ws.converter.converters.PatternTemplateConverter;
-import com.epam.ta.reportportal.ws.model.ErrorType;
-import com.epam.ta.reportportal.ws.model.OperationCompletionRS;
+import com.epam.ta.reportportal.ws.reporting.ErrorType;
+import com.epam.ta.reportportal.ws.reporting.OperationCompletionRS;
 import com.google.common.collect.Sets;
 import java.util.List;
 import java.util.stream.Collectors;
diff --git a/src/main/java/com/epam/ta/reportportal/core/project/settings/notification/CreateProjectNotificationHandlerImpl.java b/src/main/java/com/epam/ta/reportportal/core/project/settings/notification/CreateProjectNotificationHandlerImpl.java
index f6ef24478b..58b5e888be 100644
--- a/src/main/java/com/epam/ta/reportportal/core/project/settings/notification/CreateProjectNotificationHandlerImpl.java
+++ b/src/main/java/com/epam/ta/reportportal/core/project/settings/notification/CreateProjectNotificationHandlerImpl.java
@@ -31,7 +31,7 @@
 import com.epam.ta.reportportal.model.project.email.SenderCaseDTO;
 import com.epam.ta.reportportal.ws.converter.converters.NotificationConfigConverter;
 import com.epam.ta.reportportal.ws.converter.converters.ProjectConverter;
-import com.epam.ta.reportportal.ws.model.ErrorType;
+import com.epam.ta.reportportal.ws.reporting.ErrorType;
 import java.util.Optional;
 import org.springframework.stereotype.Service;
 
diff --git a/src/main/java/com/epam/ta/reportportal/core/project/settings/notification/DeleteProjectNotificationHandler.java b/src/main/java/com/epam/ta/reportportal/core/project/settings/notification/DeleteProjectNotificationHandler.java
index 28e6165771..33472d099e 100644
--- a/src/main/java/com/epam/ta/reportportal/core/project/settings/notification/DeleteProjectNotificationHandler.java
+++ b/src/main/java/com/epam/ta/reportportal/core/project/settings/notification/DeleteProjectNotificationHandler.java
@@ -20,7 +20,7 @@
 
 import com.epam.ta.reportportal.commons.ReportPortalUser;
 import com.epam.ta.reportportal.entity.project.Project;
-import com.epam.ta.reportportal.ws.model.OperationCompletionRS;
+import com.epam.ta.reportportal.ws.reporting.OperationCompletionRS;
 
 /**
  * @author <a href="mailto:chingiskhan_kalanov@epam.com">Chingiskhan Kalanov</a>
diff --git a/src/main/java/com/epam/ta/reportportal/core/project/settings/notification/DeleteProjectNotificationHandlerImpl.java b/src/main/java/com/epam/ta/reportportal/core/project/settings/notification/DeleteProjectNotificationHandlerImpl.java
index f7949316a9..02369c2255 100644
--- a/src/main/java/com/epam/ta/reportportal/core/project/settings/notification/DeleteProjectNotificationHandlerImpl.java
+++ b/src/main/java/com/epam/ta/reportportal/core/project/settings/notification/DeleteProjectNotificationHandlerImpl.java
@@ -31,8 +31,8 @@
 import com.epam.ta.reportportal.model.project.ProjectResource;
 import com.epam.ta.reportportal.model.project.email.ProjectNotificationConfigDTO;
 import com.epam.ta.reportportal.ws.converter.converters.ProjectConverter;
-import com.epam.ta.reportportal.ws.model.ErrorType;
-import com.epam.ta.reportportal.ws.model.OperationCompletionRS;
+import com.epam.ta.reportportal.ws.reporting.ErrorType;
+import com.epam.ta.reportportal.ws.reporting.OperationCompletionRS;
 import java.util.Objects;
 import java.util.Optional;
 import java.util.stream.Collectors;
diff --git a/src/main/java/com/epam/ta/reportportal/core/project/settings/notification/UpdateProjectNotificationHandler.java b/src/main/java/com/epam/ta/reportportal/core/project/settings/notification/UpdateProjectNotificationHandler.java
index 3f67864934..b200159c15 100644
--- a/src/main/java/com/epam/ta/reportportal/core/project/settings/notification/UpdateProjectNotificationHandler.java
+++ b/src/main/java/com/epam/ta/reportportal/core/project/settings/notification/UpdateProjectNotificationHandler.java
@@ -21,7 +21,7 @@
 import com.epam.ta.reportportal.commons.ReportPortalUser;
 import com.epam.ta.reportportal.entity.project.Project;
 import com.epam.ta.reportportal.model.project.email.SenderCaseDTO;
-import com.epam.ta.reportportal.ws.model.OperationCompletionRS;
+import com.epam.ta.reportportal.ws.reporting.OperationCompletionRS;
 
 /**
  * @author <a href="mailto:chingiskhan_kalanov@epam.com">Chingiskhan Kalanov</a>
diff --git a/src/main/java/com/epam/ta/reportportal/core/project/settings/notification/UpdateProjectNotificationHandlerImpl.java b/src/main/java/com/epam/ta/reportportal/core/project/settings/notification/UpdateProjectNotificationHandlerImpl.java
index 4352df3219..d8b31dac07 100644
--- a/src/main/java/com/epam/ta/reportportal/core/project/settings/notification/UpdateProjectNotificationHandlerImpl.java
+++ b/src/main/java/com/epam/ta/reportportal/core/project/settings/notification/UpdateProjectNotificationHandlerImpl.java
@@ -33,8 +33,8 @@
 import com.epam.ta.reportportal.model.project.email.SenderCaseDTO;
 import com.epam.ta.reportportal.ws.converter.converters.NotificationConfigConverter;
 import com.epam.ta.reportportal.ws.converter.converters.ProjectConverter;
-import com.epam.ta.reportportal.ws.model.ErrorType;
-import com.epam.ta.reportportal.ws.model.OperationCompletionRS;
+import com.epam.ta.reportportal.ws.reporting.ErrorType;
+import com.epam.ta.reportportal.ws.reporting.OperationCompletionRS;
 import java.util.Objects;
 import org.springframework.stereotype.Service;
 
diff --git a/src/main/java/com/epam/ta/reportportal/core/project/validator/attribute/DelayBoundValidator.java b/src/main/java/com/epam/ta/reportportal/core/project/validator/attribute/DelayBoundValidator.java
index ae44312b20..58e69d28b8 100644
--- a/src/main/java/com/epam/ta/reportportal/core/project/validator/attribute/DelayBoundValidator.java
+++ b/src/main/java/com/epam/ta/reportportal/core/project/validator/attribute/DelayBoundValidator.java
@@ -2,7 +2,7 @@
 
 import static com.epam.ta.reportportal.commons.Predicates.equalTo;
 import static com.epam.ta.reportportal.entity.enums.ProjectAttributeEnum.FOREVER_ALIAS;
-import static com.epam.ta.reportportal.ws.model.ErrorType.BAD_REQUEST_ERROR;
+import static com.epam.ta.reportportal.ws.reporting.ErrorType.BAD_REQUEST_ERROR;
 import static java.util.Optional.ofNullable;
 
 import com.epam.ta.reportportal.commons.validation.BusinessRule;
diff --git a/src/main/java/com/epam/ta/reportportal/core/project/validator/attribute/ProjectAttributeValidator.java b/src/main/java/com/epam/ta/reportportal/core/project/validator/attribute/ProjectAttributeValidator.java
index cb7f9649b9..63b2692456 100644
--- a/src/main/java/com/epam/ta/reportportal/core/project/validator/attribute/ProjectAttributeValidator.java
+++ b/src/main/java/com/epam/ta/reportportal/core/project/validator/attribute/ProjectAttributeValidator.java
@@ -3,7 +3,7 @@
 import static com.epam.ta.reportportal.commons.Predicates.isPresent;
 import static com.epam.ta.reportportal.commons.validation.BusinessRule.expect;
 import static com.epam.ta.reportportal.entity.enums.ProjectAttributeEnum.FOREVER_ALIAS;
-import static com.epam.ta.reportportal.ws.model.ErrorType.BAD_REQUEST_ERROR;
+import static com.epam.ta.reportportal.ws.reporting.ErrorType.BAD_REQUEST_ERROR;
 import static java.util.Optional.ofNullable;
 import static java.util.stream.Collectors.toSet;
 
@@ -11,7 +11,6 @@
 import com.epam.ta.reportportal.entity.AnalyzeMode;
 import com.epam.ta.reportportal.entity.enums.ProjectAttributeEnum;
 import com.epam.ta.reportportal.exception.ReportPortalException;
-import com.epam.ta.reportportal.ws.model.ErrorType;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
@@ -37,7 +36,7 @@ public void verifyProjectAttributes(Map<String, String> currentAttributes,
 
     ofNullable(newAttributes.get(ProjectAttributeEnum.AUTO_ANALYZER_MODE.getAttribute())).ifPresent(
         analyzerMode -> expect(AnalyzeMode.fromString(
-            analyzerMode), isPresent()).verify(ErrorType.BAD_REQUEST_ERROR, analyzerMode));
+            analyzerMode), isPresent()).verify(BAD_REQUEST_ERROR, analyzerMode));
 
     ofNullable(newAttributes.get(
         ProjectAttributeEnum.SEARCH_LOGS_MIN_SHOULD_MATCH.getAttribute())).ifPresent(
diff --git a/src/main/java/com/epam/ta/reportportal/core/project/validator/notification/ProjectNotificationValidator.java b/src/main/java/com/epam/ta/reportportal/core/project/validator/notification/ProjectNotificationValidator.java
index c4a28ec6fb..1fb83e97cc 100644
--- a/src/main/java/com/epam/ta/reportportal/core/project/validator/notification/ProjectNotificationValidator.java
+++ b/src/main/java/com/epam/ta/reportportal/core/project/validator/notification/ProjectNotificationValidator.java
@@ -23,7 +23,7 @@
 import static com.epam.ta.reportportal.commons.validation.BusinessRule.expect;
 import static com.epam.ta.reportportal.commons.validation.Suppliers.formattedSupplier;
 import static com.epam.ta.reportportal.entity.enums.SendCase.findByName;
-import static com.epam.ta.reportportal.ws.model.ErrorType.BAD_REQUEST_ERROR;
+import static com.epam.ta.reportportal.ws.reporting.ErrorType.BAD_REQUEST_ERROR;
 import static java.util.Optional.ofNullable;
 import static java.util.stream.Collectors.toList;
 
diff --git a/src/main/java/com/epam/ta/reportportal/core/statistics/StatisticsHelper.java b/src/main/java/com/epam/ta/reportportal/core/statistics/StatisticsHelper.java
index 5d84cf435b..76942a0259 100644
--- a/src/main/java/com/epam/ta/reportportal/core/statistics/StatisticsHelper.java
+++ b/src/main/java/com/epam/ta/reportportal/core/statistics/StatisticsHelper.java
@@ -24,7 +24,7 @@
 import com.epam.ta.reportportal.entity.statistics.Statistics;
 import com.epam.ta.reportportal.entity.statistics.StatisticsField;
 import com.epam.ta.reportportal.exception.ReportPortalException;
-import com.epam.ta.reportportal.ws.model.ErrorType;
+import com.epam.ta.reportportal.ws.reporting.ErrorType;
 import java.util.Arrays;
 import java.util.Set;
 import java.util.function.Predicate;
diff --git a/src/main/java/com/epam/ta/reportportal/core/user/ApiKeyHandler.java b/src/main/java/com/epam/ta/reportportal/core/user/ApiKeyHandler.java
index 97f2e06d03..b5091c89e2 100644
--- a/src/main/java/com/epam/ta/reportportal/core/user/ApiKeyHandler.java
+++ b/src/main/java/com/epam/ta/reportportal/core/user/ApiKeyHandler.java
@@ -19,7 +19,7 @@
 import com.epam.ta.reportportal.model.ApiKeyRQ;
 import com.epam.ta.reportportal.model.ApiKeyRS;
 import com.epam.ta.reportportal.model.ApiKeysRS;
-import com.epam.ta.reportportal.ws.model.OperationCompletionRS;
+import com.epam.ta.reportportal.ws.reporting.OperationCompletionRS;
 
 /**
  * Api keys handler.
diff --git a/src/main/java/com/epam/ta/reportportal/core/user/CreateUserHandler.java b/src/main/java/com/epam/ta/reportportal/core/user/CreateUserHandler.java
index d8496cc88f..d4142416ad 100644
--- a/src/main/java/com/epam/ta/reportportal/core/user/CreateUserHandler.java
+++ b/src/main/java/com/epam/ta/reportportal/core/user/CreateUserHandler.java
@@ -25,7 +25,7 @@
 import com.epam.ta.reportportal.model.user.CreateUserRS;
 import com.epam.ta.reportportal.model.user.ResetPasswordRQ;
 import com.epam.ta.reportportal.model.user.RestorePasswordRQ;
-import com.epam.ta.reportportal.ws.model.OperationCompletionRS;
+import com.epam.ta.reportportal.ws.reporting.OperationCompletionRS;
 
 /**
  * Post request handler
diff --git a/src/main/java/com/epam/ta/reportportal/core/user/DeleteUserHandler.java b/src/main/java/com/epam/ta/reportportal/core/user/DeleteUserHandler.java
index 2f1c071a4d..ca35de6142 100644
--- a/src/main/java/com/epam/ta/reportportal/core/user/DeleteUserHandler.java
+++ b/src/main/java/com/epam/ta/reportportal/core/user/DeleteUserHandler.java
@@ -18,7 +18,7 @@
 
 import com.epam.ta.reportportal.commons.ReportPortalUser;
 import com.epam.ta.reportportal.model.DeleteBulkRS;
-import com.epam.ta.reportportal.ws.model.OperationCompletionRS;
+import com.epam.ta.reportportal.ws.reporting.OperationCompletionRS;
 import java.util.List;
 
 /**
diff --git a/src/main/java/com/epam/ta/reportportal/core/user/EditUserHandler.java b/src/main/java/com/epam/ta/reportportal/core/user/EditUserHandler.java
index 284c4b85da..db74381164 100644
--- a/src/main/java/com/epam/ta/reportportal/core/user/EditUserHandler.java
+++ b/src/main/java/com/epam/ta/reportportal/core/user/EditUserHandler.java
@@ -19,7 +19,7 @@
 import com.epam.ta.reportportal.commons.ReportPortalUser;
 import com.epam.ta.reportportal.model.user.ChangePasswordRQ;
 import com.epam.ta.reportportal.model.user.EditUserRQ;
-import com.epam.ta.reportportal.ws.model.OperationCompletionRS;
+import com.epam.ta.reportportal.ws.reporting.OperationCompletionRS;
 import org.springframework.web.multipart.MultipartFile;
 
 /**
diff --git a/src/main/java/com/epam/ta/reportportal/core/user/impl/ApiKeyHandlerImpl.java b/src/main/java/com/epam/ta/reportportal/core/user/impl/ApiKeyHandlerImpl.java
index 2fe7993eab..121323a645 100644
--- a/src/main/java/com/epam/ta/reportportal/core/user/impl/ApiKeyHandlerImpl.java
+++ b/src/main/java/com/epam/ta/reportportal/core/user/impl/ApiKeyHandlerImpl.java
@@ -17,8 +17,8 @@
 package com.epam.ta.reportportal.core.user.impl;
 
 import static com.epam.ta.reportportal.commons.validation.BusinessRule.expect;
-import static com.epam.ta.reportportal.ws.model.ErrorType.BAD_REQUEST_ERROR;
-import static com.epam.ta.reportportal.ws.model.ErrorType.NOT_FOUND;
+import static com.epam.ta.reportportal.ws.reporting.ErrorType.BAD_REQUEST_ERROR;
+import static com.epam.ta.reportportal.ws.reporting.ErrorType.NOT_FOUND;
 
 import com.epam.ta.reportportal.commons.Predicates;
 import com.epam.ta.reportportal.commons.validation.Suppliers;
@@ -30,8 +30,8 @@
 import com.epam.ta.reportportal.model.ApiKeyRS;
 import com.epam.ta.reportportal.model.ApiKeysRS;
 import com.epam.ta.reportportal.ws.converter.converters.ApiKeyConverter;
-import com.epam.ta.reportportal.ws.model.ErrorType;
-import com.epam.ta.reportportal.ws.model.OperationCompletionRS;
+import com.epam.ta.reportportal.ws.reporting.ErrorType;
+import com.epam.ta.reportportal.ws.reporting.OperationCompletionRS;
 import com.google.common.annotations.VisibleForTesting;
 import java.nio.ByteBuffer;
 import java.nio.charset.StandardCharsets;
diff --git a/src/main/java/com/epam/ta/reportportal/core/user/impl/CreateUserHandlerImpl.java b/src/main/java/com/epam/ta/reportportal/core/user/impl/CreateUserHandlerImpl.java
index b5baf2756e..88e03bfdf5 100644
--- a/src/main/java/com/epam/ta/reportportal/core/user/impl/CreateUserHandlerImpl.java
+++ b/src/main/java/com/epam/ta/reportportal/core/user/impl/CreateUserHandlerImpl.java
@@ -26,14 +26,14 @@
 import static com.epam.ta.reportportal.entity.project.ProjectRole.forName;
 import static com.epam.ta.reportportal.entity.project.ProjectUtils.findUserConfigByLogin;
 import static com.epam.ta.reportportal.ws.converter.converters.UserConverter.TO_ACTIVITY_RESOURCE;
-import static com.epam.ta.reportportal.ws.model.ErrorType.ACCESS_DENIED;
-import static com.epam.ta.reportportal.ws.model.ErrorType.BAD_REQUEST_ERROR;
-import static com.epam.ta.reportportal.ws.model.ErrorType.EMAIL_CONFIGURATION_IS_INCORRECT;
-import static com.epam.ta.reportportal.ws.model.ErrorType.INCORRECT_REQUEST;
-import static com.epam.ta.reportportal.ws.model.ErrorType.RESOURCE_ALREADY_EXISTS;
-import static com.epam.ta.reportportal.ws.model.ErrorType.ROLE_NOT_FOUND;
-import static com.epam.ta.reportportal.ws.model.ErrorType.USER_ALREADY_EXISTS;
-import static com.epam.ta.reportportal.ws.model.ErrorType.USER_NOT_FOUND;
+import static com.epam.ta.reportportal.ws.reporting.ErrorType.ACCESS_DENIED;
+import static com.epam.ta.reportportal.ws.reporting.ErrorType.BAD_REQUEST_ERROR;
+import static com.epam.ta.reportportal.ws.reporting.ErrorType.EMAIL_CONFIGURATION_IS_INCORRECT;
+import static com.epam.ta.reportportal.ws.reporting.ErrorType.INCORRECT_REQUEST;
+import static com.epam.ta.reportportal.ws.reporting.ErrorType.RESOURCE_ALREADY_EXISTS;
+import static com.epam.ta.reportportal.ws.reporting.ErrorType.ROLE_NOT_FOUND;
+import static com.epam.ta.reportportal.ws.reporting.ErrorType.USER_ALREADY_EXISTS;
+import static com.epam.ta.reportportal.ws.reporting.ErrorType.USER_NOT_FOUND;
 
 import com.epam.ta.reportportal.auth.authenticator.UserAuthenticator;
 import com.epam.ta.reportportal.commons.ReportPortalUser;
@@ -75,8 +75,8 @@
 import com.epam.ta.reportportal.ws.converter.builders.UserBuilder;
 import com.epam.ta.reportportal.ws.converter.converters.RestorePasswordBidConverter;
 import com.epam.ta.reportportal.ws.converter.converters.UserCreationBidConverter;
-import com.epam.ta.reportportal.ws.model.ErrorType;
-import com.epam.ta.reportportal.ws.model.OperationCompletionRS;
+import com.epam.ta.reportportal.ws.reporting.ErrorType;
+import com.epam.ta.reportportal.ws.reporting.OperationCompletionRS;
 import com.google.common.collect.Maps;
 import java.util.Map;
 import java.util.Optional;
diff --git a/src/main/java/com/epam/ta/reportportal/core/user/impl/DeleteUserHandlerImpl.java b/src/main/java/com/epam/ta/reportportal/core/user/impl/DeleteUserHandlerImpl.java
index 01240654c0..1f5e5cfd94 100644
--- a/src/main/java/com/epam/ta/reportportal/core/user/impl/DeleteUserHandlerImpl.java
+++ b/src/main/java/com/epam/ta/reportportal/core/user/impl/DeleteUserHandlerImpl.java
@@ -40,8 +40,8 @@
 import com.epam.ta.reportportal.model.activity.UserActivityResource;
 import com.epam.ta.reportportal.util.email.strategy.EmailNotificationStrategy;
 import com.epam.ta.reportportal.util.email.strategy.EmailTemplate;
-import com.epam.ta.reportportal.ws.model.ErrorType;
-import com.epam.ta.reportportal.ws.model.OperationCompletionRS;
+import com.epam.ta.reportportal.ws.reporting.ErrorType;
+import com.epam.ta.reportportal.ws.reporting.OperationCompletionRS;
 import com.google.common.collect.Lists;
 import java.util.Collections;
 import java.util.List;
diff --git a/src/main/java/com/epam/ta/reportportal/core/user/impl/EditUserHandlerImpl.java b/src/main/java/com/epam/ta/reportportal/core/user/impl/EditUserHandlerImpl.java
index 9805175235..ad3cc22504 100644
--- a/src/main/java/com/epam/ta/reportportal/core/user/impl/EditUserHandlerImpl.java
+++ b/src/main/java/com/epam/ta/reportportal/core/user/impl/EditUserHandlerImpl.java
@@ -36,8 +36,8 @@
 import com.epam.ta.reportportal.model.user.EditUserRQ;
 import com.epam.ta.reportportal.util.UserUtils;
 import com.epam.ta.reportportal.util.email.MailServiceFactory;
-import com.epam.ta.reportportal.ws.model.ErrorType;
-import com.epam.ta.reportportal.ws.model.OperationCompletionRS;
+import com.epam.ta.reportportal.ws.reporting.ErrorType;
+import com.epam.ta.reportportal.ws.reporting.OperationCompletionRS;
 import org.apache.tika.io.TikaInputStream;
 import org.apache.tika.metadata.Metadata;
 import org.apache.tika.mime.MediaType;
@@ -65,7 +65,7 @@
 import static com.epam.ta.reportportal.commons.validation.BusinessRule.expect;
 import static com.epam.ta.reportportal.commons.validation.BusinessRule.fail;
 import static com.epam.ta.reportportal.entity.user.UserType.INTERNAL;
-import static com.epam.ta.reportportal.ws.model.ErrorType.*;
+import static com.epam.ta.reportportal.ws.reporting.ErrorType.*;
 import static com.epam.ta.reportportal.ws.model.ValidationConstraints.*;
 import static java.util.Optional.ofNullable;
 
diff --git a/src/main/java/com/epam/ta/reportportal/core/user/impl/GetUserHandlerImpl.java b/src/main/java/com/epam/ta/reportportal/core/user/impl/GetUserHandlerImpl.java
index feb74bcf85..44858a486c 100644
--- a/src/main/java/com/epam/ta/reportportal/core/user/impl/GetUserHandlerImpl.java
+++ b/src/main/java/com/epam/ta/reportportal/core/user/impl/GetUserHandlerImpl.java
@@ -48,7 +48,7 @@
 import com.epam.ta.reportportal.util.PersonalProjectService;
 import com.epam.ta.reportportal.ws.converter.PagedResourcesAssembler;
 import com.epam.ta.reportportal.ws.converter.converters.UserConverter;
-import com.epam.ta.reportportal.ws.model.ErrorType;
+import com.epam.ta.reportportal.ws.reporting.ErrorType;
 import com.google.common.base.Preconditions;
 import java.io.OutputStream;
 import java.util.List;
diff --git a/src/main/java/com/epam/ta/reportportal/core/widget/UpdateWidgetHandler.java b/src/main/java/com/epam/ta/reportportal/core/widget/UpdateWidgetHandler.java
index ea2af6402b..bba93afbcc 100644
--- a/src/main/java/com/epam/ta/reportportal/core/widget/UpdateWidgetHandler.java
+++ b/src/main/java/com/epam/ta/reportportal/core/widget/UpdateWidgetHandler.java
@@ -18,7 +18,7 @@
 
 import com.epam.ta.reportportal.commons.ReportPortalUser;
 import com.epam.ta.reportportal.model.widget.WidgetRQ;
-import com.epam.ta.reportportal.ws.model.OperationCompletionRS;
+import com.epam.ta.reportportal.ws.reporting.OperationCompletionRS;
 
 /**
  * @author Pavel Bortnik
diff --git a/src/main/java/com/epam/ta/reportportal/core/widget/content/MaterializedLoadContentStrategyImpl.java b/src/main/java/com/epam/ta/reportportal/core/widget/content/MaterializedLoadContentStrategyImpl.java
index 5d2593a3fb..6f232048f4 100644
--- a/src/main/java/com/epam/ta/reportportal/core/widget/content/MaterializedLoadContentStrategyImpl.java
+++ b/src/main/java/com/epam/ta/reportportal/core/widget/content/MaterializedLoadContentStrategyImpl.java
@@ -8,7 +8,7 @@
 import com.epam.ta.reportportal.entity.widget.Widget;
 import com.epam.ta.reportportal.entity.widget.WidgetState;
 import com.epam.ta.reportportal.exception.ReportPortalException;
-import com.epam.ta.reportportal.ws.model.ErrorType;
+import com.epam.ta.reportportal.ws.reporting.ErrorType;
 import java.util.Map;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
diff --git a/src/main/java/com/epam/ta/reportportal/core/widget/content/filter/GeneralLaunchFilterStrategy.java b/src/main/java/com/epam/ta/reportportal/core/widget/content/filter/GeneralLaunchFilterStrategy.java
index b389158520..382f00b3a3 100644
--- a/src/main/java/com/epam/ta/reportportal/core/widget/content/filter/GeneralLaunchFilterStrategy.java
+++ b/src/main/java/com/epam/ta/reportportal/core/widget/content/filter/GeneralLaunchFilterStrategy.java
@@ -24,7 +24,7 @@
 import com.epam.ta.reportportal.commons.querygen.FilterCondition;
 import com.epam.ta.reportportal.entity.enums.StatusEnum;
 import com.epam.ta.reportportal.entity.widget.Widget;
-import com.epam.ta.reportportal.ws.model.launch.Mode;
+import com.epam.ta.reportportal.ws.reporting.Mode;
 import com.google.common.collect.Lists;
 import org.springframework.stereotype.Service;
 
diff --git a/src/main/java/com/epam/ta/reportportal/core/widget/content/filter/LaunchHistoryFilterStrategy.java b/src/main/java/com/epam/ta/reportportal/core/widget/content/filter/LaunchHistoryFilterStrategy.java
index ff500d15ff..c1356c906c 100644
--- a/src/main/java/com/epam/ta/reportportal/core/widget/content/filter/LaunchHistoryFilterStrategy.java
+++ b/src/main/java/com/epam/ta/reportportal/core/widget/content/filter/LaunchHistoryFilterStrategy.java
@@ -29,7 +29,7 @@
 import com.epam.ta.reportportal.entity.enums.StatusEnum;
 import com.epam.ta.reportportal.entity.widget.Widget;
 import com.epam.ta.reportportal.entity.widget.WidgetOptions;
-import com.epam.ta.reportportal.ws.model.ErrorType;
+import com.epam.ta.reportportal.ws.reporting.ErrorType;
 import java.util.stream.Stream;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
diff --git a/src/main/java/com/epam/ta/reportportal/core/widget/content/loader/ActivityContentLoader.java b/src/main/java/com/epam/ta/reportportal/core/widget/content/loader/ActivityContentLoader.java
index 5168341422..1e6d3b41e9 100644
--- a/src/main/java/com/epam/ta/reportportal/core/widget/content/loader/ActivityContentLoader.java
+++ b/src/main/java/com/epam/ta/reportportal/core/widget/content/loader/ActivityContentLoader.java
@@ -37,7 +37,7 @@
 import com.epam.ta.reportportal.entity.widget.WidgetOptions;
 import com.epam.ta.reportportal.exception.ReportPortalException;
 import com.epam.ta.reportportal.ws.model.ActivityResource;
-import com.epam.ta.reportportal.ws.model.ErrorType;
+import com.epam.ta.reportportal.ws.reporting.ErrorType;
 import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
diff --git a/src/main/java/com/epam/ta/reportportal/core/widget/content/loader/ComponentHealthCheckContentLoader.java b/src/main/java/com/epam/ta/reportportal/core/widget/content/loader/ComponentHealthCheckContentLoader.java
index b9d963a6d2..e2113a56bd 100644
--- a/src/main/java/com/epam/ta/reportportal/core/widget/content/loader/ComponentHealthCheckContentLoader.java
+++ b/src/main/java/com/epam/ta/reportportal/core/widget/content/loader/ComponentHealthCheckContentLoader.java
@@ -47,7 +47,7 @@
 import com.epam.ta.reportportal.entity.item.TestItem;
 import com.epam.ta.reportportal.entity.widget.WidgetOptions;
 import com.epam.ta.reportportal.entity.widget.content.healthcheck.ComponentHealthCheckContent;
-import com.epam.ta.reportportal.ws.model.ErrorType;
+import com.epam.ta.reportportal.ws.reporting.ErrorType;
 import com.google.common.collect.Lists;
 import java.util.Arrays;
 import java.util.Collections;
diff --git a/src/main/java/com/epam/ta/reportportal/core/widget/content/loader/materialized/CumulativeTrendChartContentLoaderImpl.java b/src/main/java/com/epam/ta/reportportal/core/widget/content/loader/materialized/CumulativeTrendChartContentLoaderImpl.java
index 5e29129ce2..6476f03a0b 100644
--- a/src/main/java/com/epam/ta/reportportal/core/widget/content/loader/materialized/CumulativeTrendChartContentLoaderImpl.java
+++ b/src/main/java/com/epam/ta/reportportal/core/widget/content/loader/materialized/CumulativeTrendChartContentLoaderImpl.java
@@ -27,7 +27,7 @@
 import com.epam.ta.reportportal.dao.WidgetContentRepository;
 import com.epam.ta.reportportal.entity.widget.Widget;
 import com.epam.ta.reportportal.entity.widget.content.CumulativeTrendChartEntry;
-import com.epam.ta.reportportal.ws.model.ErrorType;
+import com.epam.ta.reportportal.ws.reporting.ErrorType;
 import com.google.common.collect.ImmutableMap;
 import java.util.Collections;
 import java.util.List;
diff --git a/src/main/java/com/epam/ta/reportportal/core/widget/content/loader/materialized/HealthCheckTableReadyContentLoader.java b/src/main/java/com/epam/ta/reportportal/core/widget/content/loader/materialized/HealthCheckTableReadyContentLoader.java
index 350b067035..aa8f8f39dd 100644
--- a/src/main/java/com/epam/ta/reportportal/core/widget/content/loader/materialized/HealthCheckTableReadyContentLoader.java
+++ b/src/main/java/com/epam/ta/reportportal/core/widget/content/loader/materialized/HealthCheckTableReadyContentLoader.java
@@ -21,7 +21,7 @@
 import com.epam.ta.reportportal.entity.widget.content.healthcheck.LevelEntry;
 import com.epam.ta.reportportal.exception.ReportPortalException;
 import com.epam.ta.reportportal.model.widget.SortEntry;
-import com.epam.ta.reportportal.ws.model.ErrorType;
+import com.epam.ta.reportportal.ws.reporting.ErrorType;
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.google.common.collect.ImmutableMap;
diff --git a/src/main/java/com/epam/ta/reportportal/core/widget/content/loader/materialized/handler/ReadyMaterializedWidgetStateHandler.java b/src/main/java/com/epam/ta/reportportal/core/widget/content/loader/materialized/handler/ReadyMaterializedWidgetStateHandler.java
index 1bd3eb099b..17c7e4503e 100644
--- a/src/main/java/com/epam/ta/reportportal/core/widget/content/loader/materialized/handler/ReadyMaterializedWidgetStateHandler.java
+++ b/src/main/java/com/epam/ta/reportportal/core/widget/content/loader/materialized/handler/ReadyMaterializedWidgetStateHandler.java
@@ -7,7 +7,7 @@
 import com.epam.ta.reportportal.entity.widget.Widget;
 import com.epam.ta.reportportal.entity.widget.WidgetType;
 import com.epam.ta.reportportal.exception.ReportPortalException;
-import com.epam.ta.reportportal.ws.model.ErrorType;
+import com.epam.ta.reportportal.ws.reporting.ErrorType;
 import java.util.Collections;
 import java.util.Map;
 import org.apache.commons.lang3.BooleanUtils;
diff --git a/src/main/java/com/epam/ta/reportportal/core/widget/content/loader/util/ProductStatusContentLoaderManager.java b/src/main/java/com/epam/ta/reportportal/core/widget/content/loader/util/ProductStatusContentLoaderManager.java
index 93daa4e7eb..7524bc06eb 100644
--- a/src/main/java/com/epam/ta/reportportal/core/widget/content/loader/util/ProductStatusContentLoaderManager.java
+++ b/src/main/java/com/epam/ta/reportportal/core/widget/content/loader/util/ProductStatusContentLoaderManager.java
@@ -24,7 +24,7 @@
 import com.epam.ta.reportportal.core.widget.util.WidgetOptionUtil;
 import com.epam.ta.reportportal.entity.widget.WidgetOptions;
 import com.epam.ta.reportportal.exception.ReportPortalException;
-import com.epam.ta.reportportal.ws.model.ErrorType;
+import com.epam.ta.reportportal.ws.reporting.ErrorType;
 import java.util.List;
 import java.util.Map;
 import org.springframework.beans.factory.annotation.Autowired;
diff --git a/src/main/java/com/epam/ta/reportportal/core/widget/content/materialized/state/WidgetStateResolver.java b/src/main/java/com/epam/ta/reportportal/core/widget/content/materialized/state/WidgetStateResolver.java
index c04bb3c612..dcb66a5ca6 100644
--- a/src/main/java/com/epam/ta/reportportal/core/widget/content/materialized/state/WidgetStateResolver.java
+++ b/src/main/java/com/epam/ta/reportportal/core/widget/content/materialized/state/WidgetStateResolver.java
@@ -23,7 +23,7 @@
 import com.epam.ta.reportportal.entity.widget.WidgetOptions;
 import com.epam.ta.reportportal.entity.widget.WidgetState;
 import com.epam.ta.reportportal.exception.ReportPortalException;
-import com.epam.ta.reportportal.ws.model.ErrorType;
+import com.epam.ta.reportportal.ws.reporting.ErrorType;
 import org.springframework.stereotype.Component;
 
 /**
diff --git a/src/main/java/com/epam/ta/reportportal/core/widget/content/updater/validator/ActivityContentValidator.java b/src/main/java/com/epam/ta/reportportal/core/widget/content/updater/validator/ActivityContentValidator.java
index e5c1d36b58..e1ea2f0932 100644
--- a/src/main/java/com/epam/ta/reportportal/core/widget/content/updater/validator/ActivityContentValidator.java
+++ b/src/main/java/com/epam/ta/reportportal/core/widget/content/updater/validator/ActivityContentValidator.java
@@ -21,7 +21,7 @@
 
 import com.epam.ta.reportportal.commons.querygen.Filter;
 import com.epam.ta.reportportal.entity.widget.WidgetOptions;
-import com.epam.ta.reportportal.ws.model.ErrorType;
+import com.epam.ta.reportportal.ws.reporting.ErrorType;
 import java.util.List;
 import java.util.Map;
 import org.apache.commons.collections.MapUtils;
diff --git a/src/main/java/com/epam/ta/reportportal/core/widget/content/updater/validator/BugTrendChartContentValidator.java b/src/main/java/com/epam/ta/reportportal/core/widget/content/updater/validator/BugTrendChartContentValidator.java
index 5c66db1dad..e3f2badc90 100644
--- a/src/main/java/com/epam/ta/reportportal/core/widget/content/updater/validator/BugTrendChartContentValidator.java
+++ b/src/main/java/com/epam/ta/reportportal/core/widget/content/updater/validator/BugTrendChartContentValidator.java
@@ -23,7 +23,7 @@
 import com.epam.ta.reportportal.commons.validation.BusinessRule;
 import com.epam.ta.reportportal.core.widget.util.ContentFieldMatcherUtil;
 import com.epam.ta.reportportal.entity.widget.WidgetOptions;
-import com.epam.ta.reportportal.ws.model.ErrorType;
+import com.epam.ta.reportportal.ws.reporting.ErrorType;
 import java.util.List;
 import java.util.Map;
 import org.apache.commons.collections.CollectionUtils;
diff --git a/src/main/java/com/epam/ta/reportportal/core/widget/content/updater/validator/CasesTrendContentValidator.java b/src/main/java/com/epam/ta/reportportal/core/widget/content/updater/validator/CasesTrendContentValidator.java
index af92dacbc6..4bc315a59b 100644
--- a/src/main/java/com/epam/ta/reportportal/core/widget/content/updater/validator/CasesTrendContentValidator.java
+++ b/src/main/java/com/epam/ta/reportportal/core/widget/content/updater/validator/CasesTrendContentValidator.java
@@ -23,7 +23,7 @@
 import com.epam.ta.reportportal.commons.validation.BusinessRule;
 import com.epam.ta.reportportal.core.widget.util.ContentFieldMatcherUtil;
 import com.epam.ta.reportportal.entity.widget.WidgetOptions;
-import com.epam.ta.reportportal.ws.model.ErrorType;
+import com.epam.ta.reportportal.ws.reporting.ErrorType;
 import java.util.List;
 import java.util.Map;
 import org.apache.commons.collections.CollectionUtils;
diff --git a/src/main/java/com/epam/ta/reportportal/core/widget/content/updater/validator/ChartInvestigatedContentValidator.java b/src/main/java/com/epam/ta/reportportal/core/widget/content/updater/validator/ChartInvestigatedContentValidator.java
index cf52c58ce0..879d5a3504 100644
--- a/src/main/java/com/epam/ta/reportportal/core/widget/content/updater/validator/ChartInvestigatedContentValidator.java
+++ b/src/main/java/com/epam/ta/reportportal/core/widget/content/updater/validator/ChartInvestigatedContentValidator.java
@@ -21,7 +21,7 @@
 import com.epam.ta.reportportal.commons.querygen.Filter;
 import com.epam.ta.reportportal.commons.validation.BusinessRule;
 import com.epam.ta.reportportal.entity.widget.WidgetOptions;
-import com.epam.ta.reportportal.ws.model.ErrorType;
+import com.epam.ta.reportportal.ws.reporting.ErrorType;
 import java.util.List;
 import java.util.Map;
 import org.apache.commons.collections.MapUtils;
diff --git a/src/main/java/com/epam/ta/reportportal/core/widget/content/updater/validator/ComponentHealthCheckContentValidator.java b/src/main/java/com/epam/ta/reportportal/core/widget/content/updater/validator/ComponentHealthCheckContentValidator.java
index 74a58809d6..f78c8c85e8 100644
--- a/src/main/java/com/epam/ta/reportportal/core/widget/content/updater/validator/ComponentHealthCheckContentValidator.java
+++ b/src/main/java/com/epam/ta/reportportal/core/widget/content/updater/validator/ComponentHealthCheckContentValidator.java
@@ -26,7 +26,7 @@
 import com.epam.ta.reportportal.core.widget.util.WidgetOptionUtil;
 import com.epam.ta.reportportal.entity.widget.WidgetOptions;
 import com.epam.ta.reportportal.exception.ReportPortalException;
-import com.epam.ta.reportportal.ws.model.ErrorType;
+import com.epam.ta.reportportal.ws.reporting.ErrorType;
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
diff --git a/src/main/java/com/epam/ta/reportportal/core/widget/content/updater/validator/CumulativeTrendChartValidator.java b/src/main/java/com/epam/ta/reportportal/core/widget/content/updater/validator/CumulativeTrendChartValidator.java
index 9a43600aec..53ac981b2d 100644
--- a/src/main/java/com/epam/ta/reportportal/core/widget/content/updater/validator/CumulativeTrendChartValidator.java
+++ b/src/main/java/com/epam/ta/reportportal/core/widget/content/updater/validator/CumulativeTrendChartValidator.java
@@ -23,7 +23,7 @@
 import com.epam.ta.reportportal.commons.querygen.Filter;
 import com.epam.ta.reportportal.core.widget.util.ContentFieldMatcherUtil;
 import com.epam.ta.reportportal.entity.widget.WidgetOptions;
-import com.epam.ta.reportportal.ws.model.ErrorType;
+import com.epam.ta.reportportal.ws.reporting.ErrorType;
 import java.util.List;
 import java.util.Map;
 import org.apache.commons.collections.CollectionUtils;
diff --git a/src/main/java/com/epam/ta/reportportal/core/widget/content/updater/validator/FlakyCasesTableContentValidator.java b/src/main/java/com/epam/ta/reportportal/core/widget/content/updater/validator/FlakyCasesTableContentValidator.java
index 5bd00c4856..887b461754 100644
--- a/src/main/java/com/epam/ta/reportportal/core/widget/content/updater/validator/FlakyCasesTableContentValidator.java
+++ b/src/main/java/com/epam/ta/reportportal/core/widget/content/updater/validator/FlakyCasesTableContentValidator.java
@@ -23,7 +23,7 @@
 import com.epam.ta.reportportal.commons.validation.BusinessRule;
 import com.epam.ta.reportportal.core.widget.util.WidgetOptionUtil;
 import com.epam.ta.reportportal.entity.widget.WidgetOptions;
-import com.epam.ta.reportportal.ws.model.ErrorType;
+import com.epam.ta.reportportal.ws.reporting.ErrorType;
 import java.util.List;
 import java.util.Map;
 import org.apache.commons.collections.MapUtils;
diff --git a/src/main/java/com/epam/ta/reportportal/core/widget/content/updater/validator/LaunchExecutionAndIssueStatisticsContentValidator.java b/src/main/java/com/epam/ta/reportportal/core/widget/content/updater/validator/LaunchExecutionAndIssueStatisticsContentValidator.java
index c3520738cd..e0a7bf179b 100644
--- a/src/main/java/com/epam/ta/reportportal/core/widget/content/updater/validator/LaunchExecutionAndIssueStatisticsContentValidator.java
+++ b/src/main/java/com/epam/ta/reportportal/core/widget/content/updater/validator/LaunchExecutionAndIssueStatisticsContentValidator.java
@@ -23,7 +23,7 @@
 import com.epam.ta.reportportal.commons.validation.BusinessRule;
 import com.epam.ta.reportportal.core.widget.util.ContentFieldMatcherUtil;
 import com.epam.ta.reportportal.entity.widget.WidgetOptions;
-import com.epam.ta.reportportal.ws.model.ErrorType;
+import com.epam.ta.reportportal.ws.reporting.ErrorType;
 import java.util.List;
 import java.util.Map;
 import org.apache.commons.collections.CollectionUtils;
diff --git a/src/main/java/com/epam/ta/reportportal/core/widget/content/updater/validator/LaunchesComparisonContentValidator.java b/src/main/java/com/epam/ta/reportportal/core/widget/content/updater/validator/LaunchesComparisonContentValidator.java
index 24e5b15175..b53544d5e7 100644
--- a/src/main/java/com/epam/ta/reportportal/core/widget/content/updater/validator/LaunchesComparisonContentValidator.java
+++ b/src/main/java/com/epam/ta/reportportal/core/widget/content/updater/validator/LaunchesComparisonContentValidator.java
@@ -23,7 +23,7 @@
 import com.epam.ta.reportportal.commons.validation.BusinessRule;
 import com.epam.ta.reportportal.core.widget.util.ContentFieldMatcherUtil;
 import com.epam.ta.reportportal.entity.widget.WidgetOptions;
-import com.epam.ta.reportportal.ws.model.ErrorType;
+import com.epam.ta.reportportal.ws.reporting.ErrorType;
 import java.util.List;
 import java.util.Map;
 import org.apache.commons.collections.CollectionUtils;
diff --git a/src/main/java/com/epam/ta/reportportal/core/widget/content/updater/validator/LaunchesDurationContentValidator.java b/src/main/java/com/epam/ta/reportportal/core/widget/content/updater/validator/LaunchesDurationContentValidator.java
index 7419b57e7e..2db1c2ee32 100644
--- a/src/main/java/com/epam/ta/reportportal/core/widget/content/updater/validator/LaunchesDurationContentValidator.java
+++ b/src/main/java/com/epam/ta/reportportal/core/widget/content/updater/validator/LaunchesDurationContentValidator.java
@@ -21,7 +21,7 @@
 import com.epam.ta.reportportal.commons.querygen.Filter;
 import com.epam.ta.reportportal.commons.validation.BusinessRule;
 import com.epam.ta.reportportal.entity.widget.WidgetOptions;
-import com.epam.ta.reportportal.ws.model.ErrorType;
+import com.epam.ta.reportportal.ws.reporting.ErrorType;
 import java.util.List;
 import java.util.Map;
 import org.apache.commons.collections.MapUtils;
diff --git a/src/main/java/com/epam/ta/reportportal/core/widget/content/updater/validator/LaunchesTableContentValidator.java b/src/main/java/com/epam/ta/reportportal/core/widget/content/updater/validator/LaunchesTableContentValidator.java
index 56eae71d8a..b4342e83cf 100644
--- a/src/main/java/com/epam/ta/reportportal/core/widget/content/updater/validator/LaunchesTableContentValidator.java
+++ b/src/main/java/com/epam/ta/reportportal/core/widget/content/updater/validator/LaunchesTableContentValidator.java
@@ -21,7 +21,7 @@
 import com.epam.ta.reportportal.commons.querygen.Filter;
 import com.epam.ta.reportportal.commons.validation.BusinessRule;
 import com.epam.ta.reportportal.entity.widget.WidgetOptions;
-import com.epam.ta.reportportal.ws.model.ErrorType;
+import com.epam.ta.reportportal.ws.reporting.ErrorType;
 import java.util.List;
 import java.util.Map;
 import org.apache.commons.collections.CollectionUtils;
diff --git a/src/main/java/com/epam/ta/reportportal/core/widget/content/updater/validator/LineChartContentValidator.java b/src/main/java/com/epam/ta/reportportal/core/widget/content/updater/validator/LineChartContentValidator.java
index dd2ea8f2e7..8ddae39cbf 100644
--- a/src/main/java/com/epam/ta/reportportal/core/widget/content/updater/validator/LineChartContentValidator.java
+++ b/src/main/java/com/epam/ta/reportportal/core/widget/content/updater/validator/LineChartContentValidator.java
@@ -23,7 +23,7 @@
 import com.epam.ta.reportportal.commons.validation.BusinessRule;
 import com.epam.ta.reportportal.core.widget.util.ContentFieldMatcherUtil;
 import com.epam.ta.reportportal.entity.widget.WidgetOptions;
-import com.epam.ta.reportportal.ws.model.ErrorType;
+import com.epam.ta.reportportal.ws.reporting.ErrorType;
 import java.util.List;
 import java.util.Map;
 import org.apache.commons.collections.CollectionUtils;
diff --git a/src/main/java/com/epam/ta/reportportal/core/widget/content/updater/validator/MostTimeConsumingContentValidator.java b/src/main/java/com/epam/ta/reportportal/core/widget/content/updater/validator/MostTimeConsumingContentValidator.java
index 6764f9062e..ec9edebafd 100644
--- a/src/main/java/com/epam/ta/reportportal/core/widget/content/updater/validator/MostTimeConsumingContentValidator.java
+++ b/src/main/java/com/epam/ta/reportportal/core/widget/content/updater/validator/MostTimeConsumingContentValidator.java
@@ -23,7 +23,7 @@
 import com.epam.ta.reportportal.commons.validation.BusinessRule;
 import com.epam.ta.reportportal.core.widget.util.WidgetOptionUtil;
 import com.epam.ta.reportportal.entity.widget.WidgetOptions;
-import com.epam.ta.reportportal.ws.model.ErrorType;
+import com.epam.ta.reportportal.ws.reporting.ErrorType;
 import java.util.List;
 import java.util.Map;
 import org.apache.commons.collections.MapUtils;
diff --git a/src/main/java/com/epam/ta/reportportal/core/widget/content/updater/validator/NotPassedTestsContentValidator.java b/src/main/java/com/epam/ta/reportportal/core/widget/content/updater/validator/NotPassedTestsContentValidator.java
index ce922ca15d..60c2987060 100644
--- a/src/main/java/com/epam/ta/reportportal/core/widget/content/updater/validator/NotPassedTestsContentValidator.java
+++ b/src/main/java/com/epam/ta/reportportal/core/widget/content/updater/validator/NotPassedTestsContentValidator.java
@@ -21,7 +21,7 @@
 import com.epam.ta.reportportal.commons.querygen.Filter;
 import com.epam.ta.reportportal.commons.validation.BusinessRule;
 import com.epam.ta.reportportal.entity.widget.WidgetOptions;
-import com.epam.ta.reportportal.ws.model.ErrorType;
+import com.epam.ta.reportportal.ws.reporting.ErrorType;
 import java.util.List;
 import java.util.Map;
 import org.apache.commons.collections.MapUtils;
diff --git a/src/main/java/com/epam/ta/reportportal/core/widget/content/updater/validator/OverallStatisticsContentValidator.java b/src/main/java/com/epam/ta/reportportal/core/widget/content/updater/validator/OverallStatisticsContentValidator.java
index 1d7a6652a2..77dc70c1c7 100644
--- a/src/main/java/com/epam/ta/reportportal/core/widget/content/updater/validator/OverallStatisticsContentValidator.java
+++ b/src/main/java/com/epam/ta/reportportal/core/widget/content/updater/validator/OverallStatisticsContentValidator.java
@@ -21,7 +21,7 @@
 import com.epam.ta.reportportal.commons.querygen.Filter;
 import com.epam.ta.reportportal.commons.validation.BusinessRule;
 import com.epam.ta.reportportal.entity.widget.WidgetOptions;
-import com.epam.ta.reportportal.ws.model.ErrorType;
+import com.epam.ta.reportportal.ws.reporting.ErrorType;
 import java.util.List;
 import java.util.Map;
 import org.apache.commons.collections.CollectionUtils;
diff --git a/src/main/java/com/epam/ta/reportportal/core/widget/content/updater/validator/PassingRatePerLaunchContentValidator.java b/src/main/java/com/epam/ta/reportportal/core/widget/content/updater/validator/PassingRatePerLaunchContentValidator.java
index 4b6dca07e4..2696465bdb 100644
--- a/src/main/java/com/epam/ta/reportportal/core/widget/content/updater/validator/PassingRatePerLaunchContentValidator.java
+++ b/src/main/java/com/epam/ta/reportportal/core/widget/content/updater/validator/PassingRatePerLaunchContentValidator.java
@@ -23,7 +23,7 @@
 import com.epam.ta.reportportal.commons.validation.BusinessRule;
 import com.epam.ta.reportportal.core.widget.util.WidgetOptionUtil;
 import com.epam.ta.reportportal.entity.widget.WidgetOptions;
-import com.epam.ta.reportportal.ws.model.ErrorType;
+import com.epam.ta.reportportal.ws.reporting.ErrorType;
 import java.util.List;
 import java.util.Map;
 import org.apache.commons.collections.MapUtils;
diff --git a/src/main/java/com/epam/ta/reportportal/core/widget/content/updater/validator/PassingRateSummaryContentValidator.java b/src/main/java/com/epam/ta/reportportal/core/widget/content/updater/validator/PassingRateSummaryContentValidator.java
index bf23857362..178e8e9a5d 100644
--- a/src/main/java/com/epam/ta/reportportal/core/widget/content/updater/validator/PassingRateSummaryContentValidator.java
+++ b/src/main/java/com/epam/ta/reportportal/core/widget/content/updater/validator/PassingRateSummaryContentValidator.java
@@ -21,7 +21,7 @@
 import com.epam.ta.reportportal.commons.querygen.Filter;
 import com.epam.ta.reportportal.commons.validation.BusinessRule;
 import com.epam.ta.reportportal.entity.widget.WidgetOptions;
-import com.epam.ta.reportportal.ws.model.ErrorType;
+import com.epam.ta.reportportal.ws.reporting.ErrorType;
 import java.util.List;
 import java.util.Map;
 import org.apache.commons.collections.MapUtils;
diff --git a/src/main/java/com/epam/ta/reportportal/core/widget/content/updater/validator/ProductStatusContentValidator.java b/src/main/java/com/epam/ta/reportportal/core/widget/content/updater/validator/ProductStatusContentValidator.java
index 2c0aa0d1d1..a0198de27b 100644
--- a/src/main/java/com/epam/ta/reportportal/core/widget/content/updater/validator/ProductStatusContentValidator.java
+++ b/src/main/java/com/epam/ta/reportportal/core/widget/content/updater/validator/ProductStatusContentValidator.java
@@ -5,7 +5,7 @@
 import com.epam.ta.reportportal.commons.querygen.Filter;
 import com.epam.ta.reportportal.commons.validation.BusinessRule;
 import com.epam.ta.reportportal.entity.widget.WidgetOptions;
-import com.epam.ta.reportportal.ws.model.ErrorType;
+import com.epam.ta.reportportal.ws.reporting.ErrorType;
 import java.util.List;
 import java.util.Map;
 import org.apache.commons.collections.CollectionUtils;
diff --git a/src/main/java/com/epam/ta/reportportal/core/widget/content/updater/validator/TopPatternContentValidator.java b/src/main/java/com/epam/ta/reportportal/core/widget/content/updater/validator/TopPatternContentValidator.java
index 636166d07c..5d3855f896 100644
--- a/src/main/java/com/epam/ta/reportportal/core/widget/content/updater/validator/TopPatternContentValidator.java
+++ b/src/main/java/com/epam/ta/reportportal/core/widget/content/updater/validator/TopPatternContentValidator.java
@@ -21,7 +21,7 @@
 
 import com.epam.ta.reportportal.commons.querygen.Filter;
 import com.epam.ta.reportportal.entity.widget.WidgetOptions;
-import com.epam.ta.reportportal.ws.model.ErrorType;
+import com.epam.ta.reportportal.ws.reporting.ErrorType;
 import java.util.List;
 import java.util.Map;
 import org.apache.commons.collections.MapUtils;
diff --git a/src/main/java/com/epam/ta/reportportal/core/widget/content/updater/validator/TopTestCasesContentValidator.java b/src/main/java/com/epam/ta/reportportal/core/widget/content/updater/validator/TopTestCasesContentValidator.java
index 52c976971b..7061bc64ca 100644
--- a/src/main/java/com/epam/ta/reportportal/core/widget/content/updater/validator/TopTestCasesContentValidator.java
+++ b/src/main/java/com/epam/ta/reportportal/core/widget/content/updater/validator/TopTestCasesContentValidator.java
@@ -21,7 +21,7 @@
 import com.epam.ta.reportportal.commons.querygen.Filter;
 import com.epam.ta.reportportal.commons.validation.BusinessRule;
 import com.epam.ta.reportportal.entity.widget.WidgetOptions;
-import com.epam.ta.reportportal.ws.model.ErrorType;
+import com.epam.ta.reportportal.ws.reporting.ErrorType;
 import java.util.List;
 import java.util.Map;
 import java.util.function.Predicate;
diff --git a/src/main/java/com/epam/ta/reportportal/core/widget/content/updater/validator/UniqueBugContentValidator.java b/src/main/java/com/epam/ta/reportportal/core/widget/content/updater/validator/UniqueBugContentValidator.java
index 7c0066a3fb..0e69e9edb0 100644
--- a/src/main/java/com/epam/ta/reportportal/core/widget/content/updater/validator/UniqueBugContentValidator.java
+++ b/src/main/java/com/epam/ta/reportportal/core/widget/content/updater/validator/UniqueBugContentValidator.java
@@ -21,7 +21,7 @@
 import com.epam.ta.reportportal.commons.querygen.Filter;
 import com.epam.ta.reportportal.commons.validation.BusinessRule;
 import com.epam.ta.reportportal.entity.widget.WidgetOptions;
-import com.epam.ta.reportportal.ws.model.ErrorType;
+import com.epam.ta.reportportal.ws.reporting.ErrorType;
 import java.util.List;
 import java.util.Map;
 import org.apache.commons.collections.MapUtils;
diff --git a/src/main/java/com/epam/ta/reportportal/core/widget/content/updater/validator/WidgetContentFieldsValidator.java b/src/main/java/com/epam/ta/reportportal/core/widget/content/updater/validator/WidgetContentFieldsValidator.java
index 9482202977..c4b1229862 100644
--- a/src/main/java/com/epam/ta/reportportal/core/widget/content/updater/validator/WidgetContentFieldsValidator.java
+++ b/src/main/java/com/epam/ta/reportportal/core/widget/content/updater/validator/WidgetContentFieldsValidator.java
@@ -6,7 +6,7 @@
 import com.epam.ta.reportportal.entity.widget.Widget;
 import com.epam.ta.reportportal.entity.widget.WidgetType;
 import com.epam.ta.reportportal.exception.ReportPortalException;
-import com.epam.ta.reportportal.ws.model.ErrorType;
+import com.epam.ta.reportportal.ws.reporting.ErrorType;
 import com.google.common.collect.Lists;
 import java.util.Map;
 import org.springframework.beans.factory.annotation.Autowired;
diff --git a/src/main/java/com/epam/ta/reportportal/core/widget/impl/CreateWidgetHandlerImpl.java b/src/main/java/com/epam/ta/reportportal/core/widget/impl/CreateWidgetHandlerImpl.java
index 905104b9bc..f6cf7e994d 100644
--- a/src/main/java/com/epam/ta/reportportal/core/widget/impl/CreateWidgetHandlerImpl.java
+++ b/src/main/java/com/epam/ta/reportportal/core/widget/impl/CreateWidgetHandlerImpl.java
@@ -38,7 +38,7 @@
 import com.epam.ta.reportportal.model.EntryCreatedRS;
 import com.epam.ta.reportportal.model.widget.WidgetRQ;
 import com.epam.ta.reportportal.ws.converter.builders.WidgetBuilder;
-import com.epam.ta.reportportal.ws.model.ErrorType;
+import com.epam.ta.reportportal.ws.reporting.ErrorType;
 import java.util.Collections;
 import java.util.List;
 import java.util.stream.Collectors;
diff --git a/src/main/java/com/epam/ta/reportportal/core/widget/impl/GetWidgetHandlerImpl.java b/src/main/java/com/epam/ta/reportportal/core/widget/impl/GetWidgetHandlerImpl.java
index 878913db4a..85a308cd09 100644
--- a/src/main/java/com/epam/ta/reportportal/core/widget/impl/GetWidgetHandlerImpl.java
+++ b/src/main/java/com/epam/ta/reportportal/core/widget/impl/GetWidgetHandlerImpl.java
@@ -40,7 +40,7 @@
 import com.epam.ta.reportportal.ws.converter.PagedResourcesAssembler;
 import com.epam.ta.reportportal.ws.converter.builders.WidgetBuilder;
 import com.epam.ta.reportportal.ws.converter.converters.WidgetConverter;
-import com.epam.ta.reportportal.ws.model.ErrorType;
+import com.epam.ta.reportportal.ws.reporting.ErrorType;
 import com.google.common.collect.Lists;
 import java.util.Collection;
 import java.util.Collections;
diff --git a/src/main/java/com/epam/ta/reportportal/core/widget/impl/UpdateWidgetHandlerImpl.java b/src/main/java/com/epam/ta/reportportal/core/widget/impl/UpdateWidgetHandlerImpl.java
index 5df764f7f1..a4af63bb70 100644
--- a/src/main/java/com/epam/ta/reportportal/core/widget/impl/UpdateWidgetHandlerImpl.java
+++ b/src/main/java/com/epam/ta/reportportal/core/widget/impl/UpdateWidgetHandlerImpl.java
@@ -37,8 +37,8 @@
 import com.epam.ta.reportportal.model.activity.WidgetActivityResource;
 import com.epam.ta.reportportal.model.widget.WidgetRQ;
 import com.epam.ta.reportportal.ws.converter.builders.WidgetBuilder;
-import com.epam.ta.reportportal.ws.model.ErrorType;
-import com.epam.ta.reportportal.ws.model.OperationCompletionRS;
+import com.epam.ta.reportportal.ws.reporting.ErrorType;
+import com.epam.ta.reportportal.ws.reporting.OperationCompletionRS;
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import java.util.Collections;
diff --git a/src/main/java/com/epam/ta/reportportal/core/widget/util/WidgetFilterUtil.java b/src/main/java/com/epam/ta/reportportal/core/widget/util/WidgetFilterUtil.java
index 370bf584c2..3bd1babfbf 100644
--- a/src/main/java/com/epam/ta/reportportal/core/widget/util/WidgetFilterUtil.java
+++ b/src/main/java/com/epam/ta/reportportal/core/widget/util/WidgetFilterUtil.java
@@ -21,7 +21,7 @@
 
 import com.epam.ta.reportportal.commons.querygen.Filter;
 import com.epam.ta.reportportal.exception.ReportPortalException;
-import com.epam.ta.reportportal.ws.model.ErrorType;
+import com.epam.ta.reportportal.ws.reporting.ErrorType;
 import com.google.common.collect.Lists;
 import java.util.Collection;
 import java.util.Set;
diff --git a/src/main/java/com/epam/ta/reportportal/core/widget/util/WidgetOptionUtil.java b/src/main/java/com/epam/ta/reportportal/core/widget/util/WidgetOptionUtil.java
index 4628d3b44d..a2d0306ce6 100644
--- a/src/main/java/com/epam/ta/reportportal/core/widget/util/WidgetOptionUtil.java
+++ b/src/main/java/com/epam/ta/reportportal/core/widget/util/WidgetOptionUtil.java
@@ -22,7 +22,7 @@
 import com.epam.ta.reportportal.commons.validation.Suppliers;
 import com.epam.ta.reportportal.entity.widget.WidgetOptions;
 import com.epam.ta.reportportal.exception.ReportPortalException;
-import com.epam.ta.reportportal.ws.model.ErrorType;
+import com.epam.ta.reportportal.ws.reporting.ErrorType;
 import java.util.Collections;
 import java.util.List;
 import java.util.Map;
diff --git a/src/main/java/com/epam/ta/reportportal/demodata/service/ContentUtils.java b/src/main/java/com/epam/ta/reportportal/demodata/service/ContentUtils.java
index ddf95cfb71..7f37bf1785 100644
--- a/src/main/java/com/epam/ta/reportportal/demodata/service/ContentUtils.java
+++ b/src/main/java/com/epam/ta/reportportal/demodata/service/ContentUtils.java
@@ -25,8 +25,8 @@
 import com.epam.ta.reportportal.entity.enums.TestItemIssueGroup;
 import com.epam.ta.reportportal.entity.enums.TestItemTypeEnum;
 import com.epam.ta.reportportal.exception.ReportPortalException;
-import com.epam.ta.reportportal.ws.model.attribute.ItemAttributesRQ;
-import com.epam.ta.reportportal.ws.model.issue.Issue;
+import com.epam.ta.reportportal.ws.reporting.Issue;
+import com.epam.ta.reportportal.ws.reporting.ItemAttributesRQ;
 import com.google.common.base.CaseFormat;
 import com.google.common.base.Preconditions;
 import com.google.common.collect.Range;
diff --git a/src/main/java/com/epam/ta/reportportal/demodata/service/DefaultDemoDataFacade.java b/src/main/java/com/epam/ta/reportportal/demodata/service/DefaultDemoDataFacade.java
index cc147439b8..84261990ca 100644
--- a/src/main/java/com/epam/ta/reportportal/demodata/service/DefaultDemoDataFacade.java
+++ b/src/main/java/com/epam/ta/reportportal/demodata/service/DefaultDemoDataFacade.java
@@ -30,7 +30,7 @@
 import com.epam.ta.reportportal.entity.log.Log;
 import com.epam.ta.reportportal.entity.user.User;
 import com.epam.ta.reportportal.exception.ReportPortalException;
-import com.epam.ta.reportportal.ws.model.ErrorType;
+import com.epam.ta.reportportal.ws.reporting.ErrorType;
 import com.fasterxml.jackson.core.type.TypeReference;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import java.io.IOException;
diff --git a/src/main/java/com/epam/ta/reportportal/demodata/service/DemoDashboardsService.java b/src/main/java/com/epam/ta/reportportal/demodata/service/DemoDashboardsService.java
index 51ec7a5ce1..05107b27d5 100644
--- a/src/main/java/com/epam/ta/reportportal/demodata/service/DemoDashboardsService.java
+++ b/src/main/java/com/epam/ta/reportportal/demodata/service/DemoDashboardsService.java
@@ -18,7 +18,7 @@
 
 import static com.epam.ta.reportportal.commons.querygen.constant.GeneralCriteriaConstant.CRITERIA_NAME;
 import static com.epam.ta.reportportal.commons.querygen.constant.ItemAttributeConstant.CRITERIA_COMPOSITE_ATTRIBUTE;
-import static com.epam.ta.reportportal.ws.model.ErrorType.PROJECT_NOT_FOUND;
+import static com.epam.ta.reportportal.ws.reporting.ErrorType.PROJECT_NOT_FOUND;
 import static java.util.stream.Collectors.toList;
 
 import com.epam.ta.reportportal.commons.ReportPortalUser;
@@ -43,7 +43,7 @@
 import com.epam.ta.reportportal.exception.ReportPortalException;
 import com.epam.ta.reportportal.model.widget.WidgetRQ;
 import com.epam.ta.reportportal.ws.converter.builders.WidgetBuilder;
-import com.epam.ta.reportportal.ws.model.ErrorType;
+import com.epam.ta.reportportal.ws.reporting.ErrorType;
 import com.fasterxml.jackson.core.type.TypeReference;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.google.common.collect.Sets;
diff --git a/src/main/java/com/epam/ta/reportportal/demodata/service/DemoDataLaunchService.java b/src/main/java/com/epam/ta/reportportal/demodata/service/DemoDataLaunchService.java
index 9f6fdf2ebb..d2864bba36 100644
--- a/src/main/java/com/epam/ta/reportportal/demodata/service/DemoDataLaunchService.java
+++ b/src/main/java/com/epam/ta/reportportal/demodata/service/DemoDataLaunchService.java
@@ -17,7 +17,7 @@
 package com.epam.ta.reportportal.demodata.service;
 
 import static com.epam.ta.reportportal.entity.enums.StatusEnum.PASSED;
-import static com.epam.ta.reportportal.ws.model.ErrorType.LAUNCH_NOT_FOUND;
+import static com.epam.ta.reportportal.ws.reporting.ErrorType.LAUNCH_NOT_FOUND;
 
 import com.epam.reportportal.extension.event.LaunchFinishedPluginEvent;
 import com.epam.ta.reportportal.commons.ReportPortalUser;
@@ -28,9 +28,9 @@
 import com.epam.ta.reportportal.entity.user.User;
 import com.epam.ta.reportportal.exception.ReportPortalException;
 import com.epam.ta.reportportal.ws.converter.builders.LaunchBuilder;
-import com.epam.ta.reportportal.ws.model.attribute.ItemAttributesRQ;
-import com.epam.ta.reportportal.ws.model.launch.Mode;
-import com.epam.ta.reportportal.ws.model.launch.StartLaunchRQ;
+import com.epam.ta.reportportal.ws.reporting.ItemAttributesRQ;
+import com.epam.ta.reportportal.ws.reporting.Mode;
+import com.epam.ta.reportportal.ws.reporting.StartLaunchRQ;
 import com.google.common.collect.Sets;
 import java.time.LocalDateTime;
 import java.time.ZoneId;
diff --git a/src/main/java/com/epam/ta/reportportal/demodata/service/DemoDataTestItemService.java b/src/main/java/com/epam/ta/reportportal/demodata/service/DemoDataTestItemService.java
index 8d41ab3fde..76669c81ab 100644
--- a/src/main/java/com/epam/ta/reportportal/demodata/service/DemoDataTestItemService.java
+++ b/src/main/java/com/epam/ta/reportportal/demodata/service/DemoDataTestItemService.java
@@ -29,8 +29,8 @@
 import com.epam.ta.reportportal.entity.enums.StatusEnum;
 import com.epam.ta.reportportal.entity.enums.TestItemIssueGroup;
 import com.epam.ta.reportportal.entity.enums.TestItemTypeEnum;
-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 java.util.Date;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
diff --git a/src/main/java/com/epam/ta/reportportal/demodata/service/DemoLogsService.java b/src/main/java/com/epam/ta/reportportal/demodata/service/DemoLogsService.java
index ce21a02fb7..6a5c5f23fc 100644
--- a/src/main/java/com/epam/ta/reportportal/demodata/service/DemoLogsService.java
+++ b/src/main/java/com/epam/ta/reportportal/demodata/service/DemoLogsService.java
@@ -16,6 +16,18 @@
 
 package com.epam.ta.reportportal.demodata.service;
 
+import static com.epam.ta.reportportal.entity.enums.LogLevel.DEBUG;
+import static com.epam.ta.reportportal.entity.enums.LogLevel.ERROR;
+import static com.epam.ta.reportportal.entity.enums.LogLevel.FATAL;
+import static com.epam.ta.reportportal.entity.enums.LogLevel.INFO;
+import static com.epam.ta.reportportal.entity.enums.LogLevel.TRACE;
+import static com.epam.ta.reportportal.entity.enums.LogLevel.WARN;
+import static com.epam.ta.reportportal.entity.enums.StatusEnum.FAILED;
+import static com.epam.ta.reportportal.util.MultipartFileUtils.getMultipartFile;
+import static com.epam.ta.reportportal.ws.converter.converters.LogConverter.LOG_FULL_TO_LOG;
+import static java.util.stream.Collectors.toList;
+import static org.apache.commons.collections4.CollectionUtils.isNotEmpty;
+
 import com.epam.ta.reportportal.binary.AttachmentBinaryDataService;
 import com.epam.ta.reportportal.core.log.LogService;
 import com.epam.ta.reportportal.dao.LaunchRepository;
@@ -29,26 +41,18 @@
 import com.epam.ta.reportportal.entity.log.Log;
 import com.epam.ta.reportportal.entity.log.LogFull;
 import com.epam.ta.reportportal.exception.ReportPortalException;
-import com.epam.ta.reportportal.ws.model.ErrorType;
-import java.util.HashMap;
-import java.util.Map;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.stereotype.Service;
-
+import com.epam.ta.reportportal.ws.reporting.ErrorType;
 import java.io.IOException;
 import java.time.LocalDateTime;
 import java.time.ZoneOffset;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 import java.util.SplittableRandom;
 import java.util.UUID;
 import java.util.stream.IntStream;
-
-import static com.epam.ta.reportportal.entity.enums.LogLevel.*;
-import static com.epam.ta.reportportal.entity.enums.StatusEnum.FAILED;
-import static com.epam.ta.reportportal.util.MultipartFileUtils.getMultipartFile;
-import static com.epam.ta.reportportal.ws.converter.converters.LogConverter.LOG_FULL_TO_LOG;
-import static java.util.stream.Collectors.toList;
-import static org.apache.commons.collections4.CollectionUtils.isNotEmpty;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.stereotype.Service;
 
 @Service
 public class DemoLogsService {
diff --git a/src/main/java/com/epam/ta/reportportal/job/LoadPluginsJob.java b/src/main/java/com/epam/ta/reportportal/job/LoadPluginsJob.java
index 5ab29ced26..c5765c09b3 100644
--- a/src/main/java/com/epam/ta/reportportal/job/LoadPluginsJob.java
+++ b/src/main/java/com/epam/ta/reportportal/job/LoadPluginsJob.java
@@ -25,7 +25,7 @@
 import com.epam.ta.reportportal.exception.ReportPortalException;
 import com.epam.ta.reportportal.filesystem.DataStore;
 import com.epam.ta.reportportal.job.service.PluginLoaderService;
-import com.epam.ta.reportportal.ws.model.ErrorType;
+import com.epam.ta.reportportal.ws.reporting.ErrorType;
 import java.io.File;
 import java.io.IOException;
 import java.io.InputStream;
diff --git a/src/main/java/com/epam/ta/reportportal/model/BulkInfoUpdateRQ.java b/src/main/java/com/epam/ta/reportportal/model/BulkInfoUpdateRQ.java
deleted file mode 100644
index f555aad24a..0000000000
--- a/src/main/java/com/epam/ta/reportportal/model/BulkInfoUpdateRQ.java
+++ /dev/null
@@ -1,91 +0,0 @@
-/*
- * 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.ta.reportportal.model;
-
-import com.epam.ta.reportportal.ws.model.attribute.UpdateItemAttributeRQ;
-import java.util.List;
-import javax.validation.Valid;
-import javax.validation.constraints.NotNull;
-import javax.validation.constraints.Size;
-
-/**
- * @author <a href="mailto:ihar_kahadouski@epam.com">Ihar Kahadouski</a>
- */
-public class BulkInfoUpdateRQ {
-
-	@NotNull
-	@Size(min = 1)
-	private List<Long> ids;
-
-	private Description description;
-
-	@Valid
-	private List<UpdateItemAttributeRQ> attributes;
-
-	public List<Long> getIds() {
-		return ids;
-	}
-
-	public void setIds(List<Long> ids) {
-		this.ids = ids;
-	}
-
-	public Description getDescription() {
-		return description;
-	}
-
-	public void setDescription(Description description) {
-		this.description = description;
-	}
-
-	public List<UpdateItemAttributeRQ> getAttributes() {
-		return attributes;
-	}
-
-	public void setAttributes(List<UpdateItemAttributeRQ> attributes) {
-		this.attributes = attributes;
-	}
-
-	public enum Action {
-		DELETE,
-		UPDATE,
-		CREATE
-	}
-
-	public static class Description {
-
-		String comment;
-
-		Action action;
-
-		public String getComment() {
-			return comment;
-		}
-
-		public void setComment(String comment) {
-			this.comment = comment;
-		}
-
-		public Action getAction() {
-			return action;
-		}
-
-		public void setAction(Action action) {
-			this.action = action;
-		}
-	}
-}
diff --git a/src/main/java/com/epam/ta/reportportal/model/DeleteBulkRS.java b/src/main/java/com/epam/ta/reportportal/model/DeleteBulkRS.java
index 509bcb660a..7e6ec5bfb0 100644
--- a/src/main/java/com/epam/ta/reportportal/model/DeleteBulkRS.java
+++ b/src/main/java/com/epam/ta/reportportal/model/DeleteBulkRS.java
@@ -16,7 +16,7 @@
 
 package com.epam.ta.reportportal.model;
 
-import com.epam.ta.reportportal.ws.model.ErrorRS;
+import com.epam.ta.reportportal.ws.reporting.ErrorRS;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import java.util.List;
 
diff --git a/src/main/java/com/epam/ta/reportportal/model/LaunchImportCompletionRS.java b/src/main/java/com/epam/ta/reportportal/model/LaunchImportCompletionRS.java
index d365ccdc80..762bbd2573 100644
--- a/src/main/java/com/epam/ta/reportportal/model/LaunchImportCompletionRS.java
+++ b/src/main/java/com/epam/ta/reportportal/model/LaunchImportCompletionRS.java
@@ -16,7 +16,7 @@
 
 package com.epam.ta.reportportal.model;
 
-import com.epam.ta.reportportal.ws.model.OperationCompletionRS;
+import com.epam.ta.reportportal.ws.reporting.OperationCompletionRS;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import lombok.AllArgsConstructor;
 import lombok.Getter;
diff --git a/src/main/java/com/epam/ta/reportportal/model/TestItemHistoryElement.java b/src/main/java/com/epam/ta/reportportal/model/TestItemHistoryElement.java
index c5c26592d3..a40ffdb4d3 100644
--- a/src/main/java/com/epam/ta/reportportal/model/TestItemHistoryElement.java
+++ b/src/main/java/com/epam/ta/reportportal/model/TestItemHistoryElement.java
@@ -16,6 +16,7 @@
 
 package com.epam.ta.reportportal.model;
 
+import com.epam.ta.reportportal.ws.reporting.TestItemResource;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonInclude.Include;
 import com.fasterxml.jackson.annotation.JsonProperty;
diff --git a/src/main/java/com/epam/ta/reportportal/model/TestItemResource.java b/src/main/java/com/epam/ta/reportportal/model/TestItemResource.java
deleted file mode 100644
index dcf9550152..0000000000
--- a/src/main/java/com/epam/ta/reportportal/model/TestItemResource.java
+++ /dev/null
@@ -1,345 +0,0 @@
-/*
- * 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.ta.reportportal.model;
-
-import com.epam.ta.reportportal.ws.model.ParameterResource;
-import com.epam.ta.reportportal.ws.model.attribute.ItemAttributeResource;
-import com.epam.ta.reportportal.ws.model.issue.Issue;
-import com.epam.ta.reportportal.ws.model.item.PathNameResource;
-import com.epam.ta.reportportal.ws.model.statistics.StatisticsResource;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonInclude.Include;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import java.util.Date;
-import java.util.List;
-import java.util.Set;
-
-/**
- * JSON Representation of Report Portal domain object
- *
- * @author Andrei Varabyeu
- */
-@JsonInclude(Include.NON_NULL)
-public class TestItemResource {
-
-	@JsonProperty(value = "id")
-	private Long itemId;
-
-	@JsonProperty(value = "uuid")
-	private String uuid;
-
-	@JsonProperty(value = "name")
-	private String name;
-
-	@JsonProperty(value = "codeRef")
-	private String codeRef;
-
-	@JsonProperty(value = "description")
-	private String description;
-
-	@JsonProperty(value = "parameters")
-	private List<ParameterResource> parameters;
-
-	@JsonProperty(value = "attributes")
-	private Set<ItemAttributeResource> attributes;
-
-	@JsonProperty(value = "type")
-	private String type;
-
-	@JsonProperty(value = "startTime")
-	private Date startTime;
-
-	@JsonProperty(value = "endTime")
-	private Date endTime;
-
-	@JsonProperty(value = "status")
-	private String status;
-
-	@JsonProperty(value = "statistics")
-	private StatisticsResource statisticsResource;
-
-	@JsonProperty(value = "parent")
-	private Long parent;
-
-	@JsonProperty(value = "pathNames")
-	private PathNameResource pathNames;
-
-	@JsonProperty(value = "launchStatus")
-	private String launchStatus;
-
-	@JsonProperty(value = "issue")
-	private Issue issue;
-
-	@JsonProperty(value = "hasChildren")
-	private boolean hasChildren;
-
-	@JsonProperty(value = "hasStats")
-	private boolean hasStats;
-
-	@JsonProperty(value = "launchId")
-	private Long launchId;
-
-	@JsonProperty(value = "uniqueId")
-	private String uniqueId;
-
-	@JsonProperty(value = "testCaseId")
-	private String testCaseId;
-
-	@JsonProperty(value = "testCaseHash")
-	private Integer testCaseHash;
-
-	@JsonProperty(value = "patternTemplates")
-	private Set<String> patternTemplates;
-
-	@JsonProperty(value = "retries")
-	private List<TestItemResource> retries;
-
-	@JsonProperty(value = "path")
-	private String path;
-
-	public List<TestItemResource> getRetries() {
-		return retries;
-	}
-
-	public void setRetries(List<TestItemResource> retries) {
-		this.retries = retries;
-	}
-
-	public Long getLaunchId() {
-		return launchId;
-	}
-
-	public void setLaunchId(Long launchId) {
-		this.launchId = launchId;
-	}
-
-	public String getUuid() {
-		return uuid;
-	}
-
-	public void setUuid(String uuid) {
-		this.uuid = uuid;
-	}
-
-	public Long getItemId() {
-		return itemId;
-	}
-
-	public void setItemId(Long itemId) {
-		this.itemId = itemId;
-	}
-
-	public Issue getIssue() {
-		return issue;
-	}
-
-	public void setIssue(Issue issue) {
-		this.issue = issue;
-	}
-
-	public String getName() {
-		return name;
-	}
-
-	public void setName(String name) {
-		this.name = name;
-	}
-
-	public String getCodeRef() {
-		return codeRef;
-	}
-
-	public void setCodeRef(String codeRef) {
-		this.codeRef = codeRef;
-	}
-
-	public String getDescription() {
-		return description;
-	}
-
-	public void setDescription(String description) {
-		this.description = description;
-	}
-
-	public List<ParameterResource> getParameters() {
-		return parameters;
-	}
-
-	public void setParameters(List<ParameterResource> parameters) {
-		this.parameters = parameters;
-	}
-
-	public Set<ItemAttributeResource> getAttributes() {
-		return attributes;
-	}
-
-	public void setAttributes(Set<ItemAttributeResource> attributes) {
-		this.attributes = attributes;
-	}
-
-	public String getType() {
-		return type;
-	}
-
-	public void setType(String type) {
-		this.type = type;
-	}
-
-	public Date getStartTime() {
-		return startTime;
-	}
-
-	public void setStartTime(Date startTime) {
-		this.startTime = startTime;
-	}
-
-	public Date getEndTime() {
-		return endTime;
-	}
-
-	public void setEndTime(Date endTime) {
-		this.endTime = endTime;
-	}
-
-	public String getStatus() {
-		return status;
-	}
-
-	public void setStatus(String status) {
-		this.status = status;
-	}
-
-	public Long getParent() {
-		return parent;
-	}
-
-	public void setParent(Long parent) {
-		this.parent = parent;
-	}
-
-	public PathNameResource getPathNames() {
-		return pathNames;
-	}
-
-	public void setPathNames(PathNameResource pathNames) {
-		this.pathNames = pathNames;
-	}
-
-	public void setLaunchStatus(String value) {
-		this.launchStatus = value;
-	}
-
-	public String getLaunchStatus() {
-		return launchStatus;
-	}
-
-	public StatisticsResource getStatisticsResource() {
-		return statisticsResource;
-	}
-
-	public void setStatisticsResource(StatisticsResource statisticsResource) {
-		this.statisticsResource = statisticsResource;
-	}
-
-	public boolean isHasChildren() {
-		return hasChildren;
-	}
-
-	public void setHasChildren(boolean hasChildren) {
-		this.hasChildren = hasChildren;
-	}
-
-	public boolean isHasStats() {
-		return hasStats;
-	}
-
-	public void setHasStats(boolean hasStats) {
-		this.hasStats = hasStats;
-	}
-
-	public String getUniqueId() {
-		return uniqueId;
-	}
-
-	public void setUniqueId(String uniqueId) {
-		this.uniqueId = uniqueId;
-	}
-
-	public String getTestCaseId() {
-		return testCaseId;
-	}
-
-	public void setTestCaseId(String testCaseId) {
-		this.testCaseId = testCaseId;
-	}
-
-	public Integer getTestCaseHash() {
-		return testCaseHash;
-	}
-
-	public void setTestCaseHash(Integer testCaseHash) {
-		this.testCaseHash = testCaseHash;
-	}
-
-	public String getPath() {
-		return path;
-	}
-
-	public void setPath(String path) {
-		this.path = path;
-	}
-
-	public Set<String> getPatternTemplates() {
-		return patternTemplates;
-	}
-
-	public void setPatternTemplates(Set<String> patternTemplates) {
-		this.patternTemplates = patternTemplates;
-	}
-
-	@Override
-	public String toString() {
-		final StringBuilder sb = new StringBuilder("TestItemResource{");
-		sb.append("itemId=").append(itemId);
-		sb.append(", uuid='").append(uuid).append('\'');
-		sb.append(", name='").append(name).append('\'');
-		sb.append(", codeRef='").append(codeRef).append('\'');
-		sb.append(", description='").append(description).append('\'');
-		sb.append(", parameters=").append(parameters);
-		sb.append(", attributes=").append(attributes);
-		sb.append(", type='").append(type).append('\'');
-		sb.append(", startTime=").append(startTime);
-		sb.append(", endTime=").append(endTime);
-		sb.append(", status='").append(status).append('\'');
-		sb.append(", statisticsResource=").append(statisticsResource);
-		sb.append(", parent=").append(parent);
-		sb.append(", pathNames=").append(pathNames);
-		sb.append(", launchStatus='").append(launchStatus).append('\'');
-		sb.append(", issue=").append(issue);
-		sb.append(", hasChildren=").append(hasChildren);
-		sb.append(", hasStats=").append(hasStats);
-		sb.append(", launchId=").append(launchId);
-		sb.append(", uniqueId='").append(uniqueId).append('\'');
-		sb.append(", testCaseId='").append(testCaseId).append('\'');
-		sb.append(", testCaseHash='").append(testCaseHash).append('\'');
-		sb.append(", patternTemplates=").append(patternTemplates);
-		sb.append(", retries=").append(retries);
-		sb.append(", path='").append(path).append('\'');
-		sb.append('}');
-		return sb.toString();
-	}
-}
diff --git a/src/main/java/com/epam/ta/reportportal/model/dashboard/DashboardResource.java b/src/main/java/com/epam/ta/reportportal/model/dashboard/DashboardResource.java
index 944643c093..d5c6615ea0 100644
--- a/src/main/java/com/epam/ta/reportportal/model/dashboard/DashboardResource.java
+++ b/src/main/java/com/epam/ta/reportportal/model/dashboard/DashboardResource.java
@@ -17,8 +17,8 @@
 package com.epam.ta.reportportal.model.dashboard;
 
 import com.epam.ta.reportportal.model.Position;
-import com.epam.ta.reportportal.ws.model.OwnedResource;
 import com.epam.ta.reportportal.ws.model.ValidationConstraints;
+import com.epam.ta.reportportal.ws.reporting.OwnedResource;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonInclude.Include;
 import com.fasterxml.jackson.annotation.JsonProperty;
diff --git a/src/main/java/com/epam/ta/reportportal/model/filter/UserFilterResource.java b/src/main/java/com/epam/ta/reportportal/model/filter/UserFilterResource.java
index 64f7e1fe7c..4bd169e53c 100644
--- a/src/main/java/com/epam/ta/reportportal/model/filter/UserFilterResource.java
+++ b/src/main/java/com/epam/ta/reportportal/model/filter/UserFilterResource.java
@@ -21,7 +21,7 @@
 import static com.epam.ta.reportportal.ws.model.ValidationConstraints.MIN_NAME_LENGTH;
 
 import com.epam.ta.reportportal.ws.annotations.In;
-import com.epam.ta.reportportal.ws.model.OwnedResource;
+import com.epam.ta.reportportal.ws.reporting.OwnedResource;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonInclude.Include;
 import com.fasterxml.jackson.annotation.JsonProperty;
diff --git a/src/main/java/com/epam/ta/reportportal/model/issue/IssueDefinition.java b/src/main/java/com/epam/ta/reportportal/model/issue/IssueDefinition.java
index bc45ea21d9..cad1f46d81 100644
--- a/src/main/java/com/epam/ta/reportportal/model/issue/IssueDefinition.java
+++ b/src/main/java/com/epam/ta/reportportal/model/issue/IssueDefinition.java
@@ -16,7 +16,7 @@
  
 package com.epam.ta.reportportal.model.issue;
 
-import com.epam.ta.reportportal.ws.model.issue.Issue;
+import com.epam.ta.reportportal.ws.reporting.Issue;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonInclude.Include;
 import com.fasterxml.jackson.annotation.JsonProperty;
diff --git a/src/main/java/com/epam/ta/reportportal/model/item/LinkExternalIssueRQ.java b/src/main/java/com/epam/ta/reportportal/model/item/LinkExternalIssueRQ.java
index 28678ca930..3663be9c81 100644
--- a/src/main/java/com/epam/ta/reportportal/model/item/LinkExternalIssueRQ.java
+++ b/src/main/java/com/epam/ta/reportportal/model/item/LinkExternalIssueRQ.java
@@ -16,7 +16,7 @@
 
 package com.epam.ta.reportportal.model.item;
 
-import com.epam.ta.reportportal.ws.model.issue.Issue;
+import com.epam.ta.reportportal.ws.reporting.Issue;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import io.swagger.v3.oas.annotations.media.Schema;
diff --git a/src/main/java/com/epam/ta/reportportal/model/item/UpdateTestItemRQ.java b/src/main/java/com/epam/ta/reportportal/model/item/UpdateTestItemRQ.java
index 0a1fdce5bd..d623d206f5 100644
--- a/src/main/java/com/epam/ta/reportportal/model/item/UpdateTestItemRQ.java
+++ b/src/main/java/com/epam/ta/reportportal/model/item/UpdateTestItemRQ.java
@@ -18,7 +18,7 @@
 
 import static com.epam.ta.reportportal.ws.model.ValidationConstraints.MAX_PARAMETERS_LENGTH;
 
-import com.epam.ta.reportportal.ws.model.attribute.ItemAttributeResource;
+import com.epam.ta.reportportal.ws.reporting.ItemAttributeResource;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import java.util.Set;
diff --git a/src/main/java/com/epam/ta/reportportal/model/launch/FinishLaunchRS.java b/src/main/java/com/epam/ta/reportportal/model/launch/FinishLaunchRS.java
index 2125956a9a..85bae068fc 100644
--- a/src/main/java/com/epam/ta/reportportal/model/launch/FinishLaunchRS.java
+++ b/src/main/java/com/epam/ta/reportportal/model/launch/FinishLaunchRS.java
@@ -15,7 +15,7 @@
  */
 package com.epam.ta.reportportal.model.launch;
 
-import com.epam.ta.reportportal.ws.model.EntryCreatedAsyncRS;
+import com.epam.ta.reportportal.ws.reporting.EntryCreatedAsyncRS;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
 
diff --git a/src/main/java/com/epam/ta/reportportal/model/launch/LaunchImportRQ.java b/src/main/java/com/epam/ta/reportportal/model/launch/LaunchImportRQ.java
index a1da49a079..4513626ffc 100644
--- a/src/main/java/com/epam/ta/reportportal/model/launch/LaunchImportRQ.java
+++ b/src/main/java/com/epam/ta/reportportal/model/launch/LaunchImportRQ.java
@@ -20,8 +20,8 @@
 import static com.epam.ta.reportportal.ws.model.ValidationConstraints.MAX_PARAMETERS_LENGTH;
 import static com.epam.ta.reportportal.ws.model.ValidationConstraints.MIN_LAUNCH_NAME_LENGTH;
 
-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 com.fasterxml.jackson.annotation.JsonAlias;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import io.swagger.v3.oas.annotations.media.Schema;
diff --git a/src/main/java/com/epam/ta/reportportal/model/launch/MergeLaunchesRQ.java b/src/main/java/com/epam/ta/reportportal/model/launch/MergeLaunchesRQ.java
deleted file mode 100644
index 1a052d15d7..0000000000
--- a/src/main/java/com/epam/ta/reportportal/model/launch/MergeLaunchesRQ.java
+++ /dev/null
@@ -1,209 +0,0 @@
-/*
- * 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.ta.reportportal.model.launch;
-
-import static com.epam.ta.reportportal.ws.model.ValidationConstraints.MAX_PARAMETERS_LENGTH;
-
-import com.epam.ta.reportportal.ws.annotations.NotBlankWithSize;
-import com.epam.ta.reportportal.ws.model.ValidationConstraints;
-import com.epam.ta.reportportal.ws.model.attribute.ItemAttributeResource;
-import com.epam.ta.reportportal.ws.model.launch.Mode;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonInclude.Include;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import io.swagger.v3.oas.annotations.media.Schema;
-import io.swagger.v3.oas.annotations.media.Schema.RequiredMode;
-import java.util.Date;
-import java.util.Set;
-import javax.validation.Valid;
-import javax.validation.constraints.NotEmpty;
-import javax.validation.constraints.NotNull;
-import javax.validation.constraints.Size;
-
-@JsonInclude(Include.NON_NULL)
-public class MergeLaunchesRQ {
-
-	@NotBlankWithSize(min = ValidationConstraints.MIN_LAUNCH_NAME_LENGTH, max = ValidationConstraints.MAX_NAME_LENGTH)
-	@JsonProperty(value = "name", required = true)
-	@Schema(requiredMode = RequiredMode.REQUIRED)
-	private String name;
-
-	@JsonProperty(value = "description")
-	private String description;
-
-	@Size(max = MAX_PARAMETERS_LENGTH)
-	@Valid
-	@JsonProperty("attributes")
-	private Set<ItemAttributeResource> attributes;
-
-	@JsonProperty(value = "startTime")
-	@Schema
-	private Date startTime;
-
-	@JsonProperty("mode")
-	private com.epam.ta.reportportal.ws.model.launch.Mode mode;
-
-	@NotEmpty
-	@JsonProperty(value = "launches", required = true)
-	@Schema(requiredMode = RequiredMode.REQUIRED)
-	private Set<Long> launches;
-
-	@JsonProperty(value = "endTime")
-	@Schema
-	private Date endTime;
-
-	@NotNull
-	@JsonProperty("mergeType")
-	@Schema(allowableValues = "BASIC, DEEP")
-	private String mergeStrategyType;
-
-	@JsonProperty(value = "extendSuitesDescription", required = true)
-	private boolean extendSuitesDescription;
-
-	public String getName() {
-		return name;
-	}
-
-	public void setName(@NotNull String name) {
-		this.name = name;
-	}
-
-	public String getDescription() {
-		return description;
-	}
-
-	public void setDescription(String description) {
-		this.description = description;
-	}
-
-	public Set<ItemAttributeResource> getAttributes() {
-		return attributes;
-	}
-
-	public void setAttributes(Set<ItemAttributeResource> attributes) {
-		this.attributes = attributes;
-	}
-
-	public Date getStartTime() {
-		return startTime;
-	}
-
-	public void setStartTime(Date startTime) {
-		this.startTime = startTime;
-	}
-
-	public com.epam.ta.reportportal.ws.model.launch.Mode getMode() {
-		return mode;
-	}
-
-	public void setMode(Mode mode) {
-		this.mode = mode;
-	}
-
-	@NotNull
-	public Set<Long> getLaunches() {
-		return launches;
-	}
-
-	public void setLaunches(@NotNull Set<Long> launches) {
-		this.launches = launches;
-	}
-
-	public Date getEndTime() {
-		return endTime;
-	}
-
-	public void setEndTime(Date endTime) {
-		this.endTime = endTime;
-	}
-
-	@NotNull
-	public String getMergeStrategyType() {
-		return mergeStrategyType;
-	}
-
-	public void setMergeStrategyType(@NotNull String mergeStrategyType) {
-		this.mergeStrategyType = mergeStrategyType;
-	}
-
-	public boolean isExtendSuitesDescription() {
-		return extendSuitesDescription;
-	}
-
-	public void setExtendSuitesDescription(boolean extendSuitesDescription) {
-		this.extendSuitesDescription = extendSuitesDescription;
-	}
-
-	@Override
-	public boolean equals(Object o) {
-		if (this == o) {
-			return true;
-		}
-		if (o == null || getClass() != o.getClass()) {
-			return false;
-		}
-
-		MergeLaunchesRQ that = (MergeLaunchesRQ) o;
-
-		if (extendSuitesDescription != that.extendSuitesDescription) {
-			return false;
-		}
-		if (!name.equals(that.name)) {
-			return false;
-		}
-		if (description != null ? !description.equals(that.description) : that.description != null) {
-			return false;
-		}
-		if (attributes != null ? !attributes.equals(that.attributes) : that.attributes != null) {
-			return false;
-		}
-		if (startTime != null ? !startTime.equals(that.startTime) : that.startTime != null) {
-			return false;
-		}
-		if (mode != that.mode) {
-			return false;
-		}
-		if (!launches.equals(that.launches)) {
-			return false;
-		}
-		if (endTime != null ? !endTime.equals(that.endTime) : that.endTime != null) {
-			return false;
-		}
-		return mergeStrategyType.equals(that.mergeStrategyType);
-	}
-
-	@Override
-	public int hashCode() {
-		int result = name.hashCode();
-		result = 31 * result + (description != null ? description.hashCode() : 0);
-		result = 31 * result + (attributes != null ? attributes.hashCode() : 0);
-		result = 31 * result + (startTime != null ? startTime.hashCode() : 0);
-		result = 31 * result + (mode != null ? mode.hashCode() : 0);
-		result = 31 * result + launches.hashCode();
-		result = 31 * result + (endTime != null ? endTime.hashCode() : 0);
-		result = 31 * result + mergeStrategyType.hashCode();
-		result = 31 * result + (extendSuitesDescription ? 1 : 0);
-		return result;
-	}
-
-	@Override
-	public String toString() {
-		return "MergeLaunchesRQ{" + "name='" + name + '\'' + ", description='" + description + '\'' + ", attributes=" + attributes
-				+ ", startTime=" + startTime + ", mode=" + mode + ", launches=" + launches + ", endTime=" + endTime
-				+ ", mergeStrategyType='" + mergeStrategyType + '\'' + ", extendSuitesDescription=" + extendSuitesDescription + '}';
-	}
-}
\ No newline at end of file
diff --git a/src/main/java/com/epam/ta/reportportal/model/launch/UpdateLaunchRQ.java b/src/main/java/com/epam/ta/reportportal/model/launch/UpdateLaunchRQ.java
index 93a7b894e4..666c4c6ec2 100644
--- a/src/main/java/com/epam/ta/reportportal/model/launch/UpdateLaunchRQ.java
+++ b/src/main/java/com/epam/ta/reportportal/model/launch/UpdateLaunchRQ.java
@@ -18,8 +18,8 @@
 
 import static com.epam.ta.reportportal.ws.model.ValidationConstraints.MAX_PARAMETERS_LENGTH;
 
-import com.epam.ta.reportportal.ws.model.attribute.ItemAttributeResource;
-import com.epam.ta.reportportal.ws.model.launch.Mode;
+import com.epam.ta.reportportal.ws.reporting.ItemAttributeResource;
+import com.epam.ta.reportportal.ws.reporting.Mode;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonInclude.Include;
 import com.fasterxml.jackson.annotation.JsonProperty;
@@ -38,7 +38,7 @@ public class UpdateLaunchRQ {
 
 	@JsonProperty("mode")
 	@Schema(allowableValues = "DEFAULT, DEBUG")
-	private com.epam.ta.reportportal.ws.model.launch.Mode mode;
+	private Mode mode;
 
 	@JsonProperty("description")
 	private String description;
@@ -64,7 +64,7 @@ public void setAttributes(Set<ItemAttributeResource> attributes) {
 		this.attributes = attributes;
 	}
 
-	public com.epam.ta.reportportal.ws.model.launch.Mode getMode() {
+	public Mode getMode() {
 		return mode;
 	}
 
diff --git a/src/main/java/com/epam/ta/reportportal/model/log/SearchLogRs.java b/src/main/java/com/epam/ta/reportportal/model/log/SearchLogRs.java
index 2ea2c7c92f..cc2d25969e 100644
--- a/src/main/java/com/epam/ta/reportportal/model/log/SearchLogRs.java
+++ b/src/main/java/com/epam/ta/reportportal/model/log/SearchLogRs.java
@@ -16,8 +16,8 @@
 
 package com.epam.ta.reportportal.model.log;
 
-import com.epam.ta.reportportal.ws.model.issue.Issue;
-import com.epam.ta.reportportal.ws.model.item.PathNameResource;
+import com.epam.ta.reportportal.ws.reporting.Issue;
+import com.epam.ta.reportportal.ws.reporting.PathNameResource;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import java.util.List;
diff --git a/src/main/java/com/epam/ta/reportportal/model/project/email/SenderCaseDTO.java b/src/main/java/com/epam/ta/reportportal/model/project/email/SenderCaseDTO.java
index 89ed310df9..c64130d534 100644
--- a/src/main/java/com/epam/ta/reportportal/model/project/email/SenderCaseDTO.java
+++ b/src/main/java/com/epam/ta/reportportal/model/project/email/SenderCaseDTO.java
@@ -18,7 +18,7 @@
 
 import com.epam.ta.reportportal.ws.annotations.In;
 import com.epam.ta.reportportal.ws.annotations.NotBlankStringCollection;
-import com.epam.ta.reportportal.ws.model.attribute.ItemAttributeResource;
+import com.epam.ta.reportportal.ws.reporting.ItemAttributeResource;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonInclude.Include;
 import com.fasterxml.jackson.annotation.JsonProperty;
diff --git a/src/main/java/com/epam/ta/reportportal/model/widget/WidgetResource.java b/src/main/java/com/epam/ta/reportportal/model/widget/WidgetResource.java
index 1231be11ff..d48faed0f0 100644
--- a/src/main/java/com/epam/ta/reportportal/model/widget/WidgetResource.java
+++ b/src/main/java/com/epam/ta/reportportal/model/widget/WidgetResource.java
@@ -17,8 +17,8 @@
 package com.epam.ta.reportportal.model.widget;
 
 import com.epam.ta.reportportal.model.filter.UserFilterResource;
-import com.epam.ta.reportportal.ws.model.OwnedResource;
 import com.epam.ta.reportportal.ws.model.ValidationConstraints;
+import com.epam.ta.reportportal.ws.reporting.OwnedResource;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import io.swagger.v3.oas.annotations.media.Schema;
 import java.util.List;
diff --git a/src/main/java/com/epam/ta/reportportal/plugin/Pf4jPluginManager.java b/src/main/java/com/epam/ta/reportportal/plugin/Pf4jPluginManager.java
index 07b539354e..c071e220db 100644
--- a/src/main/java/com/epam/ta/reportportal/plugin/Pf4jPluginManager.java
+++ b/src/main/java/com/epam/ta/reportportal/plugin/Pf4jPluginManager.java
@@ -37,7 +37,7 @@
 import com.epam.ta.reportportal.exception.ReportPortalException;
 import com.epam.ta.reportportal.filesystem.DataStore;
 import com.epam.ta.reportportal.ws.converter.builders.IntegrationTypeBuilder;
-import com.epam.ta.reportportal.ws.model.ErrorType;
+import com.epam.ta.reportportal.ws.reporting.ErrorType;
 import com.google.common.cache.Cache;
 import com.google.common.cache.CacheBuilder;
 import java.io.IOException;
diff --git a/src/main/java/com/epam/ta/reportportal/util/BinaryDataResponseWriter.java b/src/main/java/com/epam/ta/reportportal/util/BinaryDataResponseWriter.java
index 463f002999..a12e4f173c 100644
--- a/src/main/java/com/epam/ta/reportportal/util/BinaryDataResponseWriter.java
+++ b/src/main/java/com/epam/ta/reportportal/util/BinaryDataResponseWriter.java
@@ -18,7 +18,7 @@
 
 import com.epam.ta.reportportal.entity.attachment.BinaryData;
 import com.epam.ta.reportportal.exception.ReportPortalException;
-import com.epam.ta.reportportal.ws.model.ErrorType;
+import com.epam.ta.reportportal.ws.reporting.ErrorType;
 import java.io.IOException;
 import java.io.InputStream;
 import javax.servlet.http.HttpServletResponse;
diff --git a/src/main/java/com/epam/ta/reportportal/util/ControllerUtils.java b/src/main/java/com/epam/ta/reportportal/util/ControllerUtils.java
index 3c0f441574..88466a6222 100644
--- a/src/main/java/com/epam/ta/reportportal/util/ControllerUtils.java
+++ b/src/main/java/com/epam/ta/reportportal/util/ControllerUtils.java
@@ -17,8 +17,8 @@
 package com.epam.ta.reportportal.util;
 
 import com.epam.ta.reportportal.exception.ReportPortalException;
-import com.epam.ta.reportportal.ws.model.ErrorType;
-import com.epam.ta.reportportal.ws.model.log.SaveLogRQ;
+import com.epam.ta.reportportal.ws.reporting.ErrorType;
+import com.epam.ta.reportportal.ws.reporting.SaveLogRQ;
 import java.util.Iterator;
 import java.util.List;
 import java.util.Set;
diff --git a/src/main/java/com/epam/ta/reportportal/util/ItemInfoUtils.java b/src/main/java/com/epam/ta/reportportal/util/ItemInfoUtils.java
index 14890df9e4..7650e48a84 100644
--- a/src/main/java/com/epam/ta/reportportal/util/ItemInfoUtils.java
+++ b/src/main/java/com/epam/ta/reportportal/util/ItemInfoUtils.java
@@ -17,13 +17,13 @@
 package com.epam.ta.reportportal.util;
 
 import static com.epam.ta.reportportal.util.Predicates.ITEM_ATTRIBUTE_EQUIVALENCE;
-import static com.epam.ta.reportportal.ws.model.ErrorType.INCORRECT_REQUEST;
+import static com.epam.ta.reportportal.ws.reporting.ErrorType.INCORRECT_REQUEST;
 
 import com.epam.ta.reportportal.entity.ItemAttribute;
 import com.epam.ta.reportportal.exception.ReportPortalException;
-import com.epam.ta.reportportal.ws.model.BulkInfoUpdateRQ;
-import com.epam.ta.reportportal.ws.model.attribute.ItemAttributeResource;
-import com.epam.ta.reportportal.ws.model.attribute.UpdateItemAttributeRQ;
+import com.epam.ta.reportportal.ws.reporting.BulkInfoUpdateRQ;
+import com.epam.ta.reportportal.ws.reporting.ItemAttributeResource;
+import com.epam.ta.reportportal.ws.reporting.UpdateItemAttributeRQ;
 import java.util.Collection;
 import java.util.Objects;
 import java.util.Optional;
@@ -33,8 +33,7 @@
 /**
  * @author <a href="mailto:ihar_kahadouski@epam.com">Ihar Kahadouski</a>
  * <p>
- * Util class. Contains methods for updating
- * {@link com.epam.ta.reportportal.entity.launch.Launch}/{@link
+ * Util class. Contains methods for updating {@link com.epam.ta.reportportal.entity.launch.Launch}/{@link
  * com.epam.ta.reportportal.entity.item.TestItem} attributes and description.
  */
 public class ItemInfoUtils {
diff --git a/src/main/java/com/epam/ta/reportportal/util/Predicates.java b/src/main/java/com/epam/ta/reportportal/util/Predicates.java
index 40e840f958..cf3ee19e26 100644
--- a/src/main/java/com/epam/ta/reportportal/util/Predicates.java
+++ b/src/main/java/com/epam/ta/reportportal/util/Predicates.java
@@ -21,7 +21,7 @@
 import com.epam.ta.reportportal.entity.enums.TestItemTypeEnum;
 import com.epam.ta.reportportal.entity.item.TestItem;
 import com.epam.ta.reportportal.entity.launch.Launch;
-import com.epam.ta.reportportal.ws.model.attribute.ItemAttributeResource;
+import com.epam.ta.reportportal.ws.reporting.ItemAttributeResource;
 import com.google.common.base.CharMatcher;
 import java.util.Objects;
 import java.util.Set;
diff --git a/src/main/java/com/epam/ta/reportportal/util/ProjectExtractor.java b/src/main/java/com/epam/ta/reportportal/util/ProjectExtractor.java
index 998001d160..89a9eb8832 100644
--- a/src/main/java/com/epam/ta/reportportal/util/ProjectExtractor.java
+++ b/src/main/java/com/epam/ta/reportportal/util/ProjectExtractor.java
@@ -22,7 +22,7 @@
 import com.epam.ta.reportportal.commons.ReportPortalUser;
 import com.epam.ta.reportportal.dao.ProjectUserRepository;
 import com.epam.ta.reportportal.exception.ReportPortalException;
-import com.epam.ta.reportportal.ws.model.ErrorType;
+import com.epam.ta.reportportal.ws.reporting.ErrorType;
 import java.util.Optional;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
diff --git a/src/main/java/com/epam/ta/reportportal/util/email/EmailRulesValidator.java b/src/main/java/com/epam/ta/reportportal/util/email/EmailRulesValidator.java
index da4778c975..3aa397d571 100644
--- a/src/main/java/com/epam/ta/reportportal/util/email/EmailRulesValidator.java
+++ b/src/main/java/com/epam/ta/reportportal/util/email/EmailRulesValidator.java
@@ -22,8 +22,8 @@
 import static com.epam.ta.reportportal.commons.validation.Suppliers.formattedSupplier;
 import static com.epam.ta.reportportal.entity.project.ProjectUtils.getOwner;
 import static com.epam.ta.reportportal.util.UserUtils.isEmailValid;
-import static com.epam.ta.reportportal.ws.model.ErrorType.BAD_REQUEST_ERROR;
-import static com.epam.ta.reportportal.ws.model.ErrorType.USER_NOT_FOUND;
+import static com.epam.ta.reportportal.ws.reporting.ErrorType.BAD_REQUEST_ERROR;
+import static com.epam.ta.reportportal.ws.reporting.ErrorType.USER_NOT_FOUND;
 import static com.epam.ta.reportportal.ws.model.ValidationConstraints.MAX_LOGIN_LENGTH;
 import static com.epam.ta.reportportal.ws.model.ValidationConstraints.MAX_NAME_LENGTH;
 import static com.epam.ta.reportportal.ws.model.ValidationConstraints.MIN_LOGIN_LENGTH;
@@ -31,8 +31,8 @@
 
 import com.epam.ta.reportportal.entity.project.Project;
 import com.epam.ta.reportportal.entity.project.ProjectUtils;
-import com.epam.ta.reportportal.ws.model.ErrorType;
-import com.epam.ta.reportportal.ws.model.attribute.ItemAttributeResource;
+import com.epam.ta.reportportal.ws.reporting.ErrorType;
+import com.epam.ta.reportportal.ws.reporting.ItemAttributeResource;
 import org.apache.commons.lang3.StringUtils;
 
 /**
diff --git a/src/main/java/com/epam/ta/reportportal/util/email/MailServiceFactory.java b/src/main/java/com/epam/ta/reportportal/util/email/MailServiceFactory.java
index 02013f978b..ef8692c058 100644
--- a/src/main/java/com/epam/ta/reportportal/util/email/MailServiceFactory.java
+++ b/src/main/java/com/epam/ta/reportportal/util/email/MailServiceFactory.java
@@ -16,7 +16,7 @@
 package com.epam.ta.reportportal.util.email;
 
 import static com.epam.ta.reportportal.commons.Predicates.notNull;
-import static com.epam.ta.reportportal.ws.model.ErrorType.EMAIL_CONFIGURATION_IS_INCORRECT;
+import static com.epam.ta.reportportal.ws.reporting.ErrorType.EMAIL_CONFIGURATION_IS_INCORRECT;
 import static java.util.Optional.ofNullable;
 
 import com.epam.reportportal.commons.template.TemplateEngine;
@@ -28,7 +28,7 @@
 import com.epam.ta.reportportal.entity.integration.Integration;
 import com.epam.ta.reportportal.entity.integration.IntegrationType;
 import com.epam.ta.reportportal.exception.ReportPortalException;
-import com.epam.ta.reportportal.ws.model.ErrorType;
+import com.epam.ta.reportportal.ws.reporting.ErrorType;
 import java.util.List;
 import java.util.Map;
 import java.util.Optional;
diff --git a/src/main/java/com/epam/ta/reportportal/util/email/strategy/EmailTemplate.java b/src/main/java/com/epam/ta/reportportal/util/email/strategy/EmailTemplate.java
index 31072c8738..3332056644 100644
--- a/src/main/java/com/epam/ta/reportportal/util/email/strategy/EmailTemplate.java
+++ b/src/main/java/com/epam/ta/reportportal/util/email/strategy/EmailTemplate.java
@@ -17,7 +17,7 @@
 package com.epam.ta.reportportal.util.email.strategy;
 
 import com.epam.ta.reportportal.exception.ReportPortalException;
-import com.epam.ta.reportportal.ws.model.ErrorType;
+import com.epam.ta.reportportal.ws.reporting.ErrorType;
 import java.util.Arrays;
 import java.util.stream.Collectors;
 
diff --git a/src/main/java/com/epam/ta/reportportal/ws/controller/DashboardController.java b/src/main/java/com/epam/ta/reportportal/ws/controller/DashboardController.java
index 204b4bfc19..336285913f 100644
--- a/src/main/java/com/epam/ta/reportportal/ws/controller/DashboardController.java
+++ b/src/main/java/com/epam/ta/reportportal/ws/controller/DashboardController.java
@@ -33,7 +33,7 @@
 import com.epam.ta.reportportal.model.dashboard.DashboardResource;
 import com.epam.ta.reportportal.model.dashboard.UpdateDashboardRQ;
 import com.epam.ta.reportportal.util.ProjectExtractor;
-import com.epam.ta.reportportal.ws.model.OperationCompletionRS;
+import com.epam.ta.reportportal.ws.reporting.OperationCompletionRS;
 import com.epam.ta.reportportal.ws.resolver.FilterFor;
 import com.epam.ta.reportportal.ws.resolver.SortFor;
 import io.swagger.v3.oas.annotations.Operation;
diff --git a/src/main/java/com/epam/ta/reportportal/ws/controller/DeprecatedUserController.java b/src/main/java/com/epam/ta/reportportal/ws/controller/DeprecatedUserController.java
index a9add062ff..137528f40f 100644
--- a/src/main/java/com/epam/ta/reportportal/ws/controller/DeprecatedUserController.java
+++ b/src/main/java/com/epam/ta/reportportal/ws/controller/DeprecatedUserController.java
@@ -34,7 +34,7 @@
 import com.epam.ta.reportportal.model.user.RestorePasswordRQ;
 import com.epam.ta.reportportal.model.user.UserBidRS;
 import com.epam.ta.reportportal.model.user.UserResource;
-import com.epam.ta.reportportal.ws.model.OperationCompletionRS;
+import com.epam.ta.reportportal.ws.reporting.OperationCompletionRS;
 import com.epam.ta.reportportal.ws.resolver.ActiveRole;
 import com.epam.ta.reportportal.ws.resolver.FilterFor;
 import com.epam.ta.reportportal.ws.resolver.ResponseView;
diff --git a/src/main/java/com/epam/ta/reportportal/ws/controller/FileStorageController.java b/src/main/java/com/epam/ta/reportportal/ws/controller/FileStorageController.java
index f06a796f56..1772934e6b 100644
--- a/src/main/java/com/epam/ta/reportportal/ws/controller/FileStorageController.java
+++ b/src/main/java/com/epam/ta/reportportal/ws/controller/FileStorageController.java
@@ -28,7 +28,7 @@
 import com.epam.ta.reportportal.entity.attachment.BinaryData;
 import com.epam.ta.reportportal.exception.ReportPortalException;
 import com.epam.ta.reportportal.util.ProjectExtractor;
-import com.epam.ta.reportportal.ws.model.OperationCompletionRS;
+import com.epam.ta.reportportal.ws.reporting.OperationCompletionRS;
 import com.google.common.net.HttpHeaders;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
diff --git a/src/main/java/com/epam/ta/reportportal/ws/controller/IntegrationController.java b/src/main/java/com/epam/ta/reportportal/ws/controller/IntegrationController.java
index b38651c33d..430de432d3 100644
--- a/src/main/java/com/epam/ta/reportportal/ws/controller/IntegrationController.java
+++ b/src/main/java/com/epam/ta/reportportal/ws/controller/IntegrationController.java
@@ -31,7 +31,7 @@
 import com.epam.ta.reportportal.model.integration.IntegrationRQ;
 import com.epam.ta.reportportal.model.integration.IntegrationResource;
 import com.epam.ta.reportportal.util.ProjectExtractor;
-import com.epam.ta.reportportal.ws.model.OperationCompletionRS;
+import com.epam.ta.reportportal.ws.reporting.OperationCompletionRS;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import java.util.List;
diff --git a/src/main/java/com/epam/ta/reportportal/ws/controller/LaunchAsyncController.java b/src/main/java/com/epam/ta/reportportal/ws/controller/LaunchAsyncController.java
index d08f93a4cc..a8107fd4be 100644
--- a/src/main/java/com/epam/ta/reportportal/ws/controller/LaunchAsyncController.java
+++ b/src/main/java/com/epam/ta/reportportal/ws/controller/LaunchAsyncController.java
@@ -28,12 +28,12 @@
 import com.epam.ta.reportportal.core.launch.StartLaunchHandler;
 import com.epam.ta.reportportal.core.logging.HttpLogging;
 import com.epam.ta.reportportal.model.launch.FinishLaunchRS;
-import com.epam.ta.reportportal.model.launch.MergeLaunchesRQ;
 import com.epam.ta.reportportal.util.ProjectExtractor;
-import com.epam.ta.reportportal.ws.model.FinishExecutionRQ;
-import com.epam.ta.reportportal.ws.model.launch.LaunchResource;
-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.LaunchResource;
+import com.epam.ta.reportportal.ws.reporting.MergeLaunchesRQ;
+import com.epam.ta.reportportal.ws.reporting.StartLaunchRQ;
+import com.epam.ta.reportportal.ws.reporting.StartLaunchRS;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.Parameter;
 import io.swagger.v3.oas.annotations.tags.Tag;
@@ -53,8 +53,8 @@
 import org.springframework.web.bind.annotation.RestController;
 
 /**
- * Controller implementation for async reporting client API for
- * {@link com.epam.ta.reportportal.entity.launch.Launch} entity
+ * Controller implementation for async reporting client API for {@link
+ * com.epam.ta.reportportal.entity.launch.Launch} entity
  *
  * @author Konstantin Antipin
  */
@@ -86,7 +86,7 @@ public LaunchAsyncController(ProjectExtractor projectExtractor,
   @Operation(summary = "Starts launch for specified project")
   public StartLaunchRS startLaunch(@PathVariable String projectName,
       @Parameter(description = "Start launch request body", required = true) @RequestBody @Validated
-      StartLaunchRQ startLaunchRQ, @AuthenticationPrincipal ReportPortalUser user) {
+          StartLaunchRQ startLaunchRQ, @AuthenticationPrincipal ReportPortalUser user) {
     return startLaunchHandler.startLaunch(user,
         projectExtractor.extractProjectDetails(user, normalizeId(projectName)), startLaunchRQ
     );
@@ -114,7 +114,7 @@ public FinishLaunchRS finishLaunch(@PathVariable String projectName,
   @Operation(summary = "Merge set of specified launches in common one")
   public LaunchResource mergeLaunches(@PathVariable String projectName,
       @Parameter(description = "Merge launches request body", required = true) @RequestBody @Validated
-      MergeLaunchesRQ mergeLaunchesRQ, @AuthenticationPrincipal ReportPortalUser user) {
+          MergeLaunchesRQ mergeLaunchesRQ, @AuthenticationPrincipal ReportPortalUser user) {
     return mergeLaunchesHandler.mergeLaunches(
         projectExtractor.extractProjectDetails(user, normalizeId(projectName)), user,
         mergeLaunchesRQ
diff --git a/src/main/java/com/epam/ta/reportportal/ws/controller/LaunchController.java b/src/main/java/com/epam/ta/reportportal/ws/controller/LaunchController.java
index 244b6e329b..32568e7082 100644
--- a/src/main/java/com/epam/ta/reportportal/ws/controller/LaunchController.java
+++ b/src/main/java/com/epam/ta/reportportal/ws/controller/LaunchController.java
@@ -45,18 +45,18 @@
 import com.epam.ta.reportportal.model.launch.AnalyzeLaunchRQ;
 import com.epam.ta.reportportal.model.launch.FinishLaunchRS;
 import com.epam.ta.reportportal.model.launch.LaunchImportRQ;
-import com.epam.ta.reportportal.model.launch.MergeLaunchesRQ;
 import com.epam.ta.reportportal.model.launch.UpdateLaunchRQ;
 import com.epam.ta.reportportal.model.launch.cluster.CreateClustersRQ;
 import com.epam.ta.reportportal.util.ProjectExtractor;
-import com.epam.ta.reportportal.ws.model.BulkInfoUpdateRQ;
-import com.epam.ta.reportportal.ws.model.ErrorType;
-import com.epam.ta.reportportal.ws.model.FinishExecutionRQ;
-import com.epam.ta.reportportal.ws.model.OperationCompletionRS;
-import com.epam.ta.reportportal.ws.model.launch.LaunchResource;
-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.BulkInfoUpdateRQ;
 import com.epam.ta.reportportal.ws.model.launch.cluster.ClusterInfoResource;
+import com.epam.ta.reportportal.ws.reporting.ErrorType;
+import com.epam.ta.reportportal.ws.reporting.FinishExecutionRQ;
+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.StartLaunchRQ;
+import com.epam.ta.reportportal.ws.reporting.StartLaunchRS;
 import com.epam.ta.reportportal.ws.resolver.FilterFor;
 import com.epam.ta.reportportal.ws.resolver.SortFor;
 import com.google.common.net.HttpHeaders;
@@ -377,7 +377,7 @@ public Map<String, List<ChartStatisticsContent>> compareLaunches(@PathVariable S
   @Operation(summary = "Merge set of specified launches in common one")
   public LaunchResource mergeLaunches(@PathVariable String projectName,
       @Parameter(description = "Merge launches request body", required = true) @RequestBody @Validated
-      MergeLaunchesRQ mergeLaunchesRQ, @AuthenticationPrincipal ReportPortalUser user) {
+          MergeLaunchesRQ mergeLaunchesRQ, @AuthenticationPrincipal ReportPortalUser user) {
     return mergeLaunchesHandler.mergeLaunches(
         projectExtractor.extractProjectDetails(user, normalizeId(projectName)), user,
         mergeLaunchesRQ
diff --git a/src/main/java/com/epam/ta/reportportal/ws/controller/LogAsyncController.java b/src/main/java/com/epam/ta/reportportal/ws/controller/LogAsyncController.java
index b473c2d55b..6c908d762b 100644
--- a/src/main/java/com/epam/ta/reportportal/ws/controller/LogAsyncController.java
+++ b/src/main/java/com/epam/ta/reportportal/ws/controller/LogAsyncController.java
@@ -30,12 +30,12 @@
 import com.epam.ta.reportportal.core.log.CreateLogHandler;
 import com.epam.ta.reportportal.core.logging.HttpLogging;
 import com.epam.ta.reportportal.util.ProjectExtractor;
-import com.epam.ta.reportportal.ws.model.BatchElementCreatedRS;
-import com.epam.ta.reportportal.ws.model.BatchSaveOperatingRS;
-import com.epam.ta.reportportal.ws.model.Constants;
-import com.epam.ta.reportportal.ws.model.EntryCreatedAsyncRS;
-import com.epam.ta.reportportal.ws.model.ErrorType;
-import com.epam.ta.reportportal.ws.model.log.SaveLogRQ;
+import com.epam.ta.reportportal.ws.reporting.BatchElementCreatedRS;
+import com.epam.ta.reportportal.ws.reporting.BatchSaveOperatingRS;
+import com.epam.ta.reportportal.ws.reporting.Constants;
+import com.epam.ta.reportportal.ws.reporting.EntryCreatedAsyncRS;
+import com.epam.ta.reportportal.ws.reporting.ErrorType;
+import com.epam.ta.reportportal.ws.reporting.SaveLogRQ;
 import io.swagger.v3.oas.annotations.Hidden;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
diff --git a/src/main/java/com/epam/ta/reportportal/ws/controller/LogController.java b/src/main/java/com/epam/ta/reportportal/ws/controller/LogController.java
index eb00cf0fc8..fd84a146a5 100644
--- a/src/main/java/com/epam/ta/reportportal/ws/controller/LogController.java
+++ b/src/main/java/com/epam/ta/reportportal/ws/controller/LogController.java
@@ -43,13 +43,13 @@
 import com.epam.ta.reportportal.model.log.SearchLogRq;
 import com.epam.ta.reportportal.model.log.SearchLogRs;
 import com.epam.ta.reportportal.util.ProjectExtractor;
-import com.epam.ta.reportportal.ws.model.BatchElementCreatedRS;
-import com.epam.ta.reportportal.ws.model.BatchSaveOperatingRS;
-import com.epam.ta.reportportal.ws.model.Constants;
-import com.epam.ta.reportportal.ws.model.EntryCreatedAsyncRS;
-import com.epam.ta.reportportal.ws.model.ErrorType;
-import com.epam.ta.reportportal.ws.model.OperationCompletionRS;
-import com.epam.ta.reportportal.ws.model.log.SaveLogRQ;
+import com.epam.ta.reportportal.ws.reporting.BatchElementCreatedRS;
+import com.epam.ta.reportportal.ws.reporting.BatchSaveOperatingRS;
+import com.epam.ta.reportportal.ws.reporting.Constants;
+import com.epam.ta.reportportal.ws.reporting.EntryCreatedAsyncRS;
+import com.epam.ta.reportportal.ws.reporting.ErrorType;
+import com.epam.ta.reportportal.ws.reporting.OperationCompletionRS;
+import com.epam.ta.reportportal.ws.reporting.SaveLogRQ;
 import com.epam.ta.reportportal.ws.resolver.FilterFor;
 import com.epam.ta.reportportal.ws.resolver.SortFor;
 import com.google.common.collect.ImmutableMap;
@@ -114,13 +114,12 @@ public LogController(ProjectExtractor projectExtractor,
   }
 
   /**
-   * @deprecated in favour of
-   * {@link LogController#createLogEntry(String, SaveLogRQ, ReportPortalUser)} because of mapping
-   * collisions
+   * @deprecated in favour of {@link LogController#createLogEntry(String, SaveLogRQ,
+   * ReportPortalUser)} because of mapping collisions
    */
   /* Report client API */
   @Deprecated
-  @PostMapping(consumes = { MediaType.APPLICATION_JSON_VALUE })
+  @PostMapping(consumes = {MediaType.APPLICATION_JSON_VALUE})
   @ResponseStatus(CREATED)
   @Hidden
   @PreAuthorize(ALLOWED_TO_REPORT)
@@ -133,7 +132,7 @@ public EntryCreatedAsyncRS createLog(@PathVariable String projectName,
   }
 
   /* Report client API */
-  @PostMapping(value = "/entry", consumes = { MediaType.APPLICATION_JSON_VALUE })
+  @PostMapping(value = "/entry", consumes = {MediaType.APPLICATION_JSON_VALUE})
   @ResponseStatus(CREATED)
   @Operation(summary = "Create log")
   @PreAuthorize(ALLOWED_TO_REPORT)
@@ -145,7 +144,7 @@ public EntryCreatedAsyncRS createLogEntry(@PathVariable String projectName,
     );
   }
 
-  @PostMapping(consumes = { MediaType.MULTIPART_FORM_DATA_VALUE })
+  @PostMapping(consumes = {MediaType.MULTIPART_FORM_DATA_VALUE})
   @Operation(summary = "Create log (batching operation)")
   // Specific handler should be added for springfox in case of similar POST
   // request mappings
@@ -221,8 +220,8 @@ public OperationCompletionRS deleteLog(@PathVariable String projectName, @PathVa
   @Transactional(readOnly = true)
   public Iterable<LogResource> getLogs(@PathVariable String projectName,
       @RequestParam(value = DEFAULT_FILTER_PREFIX + UNDR + CRITERIA_PATH, required = false)
-      String underPath, @FilterFor(Log.class) Filter filter,
-      @SortDefault({ "logTime" }) @SortFor(Log.class) Pageable pageable,
+          String underPath, @FilterFor(Log.class) Filter filter,
+      @SortDefault({"logTime"}) @SortFor(Log.class) Pageable pageable,
       @AuthenticationPrincipal ReportPortalUser user) {
     return getLogHandler.getLogs(underPath,
         projectExtractor.extractProjectDetails(user, projectName), filter, pageable
diff --git a/src/main/java/com/epam/ta/reportportal/ws/controller/PluginController.java b/src/main/java/com/epam/ta/reportportal/ws/controller/PluginController.java
index 749df238b8..da775c900e 100644
--- a/src/main/java/com/epam/ta/reportportal/ws/controller/PluginController.java
+++ b/src/main/java/com/epam/ta/reportportal/ws/controller/PluginController.java
@@ -30,7 +30,7 @@
 import com.epam.ta.reportportal.model.integration.IntegrationTypeResource;
 import com.epam.ta.reportportal.model.integration.UpdatePluginStateRQ;
 import com.epam.ta.reportportal.util.ProjectExtractor;
-import com.epam.ta.reportportal.ws.model.OperationCompletionRS;
+import com.epam.ta.reportportal.ws.reporting.OperationCompletionRS;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import java.util.List;
diff --git a/src/main/java/com/epam/ta/reportportal/ws/controller/ProjectController.java b/src/main/java/com/epam/ta/reportportal/ws/controller/ProjectController.java
index 7e0ef21c91..4c01922a7f 100644
--- a/src/main/java/com/epam/ta/reportportal/ws/controller/ProjectController.java
+++ b/src/main/java/com/epam/ta/reportportal/ws/controller/ProjectController.java
@@ -59,8 +59,8 @@
 import com.epam.ta.reportportal.model.user.SearchUserResource;
 import com.epam.ta.reportportal.model.user.UserResource;
 import com.epam.ta.reportportal.util.ProjectExtractor;
-import com.epam.ta.reportportal.ws.model.ErrorType;
-import com.epam.ta.reportportal.ws.model.OperationCompletionRS;
+import com.epam.ta.reportportal.ws.reporting.ErrorType;
+import com.epam.ta.reportportal.ws.reporting.OperationCompletionRS;
 import com.epam.ta.reportportal.ws.resolver.FilterCriteriaResolver;
 import com.epam.ta.reportportal.ws.resolver.FilterFor;
 import com.epam.ta.reportportal.ws.resolver.SortFor;
diff --git a/src/main/java/com/epam/ta/reportportal/ws/controller/ProjectSettingsController.java b/src/main/java/com/epam/ta/reportportal/ws/controller/ProjectSettingsController.java
index 89aba80a8d..ecbf44b091 100644
--- a/src/main/java/com/epam/ta/reportportal/ws/controller/ProjectSettingsController.java
+++ b/src/main/java/com/epam/ta/reportportal/ws/controller/ProjectSettingsController.java
@@ -41,7 +41,7 @@
 import com.epam.ta.reportportal.model.project.config.pattern.CreatePatternTemplateRQ;
 import com.epam.ta.reportportal.model.project.config.pattern.UpdatePatternTemplateRQ;
 import com.epam.ta.reportportal.model.project.email.SenderCaseDTO;
-import com.epam.ta.reportportal.ws.model.OperationCompletionRS;
+import com.epam.ta.reportportal.ws.reporting.OperationCompletionRS;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import java.util.List;
diff --git a/src/main/java/com/epam/ta/reportportal/ws/controller/SettingsController.java b/src/main/java/com/epam/ta/reportportal/ws/controller/SettingsController.java
index a2078454dd..8880c549e3 100644
--- a/src/main/java/com/epam/ta/reportportal/ws/controller/SettingsController.java
+++ b/src/main/java/com/epam/ta/reportportal/ws/controller/SettingsController.java
@@ -21,7 +21,7 @@
 import com.epam.ta.reportportal.commons.ReportPortalUser;
 import com.epam.ta.reportportal.core.admin.ServerAdminHandler;
 import com.epam.ta.reportportal.model.settings.AnalyticsResource;
-import com.epam.ta.reportportal.ws.model.OperationCompletionRS;
+import com.epam.ta.reportportal.ws.reporting.OperationCompletionRS;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import java.util.Map;
diff --git a/src/main/java/com/epam/ta/reportportal/ws/controller/TestItemAsyncController.java b/src/main/java/com/epam/ta/reportportal/ws/controller/TestItemAsyncController.java
index 9f12f49d46..45212bf668 100644
--- a/src/main/java/com/epam/ta/reportportal/ws/controller/TestItemAsyncController.java
+++ b/src/main/java/com/epam/ta/reportportal/ws/controller/TestItemAsyncController.java
@@ -26,10 +26,10 @@
 import com.epam.ta.reportportal.core.item.StartTestItemHandler;
 import com.epam.ta.reportportal.core.logging.HttpLogging;
 import com.epam.ta.reportportal.util.ProjectExtractor;
-import com.epam.ta.reportportal.ws.model.EntryCreatedAsyncRS;
-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.reporting.EntryCreatedAsyncRS;
+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 io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import org.springframework.beans.factory.annotation.Autowired;
diff --git a/src/main/java/com/epam/ta/reportportal/ws/controller/TestItemController.java b/src/main/java/com/epam/ta/reportportal/ws/controller/TestItemController.java
index 41af6a8df5..a6e31efee8 100644
--- a/src/main/java/com/epam/ta/reportportal/ws/controller/TestItemController.java
+++ b/src/main/java/com/epam/ta/reportportal/ws/controller/TestItemController.java
@@ -48,19 +48,19 @@
 import com.epam.ta.reportportal.core.item.impl.history.param.HistoryRequestParams;
 import com.epam.ta.reportportal.entity.item.TestItem;
 import com.epam.ta.reportportal.model.TestItemHistoryElement;
-import com.epam.ta.reportportal.model.TestItemResource;
 import com.epam.ta.reportportal.model.issue.DefineIssueRQ;
 import com.epam.ta.reportportal.model.item.LinkExternalIssueRQ;
 import com.epam.ta.reportportal.model.item.UnlinkExternalIssueRQ;
 import com.epam.ta.reportportal.model.item.UpdateTestItemRQ;
 import com.epam.ta.reportportal.util.ProjectExtractor;
-import com.epam.ta.reportportal.ws.model.BulkInfoUpdateRQ;
-import com.epam.ta.reportportal.ws.model.EntryCreatedAsyncRS;
-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.model.statistics.StatisticsResource;
+import com.epam.ta.reportportal.ws.reporting.BulkInfoUpdateRQ;
+import com.epam.ta.reportportal.ws.reporting.EntryCreatedAsyncRS;
+import com.epam.ta.reportportal.ws.reporting.FinishTestItemRQ;
+import com.epam.ta.reportportal.ws.reporting.Issue;
+import com.epam.ta.reportportal.ws.reporting.OperationCompletionRS;
+import com.epam.ta.reportportal.ws.reporting.StartTestItemRQ;
+import com.epam.ta.reportportal.ws.reporting.StatisticsResource;
+import com.epam.ta.reportportal.ws.reporting.TestItemResource;
 import com.epam.ta.reportportal.ws.resolver.FilterFor;
 import com.epam.ta.reportportal.ws.resolver.SortFor;
 import io.swagger.v3.oas.annotations.Operation;
diff --git a/src/main/java/com/epam/ta/reportportal/ws/controller/UserController.java b/src/main/java/com/epam/ta/reportportal/ws/controller/UserController.java
index 5a63a0746c..17e0ce1da6 100644
--- a/src/main/java/com/epam/ta/reportportal/ws/controller/UserController.java
+++ b/src/main/java/com/epam/ta/reportportal/ws/controller/UserController.java
@@ -55,8 +55,8 @@
 import com.epam.ta.reportportal.model.user.RestorePasswordRQ;
 import com.epam.ta.reportportal.model.user.UserBidRS;
 import com.epam.ta.reportportal.model.user.UserResource;
-import com.epam.ta.reportportal.ws.model.ErrorType;
-import com.epam.ta.reportportal.ws.model.OperationCompletionRS;
+import com.epam.ta.reportportal.ws.reporting.ErrorType;
+import com.epam.ta.reportportal.ws.reporting.OperationCompletionRS;
 import com.epam.ta.reportportal.ws.resolver.ActiveRole;
 import com.epam.ta.reportportal.ws.resolver.FilterFor;
 import com.epam.ta.reportportal.ws.resolver.ResponseView;
diff --git a/src/main/java/com/epam/ta/reportportal/ws/controller/UserFilterController.java b/src/main/java/com/epam/ta/reportportal/ws/controller/UserFilterController.java
index b6d191f020..7c67b93e5a 100644
--- a/src/main/java/com/epam/ta/reportportal/ws/controller/UserFilterController.java
+++ b/src/main/java/com/epam/ta/reportportal/ws/controller/UserFilterController.java
@@ -32,7 +32,7 @@
 import com.epam.ta.reportportal.model.filter.UserFilterResource;
 import com.epam.ta.reportportal.util.ProjectExtractor;
 import com.epam.ta.reportportal.ws.converter.converters.UserFilterConverter;
-import com.epam.ta.reportportal.ws.model.OperationCompletionRS;
+import com.epam.ta.reportportal.ws.reporting.OperationCompletionRS;
 import com.epam.ta.reportportal.ws.resolver.FilterFor;
 import com.epam.ta.reportportal.ws.resolver.SortFor;
 import io.swagger.v3.oas.annotations.Operation;
diff --git a/src/main/java/com/epam/ta/reportportal/ws/controller/WidgetController.java b/src/main/java/com/epam/ta/reportportal/ws/controller/WidgetController.java
index 9e0413b1d2..5216a86043 100644
--- a/src/main/java/com/epam/ta/reportportal/ws/controller/WidgetController.java
+++ b/src/main/java/com/epam/ta/reportportal/ws/controller/WidgetController.java
@@ -32,7 +32,7 @@
 import com.epam.ta.reportportal.model.widget.WidgetRQ;
 import com.epam.ta.reportportal.model.widget.WidgetResource;
 import com.epam.ta.reportportal.util.ProjectExtractor;
-import com.epam.ta.reportportal.ws.model.OperationCompletionRS;
+import com.epam.ta.reportportal.ws.reporting.OperationCompletionRS;
 import com.epam.ta.reportportal.ws.resolver.FilterFor;
 import com.epam.ta.reportportal.ws.resolver.SortFor;
 import io.swagger.v3.oas.annotations.Operation;
diff --git a/src/main/java/com/epam/ta/reportportal/ws/converter/TestItemResourceAssembler.java b/src/main/java/com/epam/ta/reportportal/ws/converter/TestItemResourceAssembler.java
index 3c19c4feab..e8bbd6f7c7 100644
--- a/src/main/java/com/epam/ta/reportportal/ws/converter/TestItemResourceAssembler.java
+++ b/src/main/java/com/epam/ta/reportportal/ws/converter/TestItemResourceAssembler.java
@@ -20,8 +20,8 @@
 
 import com.epam.ta.reportportal.entity.item.PathName;
 import com.epam.ta.reportportal.entity.item.TestItem;
-import com.epam.ta.reportportal.model.TestItemResource;
 import com.epam.ta.reportportal.ws.converter.converters.TestItemConverter;
+import com.epam.ta.reportportal.ws.reporting.TestItemResource;
 import javax.annotation.Nullable;
 import org.springframework.stereotype.Component;
 
diff --git a/src/main/java/com/epam/ta/reportportal/ws/converter/builders/LaunchBuilder.java b/src/main/java/com/epam/ta/reportportal/ws/converter/builders/LaunchBuilder.java
index de875316f3..dde78b5014 100644
--- a/src/main/java/com/epam/ta/reportportal/ws/converter/builders/LaunchBuilder.java
+++ b/src/main/java/com/epam/ta/reportportal/ws/converter/builders/LaunchBuilder.java
@@ -25,11 +25,11 @@
 import com.epam.ta.reportportal.entity.enums.StatusEnum;
 import com.epam.ta.reportportal.entity.launch.Launch;
 import com.epam.ta.reportportal.exception.ReportPortalException;
-import com.epam.ta.reportportal.ws.model.ErrorType;
-import com.epam.ta.reportportal.ws.model.attribute.ItemAttributeResource;
-import com.epam.ta.reportportal.ws.model.attribute.ItemAttributesRQ;
-import com.epam.ta.reportportal.ws.model.launch.Mode;
-import com.epam.ta.reportportal.ws.model.launch.StartLaunchRQ;
+import com.epam.ta.reportportal.ws.reporting.ErrorType;
+import com.epam.ta.reportportal.ws.reporting.ItemAttributeResource;
+import com.epam.ta.reportportal.ws.reporting.ItemAttributesRQ;
+import com.epam.ta.reportportal.ws.reporting.Mode;
+import com.epam.ta.reportportal.ws.reporting.StartLaunchRQ;
 import com.google.common.base.Preconditions;
 import java.util.Date;
 import java.util.Optional;
@@ -85,7 +85,8 @@ public LaunchBuilder addProject(Long projectId) {
     return this;
   }
 
-  public LaunchBuilder addAttribute(ItemAttributeResource attributeResource) {
+  public LaunchBuilder addAttribute(
+      com.epam.ta.reportportal.ws.reporting.ItemAttributeResource attributeResource) {
     ItemAttribute itemAttribute = FROM_RESOURCE.apply(attributeResource);
     itemAttribute.setLaunch(launch);
     launch.getAttributes().add(itemAttribute);
diff --git a/src/main/java/com/epam/ta/reportportal/ws/converter/builders/LogFullBuilder.java b/src/main/java/com/epam/ta/reportportal/ws/converter/builders/LogFullBuilder.java
index 9f679b4dce..b8b0be4fa9 100644
--- a/src/main/java/com/epam/ta/reportportal/ws/converter/builders/LogFullBuilder.java
+++ b/src/main/java/com/epam/ta/reportportal/ws/converter/builders/LogFullBuilder.java
@@ -23,7 +23,7 @@
 import com.epam.ta.reportportal.entity.item.TestItem;
 import com.epam.ta.reportportal.entity.launch.Launch;
 import com.epam.ta.reportportal.entity.log.LogFull;
-import com.epam.ta.reportportal.ws.model.log.SaveLogRQ;
+import com.epam.ta.reportportal.ws.reporting.SaveLogRQ;
 import java.util.UUID;
 import java.util.function.Supplier;
 
diff --git a/src/main/java/com/epam/ta/reportportal/ws/converter/builders/PatternTemplateBuilder.java b/src/main/java/com/epam/ta/reportportal/ws/converter/builders/PatternTemplateBuilder.java
index 612695ff08..80754792ac 100644
--- a/src/main/java/com/epam/ta/reportportal/ws/converter/builders/PatternTemplateBuilder.java
+++ b/src/main/java/com/epam/ta/reportportal/ws/converter/builders/PatternTemplateBuilder.java
@@ -21,7 +21,7 @@
 import com.epam.ta.reportportal.entity.pattern.PatternTemplateType;
 import com.epam.ta.reportportal.exception.ReportPortalException;
 import com.epam.ta.reportportal.model.project.config.pattern.CreatePatternTemplateRQ;
-import com.epam.ta.reportportal.ws.model.ErrorType;
+import com.epam.ta.reportportal.ws.reporting.ErrorType;
 import java.util.function.Supplier;
 import org.apache.commons.lang3.StringUtils;
 
diff --git a/src/main/java/com/epam/ta/reportportal/ws/converter/builders/TestItemBuilder.java b/src/main/java/com/epam/ta/reportportal/ws/converter/builders/TestItemBuilder.java
index 504b9885b0..6cedf7fed2 100644
--- a/src/main/java/com/epam/ta/reportportal/ws/converter/builders/TestItemBuilder.java
+++ b/src/main/java/com/epam/ta/reportportal/ws/converter/builders/TestItemBuilder.java
@@ -28,11 +28,11 @@
 import com.epam.ta.reportportal.entity.item.TestItem;
 import com.epam.ta.reportportal.entity.item.TestItemResults;
 import com.epam.ta.reportportal.exception.ReportPortalException;
-import com.epam.ta.reportportal.ws.model.ErrorType;
-import com.epam.ta.reportportal.ws.model.ParameterResource;
-import com.epam.ta.reportportal.ws.model.StartTestItemRQ;
-import com.epam.ta.reportportal.ws.model.attribute.ItemAttributeResource;
-import com.epam.ta.reportportal.ws.model.attribute.ItemAttributesRQ;
+import com.epam.ta.reportportal.ws.reporting.ErrorType;
+import com.epam.ta.reportportal.ws.reporting.ItemAttributeResource;
+import com.epam.ta.reportportal.ws.reporting.ItemAttributesRQ;
+import com.epam.ta.reportportal.ws.reporting.ParameterResource;
+import com.epam.ta.reportportal.ws.reporting.StartTestItemRQ;
 import java.time.LocalDateTime;
 import java.time.temporal.ChronoUnit;
 import java.util.List;
diff --git a/src/main/java/com/epam/ta/reportportal/ws/converter/builders/UserFilterBuilder.java b/src/main/java/com/epam/ta/reportportal/ws/converter/builders/UserFilterBuilder.java
index 7cec599439..900f6a7916 100644
--- a/src/main/java/com/epam/ta/reportportal/ws/converter/builders/UserFilterBuilder.java
+++ b/src/main/java/com/epam/ta/reportportal/ws/converter/builders/UserFilterBuilder.java
@@ -29,7 +29,7 @@
 import com.epam.ta.reportportal.model.filter.Order;
 import com.epam.ta.reportportal.model.filter.UpdateUserFilterRQ;
 import com.epam.ta.reportportal.model.filter.UserFilterCondition;
-import com.epam.ta.reportportal.ws.model.ErrorType;
+import com.epam.ta.reportportal.ws.reporting.ErrorType;
 import java.util.List;
 import java.util.Set;
 import java.util.function.Supplier;
diff --git a/src/main/java/com/epam/ta/reportportal/ws/converter/converters/ExceptionConverter.java b/src/main/java/com/epam/ta/reportportal/ws/converter/converters/ExceptionConverter.java
index 5bda88f895..fefe924672 100644
--- a/src/main/java/com/epam/ta/reportportal/ws/converter/converters/ExceptionConverter.java
+++ b/src/main/java/com/epam/ta/reportportal/ws/converter/converters/ExceptionConverter.java
@@ -1,7 +1,7 @@
 package com.epam.ta.reportportal.ws.converter.converters;
 
 import com.epam.ta.reportportal.exception.ReportPortalException;
-import com.epam.ta.reportportal.ws.model.ErrorRS;
+import com.epam.ta.reportportal.ws.reporting.ErrorRS;
 import java.util.function.Function;
 
 public class ExceptionConverter {
diff --git a/src/main/java/com/epam/ta/reportportal/ws/converter/converters/IssueConverter.java b/src/main/java/com/epam/ta/reportportal/ws/converter/converters/IssueConverter.java
index 10bc73c11d..9cbdaa77e0 100644
--- a/src/main/java/com/epam/ta/reportportal/ws/converter/converters/IssueConverter.java
+++ b/src/main/java/com/epam/ta/reportportal/ws/converter/converters/IssueConverter.java
@@ -18,7 +18,7 @@
 
 import com.epam.ta.reportportal.entity.bts.Ticket;
 import com.epam.ta.reportportal.entity.item.issue.IssueEntity;
-import com.epam.ta.reportportal.ws.model.issue.Issue;
+import com.epam.ta.reportportal.ws.reporting.Issue;
 import com.google.common.base.Preconditions;
 import java.util.Optional;
 import java.util.function.Function;
diff --git a/src/main/java/com/epam/ta/reportportal/ws/converter/converters/ItemAttributeConverter.java b/src/main/java/com/epam/ta/reportportal/ws/converter/converters/ItemAttributeConverter.java
index e40a5524b9..1a17d6142f 100644
--- a/src/main/java/com/epam/ta/reportportal/ws/converter/converters/ItemAttributeConverter.java
+++ b/src/main/java/com/epam/ta/reportportal/ws/converter/converters/ItemAttributeConverter.java
@@ -19,9 +19,8 @@
 import com.epam.ta.reportportal.entity.ItemAttribute;
 import com.epam.ta.reportportal.entity.item.TestItem;
 import com.epam.ta.reportportal.entity.launch.Launch;
-import com.epam.ta.reportportal.ws.model.attribute.ItemAttributeResource;
-import com.epam.ta.reportportal.ws.model.attribute.ItemAttributesRQ;
-
+import com.epam.ta.reportportal.ws.reporting.ItemAttributeResource;
+import com.epam.ta.reportportal.ws.reporting.ItemAttributesRQ;
 import java.util.function.BiFunction;
 import java.util.function.Function;
 
diff --git a/src/main/java/com/epam/ta/reportportal/ws/converter/converters/LaunchConverter.java b/src/main/java/com/epam/ta/reportportal/ws/converter/converters/LaunchConverter.java
index fec7c04f4c..472bd02984 100644
--- a/src/main/java/com/epam/ta/reportportal/ws/converter/converters/LaunchConverter.java
+++ b/src/main/java/com/epam/ta/reportportal/ws/converter/converters/LaunchConverter.java
@@ -29,8 +29,8 @@
 import com.epam.ta.reportportal.ws.converter.resource.handler.attribute.ItemAttributeType;
 import com.epam.ta.reportportal.ws.converter.resource.handler.attribute.ResourceAttributeHandler;
 import com.epam.ta.reportportal.ws.converter.resource.handler.attribute.resolver.ItemAttributeTypeResolver;
-import com.epam.ta.reportportal.ws.model.launch.LaunchResource;
-import com.epam.ta.reportportal.ws.model.launch.Mode;
+import com.epam.ta.reportportal.ws.reporting.LaunchResource;
+import com.epam.ta.reportportal.ws.reporting.Mode;
 import com.google.common.base.Preconditions;
 import java.util.Collections;
 import java.util.Map;
diff --git a/src/main/java/com/epam/ta/reportportal/ws/converter/converters/NotificationConfigConverter.java b/src/main/java/com/epam/ta/reportportal/ws/converter/converters/NotificationConfigConverter.java
index fc8050385b..f826e19e1a 100644
--- a/src/main/java/com/epam/ta/reportportal/ws/converter/converters/NotificationConfigConverter.java
+++ b/src/main/java/com/epam/ta/reportportal/ws/converter/converters/NotificationConfigConverter.java
@@ -24,9 +24,9 @@
 import com.epam.ta.reportportal.entity.project.email.SenderCase;
 import com.epam.ta.reportportal.exception.ReportPortalException;
 import com.epam.ta.reportportal.model.project.email.SenderCaseDTO;
-import com.epam.ta.reportportal.ws.model.ErrorType;
+import com.epam.ta.reportportal.ws.reporting.ErrorType;
 import com.epam.ta.reportportal.ws.model.ValidationConstraints;
-import com.epam.ta.reportportal.ws.model.attribute.ItemAttributeResource;
+import com.epam.ta.reportportal.ws.reporting.ItemAttributeResource;
 import com.google.common.base.Preconditions;
 import com.google.common.collect.Lists;
 import com.google.common.collect.Sets;
diff --git a/src/main/java/com/epam/ta/reportportal/ws/converter/converters/ParametersConverter.java b/src/main/java/com/epam/ta/reportportal/ws/converter/converters/ParametersConverter.java
index b1a829e943..a5c5e7bed7 100644
--- a/src/main/java/com/epam/ta/reportportal/ws/converter/converters/ParametersConverter.java
+++ b/src/main/java/com/epam/ta/reportportal/ws/converter/converters/ParametersConverter.java
@@ -16,7 +16,7 @@
 package com.epam.ta.reportportal.ws.converter.converters;
 
 import com.epam.ta.reportportal.entity.item.Parameter;
-import com.epam.ta.reportportal.ws.model.ParameterResource;
+import com.epam.ta.reportportal.ws.reporting.ParameterResource;
 import java.util.function.Function;
 
 /**
diff --git a/src/main/java/com/epam/ta/reportportal/ws/converter/converters/ServerSettingsConverter.java b/src/main/java/com/epam/ta/reportportal/ws/converter/converters/ServerSettingsConverter.java
index 78ecd5b7e5..5b016996b8 100644
--- a/src/main/java/com/epam/ta/reportportal/ws/converter/converters/ServerSettingsConverter.java
+++ b/src/main/java/com/epam/ta/reportportal/ws/converter/converters/ServerSettingsConverter.java
@@ -19,7 +19,7 @@
 import static com.epam.ta.reportportal.commons.validation.BusinessRule.expect;
 
 import com.epam.ta.reportportal.entity.ServerSettings;
-import com.epam.ta.reportportal.ws.model.ErrorType;
+import com.epam.ta.reportportal.ws.reporting.ErrorType;
 import java.util.List;
 import java.util.Map;
 import java.util.function.Function;
diff --git a/src/main/java/com/epam/ta/reportportal/ws/converter/converters/StatisticsConverter.java b/src/main/java/com/epam/ta/reportportal/ws/converter/converters/StatisticsConverter.java
index f736e464ca..c627508750 100644
--- a/src/main/java/com/epam/ta/reportportal/ws/converter/converters/StatisticsConverter.java
+++ b/src/main/java/com/epam/ta/reportportal/ws/converter/converters/StatisticsConverter.java
@@ -21,7 +21,7 @@
 import static java.util.Optional.ofNullable;
 
 import com.epam.ta.reportportal.entity.statistics.Statistics;
-import com.epam.ta.reportportal.ws.model.statistics.StatisticsResource;
+import com.epam.ta.reportportal.ws.reporting.StatisticsResource;
 import java.util.Set;
 import java.util.function.Function;
 import java.util.stream.Collectors;
diff --git a/src/main/java/com/epam/ta/reportportal/ws/converter/converters/TestItemConverter.java b/src/main/java/com/epam/ta/reportportal/ws/converter/converters/TestItemConverter.java
index df72c218bf..f41e17d8c8 100644
--- a/src/main/java/com/epam/ta/reportportal/ws/converter/converters/TestItemConverter.java
+++ b/src/main/java/com/epam/ta/reportportal/ws/converter/converters/TestItemConverter.java
@@ -25,12 +25,12 @@
 import com.epam.ta.reportportal.entity.item.TestItem;
 import com.epam.ta.reportportal.entity.item.issue.IssueEntity;
 import com.epam.ta.reportportal.model.NestedStepResource;
-import com.epam.ta.reportportal.model.TestItemResource;
 import com.epam.ta.reportportal.model.activity.TestItemActivityResource;
-import com.epam.ta.reportportal.ws.model.attribute.ItemAttributeResource;
-import com.epam.ta.reportportal.ws.model.item.ItemPathName;
-import com.epam.ta.reportportal.ws.model.item.LaunchPathName;
-import com.epam.ta.reportportal.ws.model.item.PathNameResource;
+import com.epam.ta.reportportal.ws.reporting.ItemAttributeResource;
+import com.epam.ta.reportportal.ws.reporting.ItemPathName;
+import com.epam.ta.reportportal.ws.reporting.LaunchPathName;
+import com.epam.ta.reportportal.ws.reporting.PathNameResource;
+import com.epam.ta.reportportal.ws.reporting.TestItemResource;
 import java.util.Objects;
 import java.util.function.BiFunction;
 import java.util.function.Function;
diff --git a/src/main/java/com/epam/ta/reportportal/ws/converter/converters/TicketConverter.java b/src/main/java/com/epam/ta/reportportal/ws/converter/converters/TicketConverter.java
index 73052d8db0..0eaaa65bdf 100644
--- a/src/main/java/com/epam/ta/reportportal/ws/converter/converters/TicketConverter.java
+++ b/src/main/java/com/epam/ta/reportportal/ws/converter/converters/TicketConverter.java
@@ -17,7 +17,7 @@
 package com.epam.ta.reportportal.ws.converter.converters;
 
 import com.epam.ta.reportportal.entity.bts.Ticket;
-import com.epam.ta.reportportal.ws.model.issue.Issue;
+import com.epam.ta.reportportal.ws.reporting.Issue;
 import com.google.common.base.Preconditions;
 import java.util.function.Function;
 
diff --git a/src/main/java/com/epam/ta/reportportal/ws/converter/resource/handler/attribute/launch/LaunchResourceAttributeLogger.java b/src/main/java/com/epam/ta/reportportal/ws/converter/resource/handler/attribute/launch/LaunchResourceAttributeLogger.java
index 226ebc48e9..c22d07e615 100644
--- a/src/main/java/com/epam/ta/reportportal/ws/converter/resource/handler/attribute/launch/LaunchResourceAttributeLogger.java
+++ b/src/main/java/com/epam/ta/reportportal/ws/converter/resource/handler/attribute/launch/LaunchResourceAttributeLogger.java
@@ -18,7 +18,7 @@
 
 import com.epam.ta.reportportal.entity.ItemAttribute;
 import com.epam.ta.reportportal.ws.converter.resource.handler.attribute.ResourceAttributeHandler;
-import com.epam.ta.reportportal.ws.model.launch.LaunchResource;
+import com.epam.ta.reportportal.ws.reporting.LaunchResource;
 import java.util.Collection;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
diff --git a/src/main/java/com/epam/ta/reportportal/ws/converter/resource/handler/attribute/launch/LaunchResourceAttributeUpdater.java b/src/main/java/com/epam/ta/reportportal/ws/converter/resource/handler/attribute/launch/LaunchResourceAttributeUpdater.java
index 1ff7947d06..f52fd01f4d 100644
--- a/src/main/java/com/epam/ta/reportportal/ws/converter/resource/handler/attribute/launch/LaunchResourceAttributeUpdater.java
+++ b/src/main/java/com/epam/ta/reportportal/ws/converter/resource/handler/attribute/launch/LaunchResourceAttributeUpdater.java
@@ -20,8 +20,8 @@
 
 import com.epam.ta.reportportal.entity.ItemAttribute;
 import com.epam.ta.reportportal.ws.converter.resource.handler.attribute.ResourceAttributeHandler;
-import com.epam.ta.reportportal.ws.model.attribute.ItemAttributeResource;
-import com.epam.ta.reportportal.ws.model.launch.LaunchResource;
+import com.epam.ta.reportportal.ws.reporting.ItemAttributeResource;
+import com.epam.ta.reportportal.ws.reporting.LaunchResource;
 import java.util.Collection;
 
 /**
diff --git a/src/main/java/com/epam/ta/reportportal/ws/converter/resource/handler/attribute/launch/LaunchResourceMetadataAttributeUpdater.java b/src/main/java/com/epam/ta/reportportal/ws/converter/resource/handler/attribute/launch/LaunchResourceMetadataAttributeUpdater.java
index f33bc8d6bf..6b955d6329 100644
--- a/src/main/java/com/epam/ta/reportportal/ws/converter/resource/handler/attribute/launch/LaunchResourceMetadataAttributeUpdater.java
+++ b/src/main/java/com/epam/ta/reportportal/ws/converter/resource/handler/attribute/launch/LaunchResourceMetadataAttributeUpdater.java
@@ -16,18 +16,17 @@
 
 package com.epam.ta.reportportal.ws.converter.resource.handler.attribute.launch;
 
+import static java.util.Optional.ofNullable;
+
 import com.epam.ta.reportportal.entity.ItemAttribute;
 import com.epam.ta.reportportal.ws.converter.resource.handler.attribute.ResourceAttributeHandler;
-import com.epam.ta.reportportal.ws.model.launch.LaunchResource;
+import com.epam.ta.reportportal.ws.reporting.LaunchResource;
 import com.google.common.collect.Maps;
-
 import java.util.Collection;
 import java.util.Map;
 import java.util.Set;
 import org.apache.commons.lang3.StringUtils;
 
-import static java.util.Optional.ofNullable;
-
 /**
  * @author <a href="mailto:ivan_budayeu@epam.com">Ivan Budayeu</a>
  */
diff --git a/src/main/java/com/epam/ta/reportportal/ws/converter/utils/item/provider/PathNameUpdaterProvider.java b/src/main/java/com/epam/ta/reportportal/ws/converter/utils/item/provider/PathNameUpdaterProvider.java
index ebe96a0bdc..5b89f5965c 100644
--- a/src/main/java/com/epam/ta/reportportal/ws/converter/utils/item/provider/PathNameUpdaterProvider.java
+++ b/src/main/java/com/epam/ta/reportportal/ws/converter/utils/item/provider/PathNameUpdaterProvider.java
@@ -18,11 +18,11 @@
 
 import com.epam.ta.reportportal.dao.TestItemRepository;
 import com.epam.ta.reportportal.entity.item.PathName;
-import com.epam.ta.reportportal.model.TestItemResource;
 import com.epam.ta.reportportal.ws.converter.utils.ResourceUpdater;
 import com.epam.ta.reportportal.ws.converter.utils.ResourceUpdaterProvider;
 import com.epam.ta.reportportal.ws.converter.utils.item.content.TestItemUpdaterContent;
 import com.epam.ta.reportportal.ws.converter.utils.item.updater.PathNameUpdater;
+import com.epam.ta.reportportal.ws.reporting.TestItemResource;
 import java.util.Map;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
diff --git a/src/main/java/com/epam/ta/reportportal/ws/converter/utils/item/provider/RetriesUpdaterProvider.java b/src/main/java/com/epam/ta/reportportal/ws/converter/utils/item/provider/RetriesUpdaterProvider.java
index 8de0075225..80194b03d2 100644
--- a/src/main/java/com/epam/ta/reportportal/ws/converter/utils/item/provider/RetriesUpdaterProvider.java
+++ b/src/main/java/com/epam/ta/reportportal/ws/converter/utils/item/provider/RetriesUpdaterProvider.java
@@ -20,11 +20,11 @@
 
 import com.epam.ta.reportportal.dao.TestItemRepository;
 import com.epam.ta.reportportal.entity.item.TestItem;
-import com.epam.ta.reportportal.model.TestItemResource;
 import com.epam.ta.reportportal.ws.converter.utils.ResourceUpdater;
 import com.epam.ta.reportportal.ws.converter.utils.ResourceUpdaterProvider;
 import com.epam.ta.reportportal.ws.converter.utils.item.content.TestItemUpdaterContent;
 import com.epam.ta.reportportal.ws.converter.utils.item.updater.RetriesUpdater;
+import com.epam.ta.reportportal.ws.reporting.TestItemResource;
 import java.util.List;
 import java.util.Map;
 import java.util.stream.Collectors;
diff --git a/src/main/java/com/epam/ta/reportportal/ws/converter/utils/item/updater/PathNameUpdater.java b/src/main/java/com/epam/ta/reportportal/ws/converter/utils/item/updater/PathNameUpdater.java
index d526f25dfa..b75c2d9dec 100644
--- a/src/main/java/com/epam/ta/reportportal/ws/converter/utils/item/updater/PathNameUpdater.java
+++ b/src/main/java/com/epam/ta/reportportal/ws/converter/utils/item/updater/PathNameUpdater.java
@@ -19,9 +19,9 @@
 import static java.util.Optional.ofNullable;
 
 import com.epam.ta.reportportal.entity.item.PathName;
-import com.epam.ta.reportportal.model.TestItemResource;
 import com.epam.ta.reportportal.ws.converter.converters.TestItemConverter;
 import com.epam.ta.reportportal.ws.converter.utils.ResourceUpdater;
+import com.epam.ta.reportportal.ws.reporting.TestItemResource;
 import java.util.Map;
 
 /**
diff --git a/src/main/java/com/epam/ta/reportportal/ws/converter/utils/item/updater/RetriesUpdater.java b/src/main/java/com/epam/ta/reportportal/ws/converter/utils/item/updater/RetriesUpdater.java
index c7f201b8d0..a49f998851 100644
--- a/src/main/java/com/epam/ta/reportportal/ws/converter/utils/item/updater/RetriesUpdater.java
+++ b/src/main/java/com/epam/ta/reportportal/ws/converter/utils/item/updater/RetriesUpdater.java
@@ -19,9 +19,9 @@
 import static java.util.Optional.ofNullable;
 
 import com.epam.ta.reportportal.entity.item.TestItem;
-import com.epam.ta.reportportal.model.TestItemResource;
 import com.epam.ta.reportportal.ws.converter.converters.TestItemConverter;
 import com.epam.ta.reportportal.ws.converter.utils.ResourceUpdater;
+import com.epam.ta.reportportal.ws.reporting.TestItemResource;
 import java.util.List;
 import java.util.Map;
 import java.util.stream.Collectors;
diff --git a/src/main/java/com/epam/ta/reportportal/ws/rabbit/AsyncReportingListener.java b/src/main/java/com/epam/ta/reportportal/ws/rabbit/AsyncReportingListener.java
index 54e9a9bfe3..15b8c1f67d 100644
--- a/src/main/java/com/epam/ta/reportportal/ws/rabbit/AsyncReportingListener.java
+++ b/src/main/java/com/epam/ta/reportportal/ws/rabbit/AsyncReportingListener.java
@@ -45,12 +45,12 @@
 import com.epam.ta.reportportal.exception.ReportPortalException;
 import com.epam.ta.reportportal.util.ProjectExtractor;
 import com.epam.ta.reportportal.ws.converter.builders.LogFullBuilder;
-import com.epam.ta.reportportal.ws.model.ErrorType;
-import com.epam.ta.reportportal.ws.model.FinishExecutionRQ;
-import com.epam.ta.reportportal.ws.model.FinishTestItemRQ;
-import com.epam.ta.reportportal.ws.model.StartTestItemRQ;
-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.ErrorType;
+import com.epam.ta.reportportal.ws.reporting.FinishExecutionRQ;
+import com.epam.ta.reportportal.ws.reporting.FinishTestItemRQ;
+import com.epam.ta.reportportal.ws.reporting.StartTestItemRQ;
+import com.epam.ta.reportportal.ws.reporting.StartLaunchRQ;
+import com.epam.ta.reportportal.ws.reporting.SaveLogRQ;
 import com.google.common.base.Strings;
 import java.time.LocalDateTime;
 import java.time.ZoneOffset;
diff --git a/src/main/java/com/epam/ta/reportportal/ws/resolver/FilterCriteriaResolver.java b/src/main/java/com/epam/ta/reportportal/ws/resolver/FilterCriteriaResolver.java
index ae8a5a5107..479d60b431 100644
--- a/src/main/java/com/epam/ta/reportportal/ws/resolver/FilterCriteriaResolver.java
+++ b/src/main/java/com/epam/ta/reportportal/ws/resolver/FilterCriteriaResolver.java
@@ -24,7 +24,7 @@
 import com.epam.ta.reportportal.commons.validation.BusinessRule;
 import com.epam.ta.reportportal.commons.validation.Suppliers;
 import com.epam.ta.reportportal.exception.ReportPortalException;
-import com.epam.ta.reportportal.ws.model.ErrorType;
+import com.epam.ta.reportportal.ws.reporting.ErrorType;
 import java.util.List;
 import java.util.stream.Collectors;
 import org.apache.commons.lang3.StringUtils;
diff --git a/src/main/java/com/epam/ta/reportportal/ws/resolver/PredefinedFilterCriteriaResolver.java b/src/main/java/com/epam/ta/reportportal/ws/resolver/PredefinedFilterCriteriaResolver.java
index 479f56227e..7daffe5ee5 100644
--- a/src/main/java/com/epam/ta/reportportal/ws/resolver/PredefinedFilterCriteriaResolver.java
+++ b/src/main/java/com/epam/ta/reportportal/ws/resolver/PredefinedFilterCriteriaResolver.java
@@ -22,7 +22,7 @@
 import com.epam.ta.reportportal.commons.validation.BusinessRule;
 import com.epam.ta.reportportal.core.filter.predefined.PredefinedFilterType;
 import com.epam.ta.reportportal.core.filter.predefined.PredefinedFilters;
-import com.epam.ta.reportportal.ws.model.ErrorType;
+import com.epam.ta.reportportal.ws.reporting.ErrorType;
 import java.util.Collections;
 import java.util.List;
 import java.util.Optional;
diff --git a/src/main/java/com/epam/ta/reportportal/ws/resolver/SortArgumentResolver.java b/src/main/java/com/epam/ta/reportportal/ws/resolver/SortArgumentResolver.java
index 5841d34f05..2914a35cc8 100644
--- a/src/main/java/com/epam/ta/reportportal/ws/resolver/SortArgumentResolver.java
+++ b/src/main/java/com/epam/ta/reportportal/ws/resolver/SortArgumentResolver.java
@@ -23,7 +23,7 @@
 import com.epam.ta.reportportal.commons.querygen.CriteriaHolder;
 import com.epam.ta.reportportal.commons.querygen.FilterTarget;
 import com.epam.ta.reportportal.commons.validation.BusinessRule;
-import com.epam.ta.reportportal.ws.model.ErrorType;
+import com.epam.ta.reportportal.ws.reporting.ErrorType;
 import java.util.Optional;
 import java.util.stream.StreamSupport;
 import org.springframework.core.MethodParameter;
diff --git a/src/test/java/com/epam/ta/reportportal/core/analyzer/auto/impl/SuggestItemServiceTest.java b/src/test/java/com/epam/ta/reportportal/core/analyzer/auto/impl/SuggestItemServiceTest.java
index 59919308c1..137c4072d1 100644
--- a/src/test/java/com/epam/ta/reportportal/core/analyzer/auto/impl/SuggestItemServiceTest.java
+++ b/src/test/java/com/epam/ta/reportportal/core/analyzer/auto/impl/SuggestItemServiceTest.java
@@ -29,7 +29,7 @@
 import com.epam.ta.reportportal.entity.project.ProjectRole;
 import com.epam.ta.reportportal.entity.user.UserRole;
 import com.epam.ta.reportportal.exception.ReportPortalException;
-import com.epam.ta.reportportal.ws.model.OperationCompletionRS;
+import com.epam.ta.reportportal.ws.reporting.OperationCompletionRS;
 import java.time.LocalDateTime;
 import java.util.ArrayList;
 import java.util.Collections;
diff --git a/src/test/java/com/epam/ta/reportportal/core/analyzer/config/AnalyzerTypeTest.java b/src/test/java/com/epam/ta/reportportal/core/analyzer/config/AnalyzerTypeTest.java
index a2cc3ffd12..51934db5c5 100644
--- a/src/test/java/com/epam/ta/reportportal/core/analyzer/config/AnalyzerTypeTest.java
+++ b/src/test/java/com/epam/ta/reportportal/core/analyzer/config/AnalyzerTypeTest.java
@@ -21,7 +21,7 @@
 import static org.junit.jupiter.api.Assertions.assertTrue;
 
 import com.epam.ta.reportportal.exception.ReportPortalException;
-import com.epam.ta.reportportal.ws.model.ErrorType;
+import com.epam.ta.reportportal.ws.reporting.ErrorType;
 import org.junit.jupiter.api.Test;
 
 /**
diff --git a/src/test/java/com/epam/ta/reportportal/core/filter/impl/UpdateUserFilterHandlerTest.java b/src/test/java/com/epam/ta/reportportal/core/filter/impl/UpdateUserFilterHandlerTest.java
index 16dabc47b5..7cb063e0bd 100644
--- a/src/test/java/com/epam/ta/reportportal/core/filter/impl/UpdateUserFilterHandlerTest.java
+++ b/src/test/java/com/epam/ta/reportportal/core/filter/impl/UpdateUserFilterHandlerTest.java
@@ -43,7 +43,7 @@
 import com.epam.ta.reportportal.model.filter.UpdateUserFilterRQ;
 import com.epam.ta.reportportal.model.filter.UserFilterCondition;
 import com.epam.ta.reportportal.util.ProjectExtractor;
-import com.epam.ta.reportportal.ws.model.OperationCompletionRS;
+import com.epam.ta.reportportal.ws.reporting.OperationCompletionRS;
 import com.google.common.collect.Lists;
 import com.google.common.collect.Sets;
 import java.util.Optional;
diff --git a/src/test/java/com/epam/ta/reportportal/core/imprt/ImportLaunchHandlerImplTest.java b/src/test/java/com/epam/ta/reportportal/core/imprt/ImportLaunchHandlerImplTest.java
index b827cc6834..573e748cc5 100644
--- a/src/test/java/com/epam/ta/reportportal/core/imprt/ImportLaunchHandlerImplTest.java
+++ b/src/test/java/com/epam/ta/reportportal/core/imprt/ImportLaunchHandlerImplTest.java
@@ -19,7 +19,7 @@
 import com.epam.ta.reportportal.model.LaunchImportCompletionRS;
 import com.epam.ta.reportportal.model.launch.LaunchImportRQ;
 import com.epam.ta.reportportal.util.sample.LaunchSampleUtil;
-import com.epam.ta.reportportal.ws.model.ErrorType;
+import com.epam.ta.reportportal.ws.reporting.ErrorType;
 import java.io.File;
 import java.util.Optional;
 import org.apache.commons.io.FilenameUtils;
diff --git a/src/test/java/com/epam/ta/reportportal/core/imprt/XmlImportStrategyTest.java b/src/test/java/com/epam/ta/reportportal/core/imprt/XmlImportStrategyTest.java
index 3dd6cc92bc..2816753695 100644
--- a/src/test/java/com/epam/ta/reportportal/core/imprt/XmlImportStrategyTest.java
+++ b/src/test/java/com/epam/ta/reportportal/core/imprt/XmlImportStrategyTest.java
@@ -17,8 +17,8 @@
 import com.epam.ta.reportportal.dao.LaunchRepository;
 import com.epam.ta.reportportal.entity.launch.Launch;
 import com.epam.ta.reportportal.model.launch.LaunchImportRQ;
-import com.epam.ta.reportportal.ws.model.attribute.ItemAttributesRQ;
-import com.epam.ta.reportportal.ws.model.launch.StartLaunchRS;
+import com.epam.ta.reportportal.ws.reporting.ItemAttributesRQ;
+import com.epam.ta.reportportal.ws.reporting.StartLaunchRS;
 import java.io.BufferedWriter;
 import java.io.File;
 import java.io.FileWriter;
diff --git a/src/test/java/com/epam/ta/reportportal/core/imprt/impl/junit/XunitImportHandlerTest.java b/src/test/java/com/epam/ta/reportportal/core/imprt/impl/junit/XunitImportHandlerTest.java
index 994a21c599..b924c32c7f 100644
--- a/src/test/java/com/epam/ta/reportportal/core/imprt/impl/junit/XunitImportHandlerTest.java
+++ b/src/test/java/com/epam/ta/reportportal/core/imprt/impl/junit/XunitImportHandlerTest.java
@@ -14,9 +14,9 @@
 import com.epam.ta.reportportal.core.log.CreateLogHandler;
 import com.epam.ta.reportportal.entity.enums.LogLevel;
 import com.epam.ta.reportportal.entity.enums.TestItemTypeEnum;
-import com.epam.ta.reportportal.ws.model.StartTestItemRQ;
-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.StartTestItemRQ;
+import com.epam.ta.reportportal.ws.reporting.ItemCreatedRS;
+import com.epam.ta.reportportal.ws.reporting.SaveLogRQ;
 import java.lang.reflect.Field;
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
diff --git a/src/test/java/com/epam/ta/reportportal/core/integration/impl/DeleteIntegrationHandlerTest.java b/src/test/java/com/epam/ta/reportportal/core/integration/impl/DeleteIntegrationHandlerTest.java
index 37bd0e11a9..80d9e58e2e 100644
--- a/src/test/java/com/epam/ta/reportportal/core/integration/impl/DeleteIntegrationHandlerTest.java
+++ b/src/test/java/com/epam/ta/reportportal/core/integration/impl/DeleteIntegrationHandlerTest.java
@@ -28,7 +28,7 @@
 import com.epam.ta.reportportal.entity.project.Project;
 import com.epam.ta.reportportal.entity.project.ProjectRole;
 import com.epam.ta.reportportal.entity.user.UserRole;
-import com.epam.ta.reportportal.ws.model.OperationCompletionRS;
+import com.epam.ta.reportportal.ws.reporting.OperationCompletionRS;
 import com.google.common.collect.Lists;
 import org.junit.jupiter.api.Test;
 
diff --git a/src/test/java/com/epam/ta/reportportal/core/integration/plugin/impl/UpdatePluginHandlerTest.java b/src/test/java/com/epam/ta/reportportal/core/integration/plugin/impl/UpdatePluginHandlerTest.java
index 06f2d63f9e..e4fc36f9e4 100644
--- a/src/test/java/com/epam/ta/reportportal/core/integration/plugin/impl/UpdatePluginHandlerTest.java
+++ b/src/test/java/com/epam/ta/reportportal/core/integration/plugin/impl/UpdatePluginHandlerTest.java
@@ -39,7 +39,7 @@
 import com.epam.ta.reportportal.exception.ReportPortalException;
 import com.epam.ta.reportportal.filesystem.DataStore;
 import com.epam.ta.reportportal.model.integration.UpdatePluginStateRQ;
-import com.epam.ta.reportportal.ws.model.OperationCompletionRS;
+import com.epam.ta.reportportal.ws.reporting.OperationCompletionRS;
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.IOException;
diff --git a/src/test/java/com/epam/ta/reportportal/core/item/impl/DeleteTestItemHandlerImplTest.java b/src/test/java/com/epam/ta/reportportal/core/item/impl/DeleteTestItemHandlerImplTest.java
index c5ec0b630e..b8297c7f21 100644
--- a/src/test/java/com/epam/ta/reportportal/core/item/impl/DeleteTestItemHandlerImplTest.java
+++ b/src/test/java/com/epam/ta/reportportal/core/item/impl/DeleteTestItemHandlerImplTest.java
@@ -43,7 +43,7 @@
 import com.epam.ta.reportportal.entity.user.User;
 import com.epam.ta.reportportal.entity.user.UserRole;
 import com.epam.ta.reportportal.exception.ReportPortalException;
-import com.epam.ta.reportportal.ws.model.OperationCompletionRS;
+import com.epam.ta.reportportal.ws.reporting.OperationCompletionRS;
 import java.util.Collection;
 import java.util.Optional;
 import org.junit.jupiter.api.Test;
diff --git a/src/test/java/com/epam/ta/reportportal/core/item/impl/FinishTestItemHandlerAsyncImplTest.java b/src/test/java/com/epam/ta/reportportal/core/item/impl/FinishTestItemHandlerAsyncImplTest.java
index 33f8e82dc5..d8917387f8 100644
--- a/src/test/java/com/epam/ta/reportportal/core/item/impl/FinishTestItemHandlerAsyncImplTest.java
+++ b/src/test/java/com/epam/ta/reportportal/core/item/impl/FinishTestItemHandlerAsyncImplTest.java
@@ -27,7 +27,7 @@
 import com.epam.ta.reportportal.entity.user.UserRole;
 import com.epam.ta.reportportal.exception.ReportPortalException;
 import com.epam.ta.reportportal.util.ReportingQueueService;
-import com.epam.ta.reportportal.ws.model.FinishTestItemRQ;
+import com.epam.ta.reportportal.ws.reporting.FinishTestItemRQ;
 import java.util.UUID;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
diff --git a/src/test/java/com/epam/ta/reportportal/core/item/impl/FinishTestItemHandlerImplTest.java b/src/test/java/com/epam/ta/reportportal/core/item/impl/FinishTestItemHandlerImplTest.java
index 6f7c209483..0a47481a73 100644
--- a/src/test/java/com/epam/ta/reportportal/core/item/impl/FinishTestItemHandlerImplTest.java
+++ b/src/test/java/com/epam/ta/reportportal/core/item/impl/FinishTestItemHandlerImplTest.java
@@ -44,8 +44,8 @@
 import com.epam.ta.reportportal.entity.user.User;
 import com.epam.ta.reportportal.entity.user.UserRole;
 import com.epam.ta.reportportal.exception.ReportPortalException;
-import com.epam.ta.reportportal.ws.model.FinishTestItemRQ;
-import com.epam.ta.reportportal.ws.model.OperationCompletionRS;
+import com.epam.ta.reportportal.ws.reporting.FinishTestItemRQ;
+import com.epam.ta.reportportal.ws.reporting.OperationCompletionRS;
 import java.time.LocalDateTime;
 import java.util.Date;
 import java.util.Map;
diff --git a/src/test/java/com/epam/ta/reportportal/core/item/impl/GetTestItemHandlerImplTest.java b/src/test/java/com/epam/ta/reportportal/core/item/impl/GetTestItemHandlerImplTest.java
index f1348bf95a..f24bf5f83f 100644
--- a/src/test/java/com/epam/ta/reportportal/core/item/impl/GetTestItemHandlerImplTest.java
+++ b/src/test/java/com/epam/ta/reportportal/core/item/impl/GetTestItemHandlerImplTest.java
@@ -31,7 +31,7 @@
 import com.epam.ta.reportportal.entity.project.ProjectRole;
 import com.epam.ta.reportportal.entity.user.UserRole;
 import com.epam.ta.reportportal.exception.ReportPortalException;
-import com.epam.ta.reportportal.ws.model.ErrorType;
+import com.epam.ta.reportportal.ws.reporting.ErrorType;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
 import org.junit.jupiter.api.function.Executable;
diff --git a/src/test/java/com/epam/ta/reportportal/core/item/impl/StartTestItemHandlerAsyncImplTest.java b/src/test/java/com/epam/ta/reportportal/core/item/impl/StartTestItemHandlerAsyncImplTest.java
index b1264242fb..f12341cfb1 100644
--- a/src/test/java/com/epam/ta/reportportal/core/item/impl/StartTestItemHandlerAsyncImplTest.java
+++ b/src/test/java/com/epam/ta/reportportal/core/item/impl/StartTestItemHandlerAsyncImplTest.java
@@ -24,7 +24,7 @@
 import com.epam.ta.reportportal.entity.project.ProjectRole;
 import com.epam.ta.reportportal.entity.user.UserRole;
 import com.epam.ta.reportportal.util.ReportingQueueService;
-import com.epam.ta.reportportal.ws.model.StartTestItemRQ;
+import com.epam.ta.reportportal.ws.reporting.StartTestItemRQ;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
 import org.mockito.InjectMocks;
diff --git a/src/test/java/com/epam/ta/reportportal/core/item/impl/StartTestItemHandlerImplTest.java b/src/test/java/com/epam/ta/reportportal/core/item/impl/StartTestItemHandlerImplTest.java
index 4db2058cdc..6bbccbe3ab 100644
--- a/src/test/java/com/epam/ta/reportportal/core/item/impl/StartTestItemHandlerImplTest.java
+++ b/src/test/java/com/epam/ta/reportportal/core/item/impl/StartTestItemHandlerImplTest.java
@@ -37,8 +37,8 @@
 import com.epam.ta.reportportal.entity.project.ProjectRole;
 import com.epam.ta.reportportal.entity.user.UserRole;
 import com.epam.ta.reportportal.exception.ReportPortalException;
-import com.epam.ta.reportportal.ws.model.ErrorType;
-import com.epam.ta.reportportal.ws.model.StartTestItemRQ;
+import com.epam.ta.reportportal.ws.reporting.ErrorType;
+import com.epam.ta.reportportal.ws.reporting.StartTestItemRQ;
 import java.time.LocalDateTime;
 import java.time.ZoneId;
 import java.util.ArrayList;
diff --git a/src/test/java/com/epam/ta/reportportal/core/item/impl/UpdateTestItemHandlerImplTest.java b/src/test/java/com/epam/ta/reportportal/core/item/impl/UpdateTestItemHandlerImplTest.java
index 1615ff7296..ce15d35af3 100644
--- a/src/test/java/com/epam/ta/reportportal/core/item/impl/UpdateTestItemHandlerImplTest.java
+++ b/src/test/java/com/epam/ta/reportportal/core/item/impl/UpdateTestItemHandlerImplTest.java
@@ -45,8 +45,8 @@
 import com.epam.ta.reportportal.exception.ReportPortalException;
 import com.epam.ta.reportportal.model.issue.DefineIssueRQ;
 import com.epam.ta.reportportal.model.item.UpdateTestItemRQ;
-import com.epam.ta.reportportal.ws.model.ErrorType;
-import com.epam.ta.reportportal.ws.model.OperationCompletionRS;
+import com.epam.ta.reportportal.ws.reporting.ErrorType;
+import com.epam.ta.reportportal.ws.reporting.OperationCompletionRS;
 import com.google.common.collect.Sets;
 import java.util.Map;
 import java.util.Optional;
diff --git a/src/test/java/com/epam/ta/reportportal/core/launch/impl/FinishLaunchHandlerAsyncImplTest.java b/src/test/java/com/epam/ta/reportportal/core/launch/impl/FinishLaunchHandlerAsyncImplTest.java
index 7a76a64e33..b6cd736103 100644
--- a/src/test/java/com/epam/ta/reportportal/core/launch/impl/FinishLaunchHandlerAsyncImplTest.java
+++ b/src/test/java/com/epam/ta/reportportal/core/launch/impl/FinishLaunchHandlerAsyncImplTest.java
@@ -24,7 +24,7 @@
 import com.epam.ta.reportportal.entity.project.ProjectRole;
 import com.epam.ta.reportportal.entity.user.UserRole;
 import com.epam.ta.reportportal.util.ReportingQueueService;
-import com.epam.ta.reportportal.ws.model.FinishExecutionRQ;
+import com.epam.ta.reportportal.ws.reporting.FinishExecutionRQ;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
 import org.mockito.InjectMocks;
diff --git a/src/test/java/com/epam/ta/reportportal/core/launch/impl/FinishLaunchHandlerImplTest.java b/src/test/java/com/epam/ta/reportportal/core/launch/impl/FinishLaunchHandlerImplTest.java
index a73235527f..5ba5ae0975 100644
--- a/src/test/java/com/epam/ta/reportportal/core/launch/impl/FinishLaunchHandlerImplTest.java
+++ b/src/test/java/com/epam/ta/reportportal/core/launch/impl/FinishLaunchHandlerImplTest.java
@@ -40,8 +40,8 @@
 import com.epam.ta.reportportal.exception.ReportPortalException;
 import com.epam.ta.reportportal.model.BulkRQ;
 import com.epam.ta.reportportal.model.launch.FinishLaunchRS;
-import com.epam.ta.reportportal.ws.model.FinishExecutionRQ;
-import com.epam.ta.reportportal.ws.model.OperationCompletionRS;
+import com.epam.ta.reportportal.ws.reporting.FinishExecutionRQ;
+import com.epam.ta.reportportal.ws.reporting.OperationCompletionRS;
 import java.time.LocalDateTime;
 import java.time.ZoneId;
 import java.util.Date;
diff --git a/src/test/java/com/epam/ta/reportportal/core/launch/impl/StartLaunchHandlerAsyncImplTest.java b/src/test/java/com/epam/ta/reportportal/core/launch/impl/StartLaunchHandlerAsyncImplTest.java
index ca463f709d..59312da3ca 100644
--- a/src/test/java/com/epam/ta/reportportal/core/launch/impl/StartLaunchHandlerAsyncImplTest.java
+++ b/src/test/java/com/epam/ta/reportportal/core/launch/impl/StartLaunchHandlerAsyncImplTest.java
@@ -24,7 +24,7 @@
 import com.epam.ta.reportportal.entity.project.ProjectRole;
 import com.epam.ta.reportportal.entity.user.UserRole;
 import com.epam.ta.reportportal.util.ReportingQueueService;
-import com.epam.ta.reportportal.ws.model.launch.StartLaunchRQ;
+import com.epam.ta.reportportal.ws.reporting.StartLaunchRQ;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
 import org.mockito.InjectMocks;
diff --git a/src/test/java/com/epam/ta/reportportal/core/launch/impl/StartLaunchHandlerImplTest.java b/src/test/java/com/epam/ta/reportportal/core/launch/impl/StartLaunchHandlerImplTest.java
index 8d074cf6cb..eee25a8920 100644
--- a/src/test/java/com/epam/ta/reportportal/core/launch/impl/StartLaunchHandlerImplTest.java
+++ b/src/test/java/com/epam/ta/reportportal/core/launch/impl/StartLaunchHandlerImplTest.java
@@ -35,9 +35,9 @@
 import com.epam.ta.reportportal.entity.project.ProjectRole;
 import com.epam.ta.reportportal.entity.user.UserRole;
 import com.epam.ta.reportportal.exception.ReportPortalException;
-import com.epam.ta.reportportal.ws.model.launch.Mode;
-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.Mode;
+import com.epam.ta.reportportal.ws.reporting.StartLaunchRQ;
+import com.epam.ta.reportportal.ws.reporting.StartLaunchRS;
 import java.util.Date;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
diff --git a/src/test/java/com/epam/ta/reportportal/core/launch/impl/UpdateLaunchHandlerImplTest.java b/src/test/java/com/epam/ta/reportportal/core/launch/impl/UpdateLaunchHandlerImplTest.java
index 2b0fe871d4..455773cda8 100644
--- a/src/test/java/com/epam/ta/reportportal/core/launch/impl/UpdateLaunchHandlerImplTest.java
+++ b/src/test/java/com/epam/ta/reportportal/core/launch/impl/UpdateLaunchHandlerImplTest.java
@@ -46,7 +46,7 @@
 import com.epam.ta.reportportal.exception.ReportPortalException;
 import com.epam.ta.reportportal.model.launch.UpdateLaunchRQ;
 import com.epam.ta.reportportal.model.launch.cluster.CreateClustersRQ;
-import com.epam.ta.reportportal.ws.model.launch.Mode;
+import com.epam.ta.reportportal.ws.reporting.Mode;
 import java.util.Map;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
diff --git a/src/test/java/com/epam/ta/reportportal/core/launch/rerun/RerunHandlerImplTest.java b/src/test/java/com/epam/ta/reportportal/core/launch/rerun/RerunHandlerImplTest.java
index 3baeffaca3..074629a281 100644
--- a/src/test/java/com/epam/ta/reportportal/core/launch/rerun/RerunHandlerImplTest.java
+++ b/src/test/java/com/epam/ta/reportportal/core/launch/rerun/RerunHandlerImplTest.java
@@ -44,11 +44,11 @@
 import com.epam.ta.reportportal.entity.project.ProjectRole;
 import com.epam.ta.reportportal.entity.user.UserRole;
 import com.epam.ta.reportportal.exception.ReportPortalException;
-import com.epam.ta.reportportal.ws.model.StartTestItemRQ;
-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.Mode;
-import com.epam.ta.reportportal.ws.model.launch.StartLaunchRQ;
+import com.epam.ta.reportportal.ws.reporting.StartTestItemRQ;
+import com.epam.ta.reportportal.ws.reporting.ItemAttributesRQ;
+import com.epam.ta.reportportal.ws.reporting.ItemCreatedRS;
+import com.epam.ta.reportportal.ws.reporting.Mode;
+import com.epam.ta.reportportal.ws.reporting.StartLaunchRQ;
 import com.google.common.collect.Sets;
 import java.util.ArrayList;
 import java.util.Optional;
diff --git a/src/test/java/com/epam/ta/reportportal/core/launch/util/LaunchValidatorTest.java b/src/test/java/com/epam/ta/reportportal/core/launch/util/LaunchValidatorTest.java
index 02ad7ed9e3..9f6bcc60ff 100644
--- a/src/test/java/com/epam/ta/reportportal/core/launch/util/LaunchValidatorTest.java
+++ b/src/test/java/com/epam/ta/reportportal/core/launch/util/LaunchValidatorTest.java
@@ -18,7 +18,7 @@
 
 import static com.epam.ta.reportportal.commons.EntityUtils.TO_DATE;
 import static com.epam.ta.reportportal.commons.EntityUtils.TO_LOCAL_DATE_TIME;
-import static com.epam.ta.reportportal.ws.model.ErrorType.FINISH_TIME_EARLIER_THAN_START_TIME;
+import static com.epam.ta.reportportal.ws.reporting.ErrorType.FINISH_TIME_EARLIER_THAN_START_TIME;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertThrows;
 
@@ -26,7 +26,7 @@
 import com.epam.ta.reportportal.entity.enums.StatusEnum;
 import com.epam.ta.reportportal.entity.launch.Launch;
 import com.epam.ta.reportportal.exception.ReportPortalException;
-import com.epam.ta.reportportal.ws.model.FinishExecutionRQ;
+import com.epam.ta.reportportal.ws.reporting.FinishExecutionRQ;
 import java.time.Instant;
 import java.time.LocalDateTime;
 import java.time.ZoneOffset;
diff --git a/src/test/java/com/epam/ta/reportportal/core/launch/util/MergeLaunchesSerializerTest.java b/src/test/java/com/epam/ta/reportportal/core/launch/util/MergeLaunchesSerializerTest.java
index 05774d118a..938ef02ccb 100644
--- a/src/test/java/com/epam/ta/reportportal/core/launch/util/MergeLaunchesSerializerTest.java
+++ b/src/test/java/com/epam/ta/reportportal/core/launch/util/MergeLaunchesSerializerTest.java
@@ -18,9 +18,9 @@
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
-import com.epam.ta.reportportal.model.launch.MergeLaunchesRQ;
-import com.epam.ta.reportportal.ws.model.attribute.ItemAttributeResource;
-import com.epam.ta.reportportal.ws.model.launch.Mode;
+import com.epam.ta.reportportal.ws.reporting.ItemAttributeResource;
+import com.epam.ta.reportportal.ws.reporting.MergeLaunchesRQ;
+import com.epam.ta.reportportal.ws.reporting.Mode;
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import java.io.IOException;
diff --git a/src/test/java/com/epam/ta/reportportal/core/log/impl/CreateLogHandlerAsyncImplTest.java b/src/test/java/com/epam/ta/reportportal/core/log/impl/CreateLogHandlerAsyncImplTest.java
index bcf4eb3512..86f9332ac9 100644
--- a/src/test/java/com/epam/ta/reportportal/core/log/impl/CreateLogHandlerAsyncImplTest.java
+++ b/src/test/java/com/epam/ta/reportportal/core/log/impl/CreateLogHandlerAsyncImplTest.java
@@ -26,7 +26,7 @@
 import com.epam.ta.reportportal.entity.project.ProjectRole;
 import com.epam.ta.reportportal.entity.user.UserRole;
 import com.epam.ta.reportportal.util.ReportingQueueService;
-import com.epam.ta.reportportal.ws.model.log.SaveLogRQ;
+import com.epam.ta.reportportal.ws.reporting.SaveLogRQ;
 import javax.inject.Provider;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
diff --git a/src/test/java/com/epam/ta/reportportal/core/project/impl/DeleteProjectHandlerImplTest.java b/src/test/java/com/epam/ta/reportportal/core/project/impl/DeleteProjectHandlerImplTest.java
index 54ed8ef79c..25e60c6ae0 100644
--- a/src/test/java/com/epam/ta/reportportal/core/project/impl/DeleteProjectHandlerImplTest.java
+++ b/src/test/java/com/epam/ta/reportportal/core/project/impl/DeleteProjectHandlerImplTest.java
@@ -44,7 +44,7 @@
 import com.epam.ta.reportportal.entity.user.User;
 import com.epam.ta.reportportal.entity.user.UserRole;
 import com.epam.ta.reportportal.exception.ReportPortalException;
-import com.epam.ta.reportportal.ws.model.OperationCompletionRS;
+import com.epam.ta.reportportal.ws.reporting.OperationCompletionRS;
 import com.google.common.cache.Cache;
 import com.google.common.cache.CacheBuilder;
 import com.google.common.collect.Sets;
diff --git a/src/test/java/com/epam/ta/reportportal/core/project/settings/notification/CreateProjectNotificationHandlerImplTest.java b/src/test/java/com/epam/ta/reportportal/core/project/settings/notification/CreateProjectNotificationHandlerImplTest.java
index 83f33c3d33..1c28130c0b 100644
--- a/src/test/java/com/epam/ta/reportportal/core/project/settings/notification/CreateProjectNotificationHandlerImplTest.java
+++ b/src/test/java/com/epam/ta/reportportal/core/project/settings/notification/CreateProjectNotificationHandlerImplTest.java
@@ -17,8 +17,8 @@
 package com.epam.ta.reportportal.core.project.settings.notification;
 
 import static com.epam.ta.reportportal.commons.validation.Suppliers.formattedSupplier;
-import static com.epam.ta.reportportal.ws.model.ErrorType.BAD_REQUEST_ERROR;
-import static com.epam.ta.reportportal.ws.model.ErrorType.RESOURCE_ALREADY_EXISTS;
+import static com.epam.ta.reportportal.ws.reporting.ErrorType.BAD_REQUEST_ERROR;
+import static com.epam.ta.reportportal.ws.reporting.ErrorType.RESOURCE_ALREADY_EXISTS;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertThrows;
 import static org.junit.jupiter.api.Assertions.assertTrue;
@@ -37,7 +37,7 @@
 import com.epam.ta.reportportal.exception.ReportPortalException;
 import com.epam.ta.reportportal.model.project.email.SenderCaseDTO;
 import com.epam.ta.reportportal.ws.converter.converters.ProjectConverter;
-import com.epam.ta.reportportal.ws.model.attribute.ItemAttributeResource;
+import com.epam.ta.reportportal.ws.reporting.ItemAttributeResource;
 import com.google.common.collect.Sets;
 import java.util.Collections;
 import java.util.Optional;
diff --git a/src/test/java/com/epam/ta/reportportal/core/project/settings/notification/UpdateProjectNotificationHandlerImplTest.java b/src/test/java/com/epam/ta/reportportal/core/project/settings/notification/UpdateProjectNotificationHandlerImplTest.java
index 977d65c053..61418dd2b1 100644
--- a/src/test/java/com/epam/ta/reportportal/core/project/settings/notification/UpdateProjectNotificationHandlerImplTest.java
+++ b/src/test/java/com/epam/ta/reportportal/core/project/settings/notification/UpdateProjectNotificationHandlerImplTest.java
@@ -36,7 +36,7 @@
 import com.epam.ta.reportportal.exception.ReportPortalException;
 import com.epam.ta.reportportal.model.project.email.SenderCaseDTO;
 import com.epam.ta.reportportal.ws.converter.converters.ProjectConverter;
-import com.epam.ta.reportportal.ws.model.attribute.ItemAttributeResource;
+import com.epam.ta.reportportal.ws.reporting.ItemAttributeResource;
 import com.google.common.collect.Sets;
 import java.util.Collections;
 import java.util.List;
diff --git a/src/test/java/com/epam/ta/reportportal/core/user/impl/CreateUserHandlerImplTest.java b/src/test/java/com/epam/ta/reportportal/core/user/impl/CreateUserHandlerImplTest.java
index 848fa55dca..2a688d7952 100644
--- a/src/test/java/com/epam/ta/reportportal/core/user/impl/CreateUserHandlerImplTest.java
+++ b/src/test/java/com/epam/ta/reportportal/core/user/impl/CreateUserHandlerImplTest.java
@@ -47,7 +47,7 @@
 import com.epam.ta.reportportal.model.user.CreateUserRQ;
 import com.epam.ta.reportportal.model.user.CreateUserRQConfirm;
 import com.epam.ta.reportportal.model.user.CreateUserRQFull;
-import com.epam.ta.reportportal.ws.model.ErrorType;
+import com.epam.ta.reportportal.ws.reporting.ErrorType;
 import java.util.Optional;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
diff --git a/src/test/java/com/epam/ta/reportportal/util/ItemInfoUtilsTest.java b/src/test/java/com/epam/ta/reportportal/util/ItemInfoUtilsTest.java
index 7efc44eb87..492caa9453 100644
--- a/src/test/java/com/epam/ta/reportportal/util/ItemInfoUtilsTest.java
+++ b/src/test/java/com/epam/ta/reportportal/util/ItemInfoUtilsTest.java
@@ -20,7 +20,7 @@
 import static org.junit.jupiter.api.Assertions.assertTrue;
 
 import com.epam.ta.reportportal.entity.ItemAttribute;
-import com.epam.ta.reportportal.ws.model.attribute.ItemAttributeResource;
+import com.epam.ta.reportportal.ws.reporting.ItemAttributeResource;
 import com.google.common.collect.Lists;
 import java.util.Collections;
 import java.util.List;
diff --git a/src/test/java/com/epam/ta/reportportal/util/TestProjectExtractor.java b/src/test/java/com/epam/ta/reportportal/util/TestProjectExtractor.java
index 25e803fdd6..e6dee11f75 100644
--- a/src/test/java/com/epam/ta/reportportal/util/TestProjectExtractor.java
+++ b/src/test/java/com/epam/ta/reportportal/util/TestProjectExtractor.java
@@ -4,7 +4,7 @@
 
 import com.epam.ta.reportportal.commons.ReportPortalUser;
 import com.epam.ta.reportportal.exception.ReportPortalException;
-import com.epam.ta.reportportal.ws.model.ErrorType;
+import com.epam.ta.reportportal.ws.reporting.ErrorType;
 import java.util.Optional;
 
 public class TestProjectExtractor {
diff --git a/src/test/java/com/epam/ta/reportportal/util/email/EmailRulesValidatorTest.java b/src/test/java/com/epam/ta/reportportal/util/email/EmailRulesValidatorTest.java
index 1624df0b57..ed46b6aea5 100644
--- a/src/test/java/com/epam/ta/reportportal/util/email/EmailRulesValidatorTest.java
+++ b/src/test/java/com/epam/ta/reportportal/util/email/EmailRulesValidatorTest.java
@@ -23,7 +23,7 @@
 import com.epam.ta.reportportal.entity.user.ProjectUser;
 import com.epam.ta.reportportal.entity.user.User;
 import com.epam.ta.reportportal.exception.ReportPortalException;
-import com.epam.ta.reportportal.ws.model.attribute.ItemAttributeResource;
+import com.epam.ta.reportportal.ws.reporting.ItemAttributeResource;
 import com.google.common.collect.Sets;
 import org.apache.commons.lang3.RandomStringUtils;
 import org.junit.jupiter.api.Test;
diff --git a/src/test/java/com/epam/ta/reportportal/ws/controller/BugTrackingSystemControllerTest.java b/src/test/java/com/epam/ta/reportportal/ws/controller/BugTrackingSystemControllerTest.java
index 87cef5b40a..33e56e71ea 100644
--- a/src/test/java/com/epam/ta/reportportal/ws/controller/BugTrackingSystemControllerTest.java
+++ b/src/test/java/com/epam/ta/reportportal/ws/controller/BugTrackingSystemControllerTest.java
@@ -17,7 +17,7 @@
 package com.epam.ta.reportportal.ws.controller;
 
 import static com.epam.ta.reportportal.ws.controller.constants.ValidationTestsConstants.INCORRECT_REQUEST_MESSAGE;
-import static com.epam.ta.reportportal.ws.model.ErrorType.INCORRECT_REQUEST;
+import static com.epam.ta.reportportal.ws.reporting.ErrorType.INCORRECT_REQUEST;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.when;
@@ -29,7 +29,7 @@
 import com.epam.reportportal.extension.bugtracking.BtsExtension;
 import com.epam.ta.reportportal.entity.integration.Integration;
 import com.epam.ta.reportportal.ws.BaseMvcTest;
-import com.epam.ta.reportportal.ws.model.ErrorRS;
+import com.epam.ta.reportportal.ws.reporting.ErrorRS;
 import com.epam.ta.reportportal.ws.model.externalsystem.AllowedValue;
 import com.epam.ta.reportportal.model.externalsystem.BtsConnectionTestRQ;
 import com.epam.ta.reportportal.ws.model.externalsystem.PostFormField;
diff --git a/src/test/java/com/epam/ta/reportportal/ws/controller/DashboardControllerValidationTest.java b/src/test/java/com/epam/ta/reportportal/ws/controller/DashboardControllerValidationTest.java
index 632ec67aac..c4fcab35db 100644
--- a/src/test/java/com/epam/ta/reportportal/ws/controller/DashboardControllerValidationTest.java
+++ b/src/test/java/com/epam/ta/reportportal/ws/controller/DashboardControllerValidationTest.java
@@ -24,7 +24,7 @@
 import static com.epam.ta.reportportal.ws.controller.constants.ValidationTestsConstants.LONG_NAME_VALUE;
 import static com.epam.ta.reportportal.ws.controller.constants.ValidationTestsConstants.SHORT_NAME_VALUE;
 import static com.epam.ta.reportportal.ws.controller.constants.ValidationTestsConstants.WHITESPACES_NAME_VALUE;
-import static com.epam.ta.reportportal.ws.model.ErrorType.INCORRECT_REQUEST;
+import static com.epam.ta.reportportal.ws.reporting.ErrorType.INCORRECT_REQUEST;
 import static org.apache.commons.lang3.StringUtils.EMPTY;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.springframework.http.MediaType.APPLICATION_JSON;
@@ -33,7 +33,7 @@
 import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
 
 import com.epam.ta.reportportal.ws.BaseMvcTest;
-import com.epam.ta.reportportal.ws.model.ErrorRS;
+import com.epam.ta.reportportal.ws.reporting.ErrorRS;
 import com.epam.ta.reportportal.model.dashboard.CreateDashboardRQ;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import org.junit.jupiter.api.Test;
diff --git a/src/test/java/com/epam/ta/reportportal/ws/controller/LaunchAsyncControllerTest.java b/src/test/java/com/epam/ta/reportportal/ws/controller/LaunchAsyncControllerTest.java
index 1f80859eec..fb5b7741e8 100644
--- a/src/test/java/com/epam/ta/reportportal/ws/controller/LaunchAsyncControllerTest.java
+++ b/src/test/java/com/epam/ta/reportportal/ws/controller/LaunchAsyncControllerTest.java
@@ -29,10 +29,10 @@
 import com.epam.ta.reportportal.core.launch.StartLaunchHandler;
 import com.epam.ta.reportportal.entity.project.ProjectRole;
 import com.epam.ta.reportportal.entity.user.UserRole;
-import com.epam.ta.reportportal.model.launch.MergeLaunchesRQ;
 import com.epam.ta.reportportal.util.ProjectExtractor;
-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.MergeLaunchesRQ;
+import com.epam.ta.reportportal.ws.reporting.StartLaunchRQ;
 import com.google.common.collect.Lists;
 import java.util.UUID;
 import javax.servlet.http.HttpServletRequest;
diff --git a/src/test/java/com/epam/ta/reportportal/ws/controller/LaunchControllerTest.java b/src/test/java/com/epam/ta/reportportal/ws/controller/LaunchControllerTest.java
index 70a6d6ac8b..07078629b4 100644
--- a/src/test/java/com/epam/ta/reportportal/ws/controller/LaunchControllerTest.java
+++ b/src/test/java/com/epam/ta/reportportal/ws/controller/LaunchControllerTest.java
@@ -17,8 +17,8 @@
 package com.epam.ta.reportportal.ws.controller;
 
 import static com.epam.ta.reportportal.commons.querygen.constant.GeneralCriteriaConstant.CRITERIA_PROJECT_ID;
-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 java.util.stream.Collectors.toMap;
 import static org.hamcrest.Matchers.hasSize;
 import static org.junit.jupiter.api.Assertions.assertEquals;
@@ -42,15 +42,15 @@
 import com.epam.ta.reportportal.model.BulkRQ;
 import com.epam.ta.reportportal.model.DeleteBulkRQ;
 import com.epam.ta.reportportal.model.launch.AnalyzeLaunchRQ;
-import com.epam.ta.reportportal.model.launch.MergeLaunchesRQ;
 import com.epam.ta.reportportal.model.launch.UpdateLaunchRQ;
 import com.epam.ta.reportportal.ws.BaseMvcTest;
-import com.epam.ta.reportportal.ws.model.BulkInfoUpdateRQ;
-import com.epam.ta.reportportal.ws.model.FinishExecutionRQ;
-import com.epam.ta.reportportal.ws.model.attribute.ItemAttributeResource;
-import com.epam.ta.reportportal.ws.model.attribute.ItemAttributesRQ;
-import com.epam.ta.reportportal.ws.model.attribute.UpdateItemAttributeRQ;
-import com.epam.ta.reportportal.ws.model.launch.StartLaunchRQ;
+import com.epam.ta.reportportal.ws.reporting.BulkInfoUpdateRQ;
+import com.epam.ta.reportportal.ws.reporting.FinishExecutionRQ;
+import com.epam.ta.reportportal.ws.reporting.ItemAttributeResource;
+import com.epam.ta.reportportal.ws.reporting.ItemAttributesRQ;
+import com.epam.ta.reportportal.ws.reporting.MergeLaunchesRQ;
+import com.epam.ta.reportportal.ws.reporting.StartLaunchRQ;
+import com.epam.ta.reportportal.ws.reporting.UpdateItemAttributeRQ;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.google.common.collect.Lists;
 import com.google.common.collect.Sets;
diff --git a/src/test/java/com/epam/ta/reportportal/ws/controller/LaunchControllerValidationTest.java b/src/test/java/com/epam/ta/reportportal/ws/controller/LaunchControllerValidationTest.java
index f42b152a21..cd9a900a40 100644
--- a/src/test/java/com/epam/ta/reportportal/ws/controller/LaunchControllerValidationTest.java
+++ b/src/test/java/com/epam/ta/reportportal/ws/controller/LaunchControllerValidationTest.java
@@ -21,8 +21,8 @@
 import static com.epam.ta.reportportal.ws.controller.constants.ValidationTestsConstants.FIELD_NAME_SIZE_MESSAGE_WITH_FORMAT;
 import static com.epam.ta.reportportal.ws.controller.constants.ValidationTestsConstants.INCORRECT_REQUEST_MESSAGE;
 import static com.epam.ta.reportportal.ws.controller.constants.ValidationTestsConstants.WHITESPACES_NAME_VALUE;
-import static com.epam.ta.reportportal.ws.model.ErrorType.INCORRECT_REQUEST;
-import static com.epam.ta.reportportal.ws.model.launch.Mode.DEFAULT;
+import static com.epam.ta.reportportal.ws.reporting.Mode.DEFAULT;
+import static com.epam.ta.reportportal.ws.reporting.ErrorType.INCORRECT_REQUEST;
 import static org.apache.commons.lang3.StringUtils.EMPTY;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.springframework.http.MediaType.APPLICATION_JSON;
@@ -30,10 +30,10 @@
 import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
 
 import com.epam.ta.reportportal.ws.BaseMvcTest;
-import com.epam.ta.reportportal.ws.model.ErrorRS;
-import com.epam.ta.reportportal.ws.model.attribute.ItemAttributesRQ;
-import com.epam.ta.reportportal.model.launch.MergeLaunchesRQ;
-import com.epam.ta.reportportal.ws.model.launch.StartLaunchRQ;
+import com.epam.ta.reportportal.ws.reporting.ErrorRS;
+import com.epam.ta.reportportal.ws.reporting.ItemAttributesRQ;
+import com.epam.ta.reportportal.ws.reporting.MergeLaunchesRQ;
+import com.epam.ta.reportportal.ws.reporting.StartLaunchRQ;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.google.common.collect.Sets;
 import java.util.Date;
diff --git a/src/test/java/com/epam/ta/reportportal/ws/controller/LogAsyncControllerTest.java b/src/test/java/com/epam/ta/reportportal/ws/controller/LogAsyncControllerTest.java
index 4edba9ed06..891aef27c3 100644
--- a/src/test/java/com/epam/ta/reportportal/ws/controller/LogAsyncControllerTest.java
+++ b/src/test/java/com/epam/ta/reportportal/ws/controller/LogAsyncControllerTest.java
@@ -29,7 +29,7 @@
 import com.epam.ta.reportportal.entity.project.ProjectRole;
 import com.epam.ta.reportportal.entity.user.UserRole;
 import com.epam.ta.reportportal.util.ProjectExtractor;
-import com.epam.ta.reportportal.ws.model.log.SaveLogRQ;
+import com.epam.ta.reportportal.ws.reporting.SaveLogRQ;
 import javax.servlet.http.HttpServletRequest;
 import javax.validation.Validator;
 import org.junit.jupiter.api.Test;
diff --git a/src/test/java/com/epam/ta/reportportal/ws/controller/LogControllerTest.java b/src/test/java/com/epam/ta/reportportal/ws/controller/LogControllerTest.java
index 91591ef142..0a3cd57760 100644
--- a/src/test/java/com/epam/ta/reportportal/ws/controller/LogControllerTest.java
+++ b/src/test/java/com/epam/ta/reportportal/ws/controller/LogControllerTest.java
@@ -24,9 +24,9 @@
 import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
 
 import com.epam.ta.reportportal.exception.ReportPortalException;
-import com.epam.ta.reportportal.ws.BaseMvcTest;
-import com.epam.ta.reportportal.ws.model.log.SaveLogRQ;
 import com.epam.ta.reportportal.model.log.SearchLogRq;
+import com.epam.ta.reportportal.ws.BaseMvcTest;
+import com.epam.ta.reportportal.ws.reporting.SaveLogRQ;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import java.time.LocalDateTime;
 import java.time.ZoneId;
diff --git a/src/test/java/com/epam/ta/reportportal/ws/controller/ProjectControllerTest.java b/src/test/java/com/epam/ta/reportportal/ws/controller/ProjectControllerTest.java
index 4ddfa28f0d..1a6e27ad6a 100644
--- a/src/test/java/com/epam/ta/reportportal/ws/controller/ProjectControllerTest.java
+++ b/src/test/java/com/epam/ta/reportportal/ws/controller/ProjectControllerTest.java
@@ -23,7 +23,7 @@
 import com.epam.ta.reportportal.entity.project.ProjectAttribute;
 import com.epam.ta.reportportal.ws.BaseMvcTest;
 import com.epam.ta.reportportal.model.DeleteBulkRQ;
-import com.epam.ta.reportportal.ws.model.attribute.ItemAttributeResource;
+import com.epam.ta.reportportal.ws.reporting.ItemAttributeResource;
 import com.epam.ta.reportportal.model.project.AssignUsersRQ;
 import com.epam.ta.reportportal.model.project.CreateProjectRQ;
 import com.epam.ta.reportportal.model.project.UnassignUsersRQ;
diff --git a/src/test/java/com/epam/ta/reportportal/ws/controller/TestItemAsyncControllerTest.java b/src/test/java/com/epam/ta/reportportal/ws/controller/TestItemAsyncControllerTest.java
index d0618eabc4..4179ac78eb 100644
--- a/src/test/java/com/epam/ta/reportportal/ws/controller/TestItemAsyncControllerTest.java
+++ b/src/test/java/com/epam/ta/reportportal/ws/controller/TestItemAsyncControllerTest.java
@@ -29,8 +29,8 @@
 import com.epam.ta.reportportal.entity.project.ProjectRole;
 import com.epam.ta.reportportal.entity.user.UserRole;
 import com.epam.ta.reportportal.util.ProjectExtractor;
-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 java.util.UUID;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
diff --git a/src/test/java/com/epam/ta/reportportal/ws/controller/TestItemControllerTest.java b/src/test/java/com/epam/ta/reportportal/ws/controller/TestItemControllerTest.java
index 7f5a47f6a6..d487ac47e0 100644
--- a/src/test/java/com/epam/ta/reportportal/ws/controller/TestItemControllerTest.java
+++ b/src/test/java/com/epam/ta/reportportal/ws/controller/TestItemControllerTest.java
@@ -38,19 +38,19 @@
 import com.epam.ta.reportportal.entity.item.TestItem;
 import com.epam.ta.reportportal.entity.launch.Launch;
 import com.epam.ta.reportportal.exception.ReportPortalException;
-import com.epam.ta.reportportal.ws.BaseMvcTest;
-import com.epam.ta.reportportal.ws.model.BulkInfoUpdateRQ;
-import com.epam.ta.reportportal.ws.model.FinishTestItemRQ;
-import com.epam.ta.reportportal.ws.model.ParameterResource;
-import com.epam.ta.reportportal.ws.model.StartTestItemRQ;
-import com.epam.ta.reportportal.ws.model.attribute.ItemAttributeResource;
-import com.epam.ta.reportportal.ws.model.attribute.UpdateItemAttributeRQ;
 import com.epam.ta.reportportal.model.issue.DefineIssueRQ;
-import com.epam.ta.reportportal.ws.model.issue.Issue;
 import com.epam.ta.reportportal.model.issue.IssueDefinition;
 import com.epam.ta.reportportal.model.item.LinkExternalIssueRQ;
 import com.epam.ta.reportportal.model.item.UnlinkExternalIssueRQ;
 import com.epam.ta.reportportal.model.item.UpdateTestItemRQ;
+import com.epam.ta.reportportal.ws.BaseMvcTest;
+import com.epam.ta.reportportal.ws.reporting.BulkInfoUpdateRQ;
+import com.epam.ta.reportportal.ws.reporting.FinishTestItemRQ;
+import com.epam.ta.reportportal.ws.reporting.Issue;
+import com.epam.ta.reportportal.ws.reporting.ItemAttributeResource;
+import com.epam.ta.reportportal.ws.reporting.ParameterResource;
+import com.epam.ta.reportportal.ws.reporting.StartTestItemRQ;
+import com.epam.ta.reportportal.ws.reporting.UpdateItemAttributeRQ;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.Lists;
diff --git a/src/test/java/com/epam/ta/reportportal/ws/controller/TestItemControllerValidationTest.java b/src/test/java/com/epam/ta/reportportal/ws/controller/TestItemControllerValidationTest.java
index 633e1fbf69..125e402d68 100644
--- a/src/test/java/com/epam/ta/reportportal/ws/controller/TestItemControllerValidationTest.java
+++ b/src/test/java/com/epam/ta/reportportal/ws/controller/TestItemControllerValidationTest.java
@@ -20,7 +20,7 @@
 import static com.epam.ta.reportportal.ws.controller.constants.ValidationTestsConstants.FIELD_NAME_IS_NULL_MESSAGE;
 import static com.epam.ta.reportportal.ws.controller.constants.ValidationTestsConstants.INCORRECT_REQUEST_MESSAGE;
 import static com.epam.ta.reportportal.ws.controller.constants.ValidationTestsConstants.WHITESPACES_NAME_VALUE;
-import static com.epam.ta.reportportal.ws.model.ErrorType.INCORRECT_REQUEST;
+import static com.epam.ta.reportportal.ws.reporting.ErrorType.INCORRECT_REQUEST;
 import static org.apache.commons.lang3.StringUtils.EMPTY;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.springframework.http.MediaType.APPLICATION_JSON;
@@ -29,10 +29,10 @@
 import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
 
 import com.epam.ta.reportportal.ws.BaseMvcTest;
-import com.epam.ta.reportportal.ws.model.ErrorRS;
-import com.epam.ta.reportportal.ws.model.StartTestItemRQ;
+import com.epam.ta.reportportal.ws.reporting.ErrorRS;
+import com.epam.ta.reportportal.ws.reporting.StartTestItemRQ;
 import com.epam.ta.reportportal.model.issue.DefineIssueRQ;
-import com.epam.ta.reportportal.ws.model.issue.Issue;
+import com.epam.ta.reportportal.ws.reporting.Issue;
 import com.epam.ta.reportportal.model.issue.IssueDefinition;
 import com.epam.ta.reportportal.model.item.LinkExternalIssueRQ;
 import com.epam.ta.reportportal.model.item.UnlinkExternalIssueRQ;
diff --git a/src/test/java/com/epam/ta/reportportal/ws/controller/UserFilterControllerValidationTest.java b/src/test/java/com/epam/ta/reportportal/ws/controller/UserFilterControllerValidationTest.java
index 478bb2b1dd..73847d968b 100644
--- a/src/test/java/com/epam/ta/reportportal/ws/controller/UserFilterControllerValidationTest.java
+++ b/src/test/java/com/epam/ta/reportportal/ws/controller/UserFilterControllerValidationTest.java
@@ -24,7 +24,7 @@
 import static com.epam.ta.reportportal.ws.controller.constants.ValidationTestsConstants.LONG_NAME_VALUE;
 import static com.epam.ta.reportportal.ws.controller.constants.ValidationTestsConstants.SHORT_NAME_VALUE;
 import static com.epam.ta.reportportal.ws.controller.constants.ValidationTestsConstants.WHITESPACES_NAME_VALUE;
-import static com.epam.ta.reportportal.ws.model.ErrorType.INCORRECT_REQUEST;
+import static com.epam.ta.reportportal.ws.reporting.ErrorType.INCORRECT_REQUEST;
 import static org.apache.commons.lang3.StringUtils.EMPTY;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.springframework.http.MediaType.APPLICATION_JSON;
@@ -36,7 +36,7 @@
 import com.epam.ta.reportportal.model.filter.UpdateUserFilterRQ;
 import com.epam.ta.reportportal.model.filter.UserFilterCondition;
 import com.epam.ta.reportportal.ws.BaseMvcTest;
-import com.epam.ta.reportportal.ws.model.ErrorRS;
+import com.epam.ta.reportportal.ws.reporting.ErrorRS;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.google.common.collect.Lists;
 import com.google.common.collect.Sets;
diff --git a/src/test/java/com/epam/ta/reportportal/ws/controller/WidgetControllerValidationTest.java b/src/test/java/com/epam/ta/reportportal/ws/controller/WidgetControllerValidationTest.java
index da25cc421b..565b59bbac 100644
--- a/src/test/java/com/epam/ta/reportportal/ws/controller/WidgetControllerValidationTest.java
+++ b/src/test/java/com/epam/ta/reportportal/ws/controller/WidgetControllerValidationTest.java
@@ -24,7 +24,7 @@
 import static com.epam.ta.reportportal.ws.controller.constants.ValidationTestsConstants.LONG_NAME_VALUE;
 import static com.epam.ta.reportportal.ws.controller.constants.ValidationTestsConstants.SHORT_NAME_VALUE;
 import static com.epam.ta.reportportal.ws.controller.constants.ValidationTestsConstants.WHITESPACES_NAME_VALUE;
-import static com.epam.ta.reportportal.ws.model.ErrorType.INCORRECT_REQUEST;
+import static com.epam.ta.reportportal.ws.reporting.ErrorType.INCORRECT_REQUEST;
 import static org.apache.commons.lang3.StringUtils.EMPTY;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.springframework.http.MediaType.APPLICATION_JSON;
@@ -35,7 +35,7 @@
 import com.epam.ta.reportportal.model.widget.ContentParameters;
 import com.epam.ta.reportportal.model.widget.WidgetRQ;
 import com.epam.ta.reportportal.ws.BaseMvcTest;
-import com.epam.ta.reportportal.ws.model.ErrorRS;
+import com.epam.ta.reportportal.ws.reporting.ErrorRS;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import java.util.Arrays;
 import org.junit.jupiter.api.Test;
diff --git a/src/test/java/com/epam/ta/reportportal/ws/converter/builders/LaunchBuilderTest.java b/src/test/java/com/epam/ta/reportportal/ws/converter/builders/LaunchBuilderTest.java
index 2c2374bab9..720794498e 100644
--- a/src/test/java/com/epam/ta/reportportal/ws/converter/builders/LaunchBuilderTest.java
+++ b/src/test/java/com/epam/ta/reportportal/ws/converter/builders/LaunchBuilderTest.java
@@ -24,10 +24,10 @@
 import com.epam.ta.reportportal.entity.ItemAttribute;
 import com.epam.ta.reportportal.entity.enums.LaunchModeEnum;
 import com.epam.ta.reportportal.entity.launch.Launch;
-import com.epam.ta.reportportal.ws.model.attribute.ItemAttributeResource;
-import com.epam.ta.reportportal.ws.model.attribute.ItemAttributesRQ;
-import com.epam.ta.reportportal.ws.model.launch.Mode;
-import com.epam.ta.reportportal.ws.model.launch.StartLaunchRQ;
+import com.epam.ta.reportportal.ws.reporting.ItemAttributeResource;
+import com.epam.ta.reportportal.ws.reporting.ItemAttributesRQ;
+import com.epam.ta.reportportal.ws.reporting.Mode;
+import com.epam.ta.reportportal.ws.reporting.StartLaunchRQ;
 import com.google.common.collect.Sets;
 import java.time.LocalDateTime;
 import java.time.temporal.ChronoUnit;
@@ -101,7 +101,7 @@ void overwriteAttributes() {
         Sets.newHashSet(new ItemAttribute("key", "value", false), systemAttribute));
 
     final Launch buildLaunch = new LaunchBuilder(launch).overwriteAttributes(
-        Sets.newHashSet(new ItemAttributeResource("newKey",
+        Sets.newHashSet(new com.epam.ta.reportportal.ws.reporting.ItemAttributeResource("newKey",
             "newVal"
         ))).get();
 
diff --git a/src/test/java/com/epam/ta/reportportal/ws/converter/builders/LogFullBuilderTest.java b/src/test/java/com/epam/ta/reportportal/ws/converter/builders/LogFullBuilderTest.java
index 1451a9bd37..c414480142 100644
--- a/src/test/java/com/epam/ta/reportportal/ws/converter/builders/LogFullBuilderTest.java
+++ b/src/test/java/com/epam/ta/reportportal/ws/converter/builders/LogFullBuilderTest.java
@@ -22,7 +22,7 @@
 
 import com.epam.ta.reportportal.entity.item.TestItem;
 import com.epam.ta.reportportal.entity.log.LogFull;
-import com.epam.ta.reportportal.ws.model.log.SaveLogRQ;
+import com.epam.ta.reportportal.ws.reporting.SaveLogRQ;
 import java.time.LocalDateTime;
 import java.time.temporal.ChronoUnit;
 import org.junit.jupiter.api.Test;
diff --git a/src/test/java/com/epam/ta/reportportal/ws/converter/builders/TestItemBuilderTest.java b/src/test/java/com/epam/ta/reportportal/ws/converter/builders/TestItemBuilderTest.java
index bcd8e4de3c..62be4a10b6 100644
--- a/src/test/java/com/epam/ta/reportportal/ws/converter/builders/TestItemBuilderTest.java
+++ b/src/test/java/com/epam/ta/reportportal/ws/converter/builders/TestItemBuilderTest.java
@@ -29,10 +29,10 @@
 import com.epam.ta.reportportal.entity.item.TestItem;
 import com.epam.ta.reportportal.entity.item.TestItemResults;
 import com.epam.ta.reportportal.entity.launch.Launch;
-import com.epam.ta.reportportal.ws.model.ParameterResource;
-import com.epam.ta.reportportal.ws.model.StartTestItemRQ;
-import com.epam.ta.reportportal.ws.model.attribute.ItemAttributeResource;
-import com.epam.ta.reportportal.ws.model.attribute.ItemAttributesRQ;
+import com.epam.ta.reportportal.ws.reporting.ParameterResource;
+import com.epam.ta.reportportal.ws.reporting.StartTestItemRQ;
+import com.epam.ta.reportportal.ws.reporting.ItemAttributeResource;
+import com.epam.ta.reportportal.ws.reporting.ItemAttributesRQ;
 import com.google.common.collect.Lists;
 import com.google.common.collect.Sets;
 import java.time.LocalDateTime;
diff --git a/src/test/java/com/epam/ta/reportportal/ws/converter/converters/IssueConverterTest.java b/src/test/java/com/epam/ta/reportportal/ws/converter/converters/IssueConverterTest.java
index eb5e34dab8..1f3735ea22 100644
--- a/src/test/java/com/epam/ta/reportportal/ws/converter/converters/IssueConverterTest.java
+++ b/src/test/java/com/epam/ta/reportportal/ws/converter/converters/IssueConverterTest.java
@@ -22,7 +22,7 @@
 import com.epam.ta.reportportal.entity.item.issue.IssueEntity;
 import com.epam.ta.reportportal.entity.item.issue.IssueGroup;
 import com.epam.ta.reportportal.entity.item.issue.IssueType;
-import com.epam.ta.reportportal.ws.model.issue.Issue;
+import com.epam.ta.reportportal.ws.reporting.Issue;
 import org.junit.jupiter.api.Test;
 
 /**
diff --git a/src/test/java/com/epam/ta/reportportal/ws/converter/converters/ItemAttributeConverterTest.java b/src/test/java/com/epam/ta/reportportal/ws/converter/converters/ItemAttributeConverterTest.java
index acf039c71f..acb258c0ab 100644
--- a/src/test/java/com/epam/ta/reportportal/ws/converter/converters/ItemAttributeConverterTest.java
+++ b/src/test/java/com/epam/ta/reportportal/ws/converter/converters/ItemAttributeConverterTest.java
@@ -19,7 +19,7 @@
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
 import com.epam.ta.reportportal.entity.ItemAttribute;
-import com.epam.ta.reportportal.ws.model.attribute.ItemAttributeResource;
+import com.epam.ta.reportportal.ws.reporting.ItemAttributeResource;
 import org.junit.jupiter.api.Test;
 
 /**
diff --git a/src/test/java/com/epam/ta/reportportal/ws/converter/converters/NotificationConfigConverterTest.java b/src/test/java/com/epam/ta/reportportal/ws/converter/converters/NotificationConfigConverterTest.java
index 9557281dea..5d889ccf8f 100644
--- a/src/test/java/com/epam/ta/reportportal/ws/converter/converters/NotificationConfigConverterTest.java
+++ b/src/test/java/com/epam/ta/reportportal/ws/converter/converters/NotificationConfigConverterTest.java
@@ -25,7 +25,7 @@
 import com.epam.ta.reportportal.entity.project.email.LaunchAttributeRule;
 import com.epam.ta.reportportal.entity.project.email.SenderCase;
 import com.epam.ta.reportportal.model.project.email.SenderCaseDTO;
-import com.epam.ta.reportportal.ws.model.attribute.ItemAttributeResource;
+import com.epam.ta.reportportal.ws.reporting.ItemAttributeResource;
 import com.google.common.collect.Sets;
 import java.util.Arrays;
 import java.util.HashSet;
diff --git a/src/test/java/com/epam/ta/reportportal/ws/converter/converters/ParametersConverterTest.java b/src/test/java/com/epam/ta/reportportal/ws/converter/converters/ParametersConverterTest.java
index a71e99c26a..a038d0bfc8 100644
--- a/src/test/java/com/epam/ta/reportportal/ws/converter/converters/ParametersConverterTest.java
+++ b/src/test/java/com/epam/ta/reportportal/ws/converter/converters/ParametersConverterTest.java
@@ -19,7 +19,7 @@
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
 import com.epam.ta.reportportal.entity.item.Parameter;
-import com.epam.ta.reportportal.ws.model.ParameterResource;
+import com.epam.ta.reportportal.ws.reporting.ParameterResource;
 import org.junit.jupiter.api.Test;
 
 /**
diff --git a/src/test/java/com/epam/ta/reportportal/ws/converter/converters/TestItemConverterTest.java b/src/test/java/com/epam/ta/reportportal/ws/converter/converters/TestItemConverterTest.java
index a00ac34a87..7366429323 100644
--- a/src/test/java/com/epam/ta/reportportal/ws/converter/converters/TestItemConverterTest.java
+++ b/src/test/java/com/epam/ta/reportportal/ws/converter/converters/TestItemConverterTest.java
@@ -35,8 +35,8 @@
 import com.epam.ta.reportportal.entity.launch.Launch;
 import com.epam.ta.reportportal.entity.statistics.Statistics;
 import com.epam.ta.reportportal.entity.statistics.StatisticsField;
-import com.epam.ta.reportportal.model.TestItemResource;
 import com.epam.ta.reportportal.model.activity.TestItemActivityResource;
+import com.epam.ta.reportportal.ws.reporting.TestItemResource;
 import com.google.common.collect.Sets;
 import java.time.LocalDateTime;
 import java.time.ZoneId;
diff --git a/src/test/java/com/epam/ta/reportportal/ws/converter/converters/TicketConverterTest.java b/src/test/java/com/epam/ta/reportportal/ws/converter/converters/TicketConverterTest.java
index c286ef43e2..1e6ed1c49e 100644
--- a/src/test/java/com/epam/ta/reportportal/ws/converter/converters/TicketConverterTest.java
+++ b/src/test/java/com/epam/ta/reportportal/ws/converter/converters/TicketConverterTest.java
@@ -19,7 +19,7 @@
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
 import com.epam.ta.reportportal.entity.bts.Ticket;
-import com.epam.ta.reportportal.ws.model.issue.Issue;
+import com.epam.ta.reportportal.ws.reporting.Issue;
 import org.junit.jupiter.api.Test;
 
 /**
diff --git a/src/test/java/com/epam/ta/reportportal/ws/converter/resource/handler/attribute/launch/LaunchResourceAttributeUpdaterTest.java b/src/test/java/com/epam/ta/reportportal/ws/converter/resource/handler/attribute/launch/LaunchResourceAttributeUpdaterTest.java
index f58d7b5c7a..4b52d367cb 100644
--- a/src/test/java/com/epam/ta/reportportal/ws/converter/resource/handler/attribute/launch/LaunchResourceAttributeUpdaterTest.java
+++ b/src/test/java/com/epam/ta/reportportal/ws/converter/resource/handler/attribute/launch/LaunchResourceAttributeUpdaterTest.java
@@ -20,8 +20,8 @@
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
 import com.epam.ta.reportportal.entity.ItemAttribute;
-import com.epam.ta.reportportal.ws.model.attribute.ItemAttributeResource;
-import com.epam.ta.reportportal.ws.model.launch.LaunchResource;
+import com.epam.ta.reportportal.ws.reporting.ItemAttributeResource;
+import com.epam.ta.reportportal.ws.reporting.LaunchResource;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
diff --git a/src/test/java/com/epam/ta/reportportal/ws/converter/resource/handler/attribute/launch/LaunchResourceMetadataAttributeUpdaterTest.java b/src/test/java/com/epam/ta/reportportal/ws/converter/resource/handler/attribute/launch/LaunchResourceMetadataAttributeUpdaterTest.java
index f09dadb2fe..5c584d2859 100644
--- a/src/test/java/com/epam/ta/reportportal/ws/converter/resource/handler/attribute/launch/LaunchResourceMetadataAttributeUpdaterTest.java
+++ b/src/test/java/com/epam/ta/reportportal/ws/converter/resource/handler/attribute/launch/LaunchResourceMetadataAttributeUpdaterTest.java
@@ -19,7 +19,7 @@
 import static com.epam.ta.reportportal.core.launch.cluster.pipeline.SaveLastRunAttributePartProvider.RP_CLUSTER_LAST_RUN_KEY;
 
 import com.epam.ta.reportportal.entity.ItemAttribute;
-import com.epam.ta.reportportal.ws.model.launch.LaunchResource;
+import com.epam.ta.reportportal.ws.reporting.LaunchResource;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
diff --git a/src/test/java/com/epam/ta/reportportal/ws/rabbit/AsyncReportingListenerTest.java b/src/test/java/com/epam/ta/reportportal/ws/rabbit/AsyncReportingListenerTest.java
index e86e86e793..32d4d4796c 100644
--- a/src/test/java/com/epam/ta/reportportal/ws/rabbit/AsyncReportingListenerTest.java
+++ b/src/test/java/com/epam/ta/reportportal/ws/rabbit/AsyncReportingListenerTest.java
@@ -33,12 +33,12 @@
 import com.epam.ta.reportportal.entity.log.LogFull;
 import com.epam.ta.reportportal.util.ProjectExtractor;
 import com.epam.ta.reportportal.ws.converter.builders.LogFullBuilder;
-import com.epam.ta.reportportal.ws.model.FinishExecutionRQ;
-import com.epam.ta.reportportal.ws.model.FinishTestItemRQ;
-import com.epam.ta.reportportal.ws.model.StartTestItemRQ;
-import com.epam.ta.reportportal.ws.model.launch.StartLaunchRQ;
-import com.epam.ta.reportportal.ws.model.log.SaveLogRQ;
-import com.epam.ta.reportportal.ws.model.log.SaveLogRQ.File;
+import com.epam.ta.reportportal.ws.reporting.FinishExecutionRQ;
+import com.epam.ta.reportportal.ws.reporting.FinishTestItemRQ;
+import com.epam.ta.reportportal.ws.reporting.SaveLogRQ;
+import com.epam.ta.reportportal.ws.reporting.SaveLogRQ.File;
+import com.epam.ta.reportportal.ws.reporting.StartLaunchRQ;
+import com.epam.ta.reportportal.ws.reporting.StartTestItemRQ;
 import java.util.Optional;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
@@ -241,7 +241,8 @@ void whenMessageReceived_andItemIsNotPresent_thenCreateLaunchLog() {
     when(launch.getId()).thenReturn(ID);
     when(launchRepository.findByUuid(LAUNCH_ID)).thenReturn(Optional.of(launch));
 
-    LogFull logFull = new LogFullBuilder().addSaveLogRq(saveLogRQ).addLaunch(launch).addProjectId(ID).get();
+    LogFull logFull = new LogFullBuilder().addSaveLogRq(saveLogRQ).addLaunch(launch)
+        .addProjectId(ID).get();
     final Log log = LOG_FULL_TO_LOG.apply(logFull);
 
     asyncReportingListener.onMessage(message);
@@ -280,7 +281,8 @@ void whenMessageReceived_andItemIsPresent_thenCreateItemLog() {
     TestItem testItem = mock(TestItem.class);
     when(testItemRepository.findByUuid(ITEM_ID)).thenReturn(Optional.of(testItem));
 
-    LogFull logFull = new LogFullBuilder().addSaveLogRq(saveLogRQ).addTestItem(testItem).addProjectId(ID).get();
+    LogFull logFull = new LogFullBuilder().addSaveLogRq(saveLogRQ).addTestItem(testItem)
+        .addProjectId(ID).get();
     final Log log = LOG_FULL_TO_LOG.apply(logFull);
 
     Launch launch = mock(Launch.class);
diff --git a/src/test/java/com/epam/ta/reportportal/ws/validation/BusinessRuleTest.java b/src/test/java/com/epam/ta/reportportal/ws/validation/BusinessRuleTest.java
index 8671cc0bb8..7a4a958f25 100644
--- a/src/test/java/com/epam/ta/reportportal/ws/validation/BusinessRuleTest.java
+++ b/src/test/java/com/epam/ta/reportportal/ws/validation/BusinessRuleTest.java
@@ -24,7 +24,7 @@
 import com.epam.ta.reportportal.commons.validation.BusinessRuleViolationException;
 import com.epam.ta.reportportal.commons.validation.Suppliers;
 import com.epam.ta.reportportal.exception.ReportPortalException;
-import com.epam.ta.reportportal.ws.model.ErrorType;
+import com.epam.ta.reportportal.ws.reporting.ErrorType;
 import org.junit.jupiter.api.Test;
 
 /**
diff --git a/src/test/java/com/epam/ta/reportportal/ws/validation/JaskonRequiredPropertiesValidatorTest.java b/src/test/java/com/epam/ta/reportportal/ws/validation/JaskonRequiredPropertiesValidatorTest.java
index 8959e8c6fa..f6b49b05e3 100644
--- a/src/test/java/com/epam/ta/reportportal/ws/validation/JaskonRequiredPropertiesValidatorTest.java
+++ b/src/test/java/com/epam/ta/reportportal/ws/validation/JaskonRequiredPropertiesValidatorTest.java
@@ -22,9 +22,9 @@
 import static org.hamcrest.Matchers.nullValue;
 
 import com.epam.ta.reportportal.model.issue.IssueDefinition;
-import com.epam.ta.reportportal.ws.model.FinishTestItemRQ;
-import com.epam.ta.reportportal.ws.model.issue.Issue;
-import com.epam.ta.reportportal.ws.model.launch.StartLaunchRQ;
+import com.epam.ta.reportportal.ws.reporting.FinishTestItemRQ;
+import com.epam.ta.reportportal.ws.reporting.Issue;
+import com.epam.ta.reportportal.ws.reporting.StartLaunchRQ;
 import java.util.Calendar;
 import java.util.Collections;
 import java.util.UUID;
diff --git a/src/test/java/com/epam/ta/reportportal/ws/validation/TicketsValidationTest.java b/src/test/java/com/epam/ta/reportportal/ws/validation/TicketsValidationTest.java
index b3a0da045f..05e230a4d7 100644
--- a/src/test/java/com/epam/ta/reportportal/ws/validation/TicketsValidationTest.java
+++ b/src/test/java/com/epam/ta/reportportal/ws/validation/TicketsValidationTest.java
@@ -4,8 +4,8 @@
 import static org.junit.jupiter.api.Assertions.assertTrue;
 
 import com.epam.ta.reportportal.model.item.LinkExternalIssueRQ;
-import com.epam.ta.reportportal.ws.model.FinishTestItemRQ;
-import com.epam.ta.reportportal.ws.model.issue.Issue;
+import com.epam.ta.reportportal.ws.reporting.FinishTestItemRQ;
+import com.epam.ta.reportportal.ws.reporting.Issue;
 import com.google.common.collect.Lists;
 import java.util.ArrayList;
 import java.util.Date;

From f5b0d9c0bf72e23c2ced6004436ab976b0b0490c Mon Sep 17 00:00:00 2001
From: APiankouski <109206864+APiankouski@users.noreply.github.com>
Date: Thu, 29 Feb 2024 12:44:27 +0300
Subject: [PATCH 18/24] EPMRPP-89396 || EPMRPP-89397 || EPMRPP-89395 || Change
 batch endpoint (#1928)

---
 .../ta/reportportal/core/launch/DeleteLaunchHandler.java   | 7 ++++---
 .../core/launch/impl/DeleteLaunchHandlerImpl.java          | 5 +++--
 .../ws/controller/DeprecatedUserController.java            | 2 +-
 .../ta/reportportal/ws/controller/LaunchController.java    | 5 ++---
 .../ta/reportportal/ws/controller/ProjectController.java   | 6 ++----
 .../epam/ta/reportportal/ws/controller/UserController.java | 7 +++----
 6 files changed, 15 insertions(+), 17 deletions(-)

diff --git a/src/main/java/com/epam/ta/reportportal/core/launch/DeleteLaunchHandler.java b/src/main/java/com/epam/ta/reportportal/core/launch/DeleteLaunchHandler.java
index 1e4a7ee675..b725a47e5f 100644
--- a/src/main/java/com/epam/ta/reportportal/core/launch/DeleteLaunchHandler.java
+++ b/src/main/java/com/epam/ta/reportportal/core/launch/DeleteLaunchHandler.java
@@ -20,6 +20,7 @@
 import com.epam.ta.reportportal.model.DeleteBulkRQ;
 import com.epam.ta.reportportal.model.DeleteBulkRS;
 import com.epam.ta.reportportal.ws.reporting.OperationCompletionRS;
+import java.util.List;
 
 /**
  * Delete Launch request handler
@@ -42,13 +43,13 @@ OperationCompletionRS deleteLaunch(Long launchId, ReportPortalUser.ProjectDetail
       ReportPortalUser user);
 
   /**
-   * Bul launches delete.
+   * Bulk launches delete.
    *
-   * @param deleteBulkRQ   {@link DeleteBulkRQ}
+   * @param ids   list of launch ids
    * @param projectDetails Project Details
    * @param user           User
    * @return DeleteLaunchesRS
    */
-  DeleteBulkRS deleteLaunches(DeleteBulkRQ deleteBulkRQ,
+  DeleteBulkRS deleteLaunches(List<Long> ids,
       ReportPortalUser.ProjectDetails projectDetails, ReportPortalUser user);
 }
\ No newline at end of file
diff --git a/src/main/java/com/epam/ta/reportportal/core/launch/impl/DeleteLaunchHandlerImpl.java b/src/main/java/com/epam/ta/reportportal/core/launch/impl/DeleteLaunchHandlerImpl.java
index 178c4a5b41..011b9acc68 100644
--- a/src/main/java/com/epam/ta/reportportal/core/launch/impl/DeleteLaunchHandlerImpl.java
+++ b/src/main/java/com/epam/ta/reportportal/core/launch/impl/DeleteLaunchHandlerImpl.java
@@ -28,6 +28,7 @@
 
 import com.epam.reportportal.events.ElementsDeletedEvent;
 import com.epam.ta.reportportal.commons.ReportPortalUser;
+import com.epam.ta.reportportal.commons.ReportPortalUser.ProjectDetails;
 import com.epam.ta.reportportal.core.ElementsCounterService;
 import com.epam.ta.reportportal.core.analyzer.auto.LogIndexer;
 import com.epam.ta.reportportal.core.events.MessageBus;
@@ -123,14 +124,14 @@ public OperationCompletionRS deleteLaunch(Long launchId,
     return new OperationCompletionRS("Launch with ID = '" + launchId + "' successfully deleted.");
   }
 
-  public DeleteBulkRS deleteLaunches(DeleteBulkRQ deleteBulkRQ,
+  public DeleteBulkRS deleteLaunches(List<Long> ids,
       ReportPortalUser.ProjectDetails projectDetails, ReportPortalUser user) {
     List<Long> notFound = Lists.newArrayList();
     List<ReportPortalException> exceptions = Lists.newArrayList();
     Map<Launch, Long> toDelete = Maps.newHashMap();
     List<Long> launchIds = Lists.newArrayList();
 
-    deleteBulkRQ.getIds().forEach(id -> {
+    ids.forEach(id -> {
       Optional<Launch> optionalLaunch = launchRepository.findById(id);
       if (optionalLaunch.isPresent()) {
         Launch launch = optionalLaunch.get();
diff --git a/src/main/java/com/epam/ta/reportportal/ws/controller/DeprecatedUserController.java b/src/main/java/com/epam/ta/reportportal/ws/controller/DeprecatedUserController.java
index 137528f40f..f1eef98d46 100644
--- a/src/main/java/com/epam/ta/reportportal/ws/controller/DeprecatedUserController.java
+++ b/src/main/java/com/epam/ta/reportportal/ws/controller/DeprecatedUserController.java
@@ -130,7 +130,7 @@ public OperationCompletionRS deleteUser(@PathVariable(value = "id") Long userId,
   @Operation(summary = "Delete specified users by ids (DEPRECATED)")
   public DeleteBulkRS deleteUsers(@RequestBody @Valid DeleteBulkRQ deleteBulkRQ,
       @AuthenticationPrincipal ReportPortalUser user) {
-    return super.deleteUsers(deleteBulkRQ, user);
+    return super.deleteUsers(deleteBulkRQ.getIds(), user);
   }
 
   @Transactional
diff --git a/src/main/java/com/epam/ta/reportportal/ws/controller/LaunchController.java b/src/main/java/com/epam/ta/reportportal/ws/controller/LaunchController.java
index 32568e7082..1df89bee44 100644
--- a/src/main/java/com/epam/ta/reportportal/ws/controller/LaunchController.java
+++ b/src/main/java/com/epam/ta/reportportal/ws/controller/LaunchController.java
@@ -40,7 +40,6 @@
 import com.epam.ta.reportportal.entity.widget.content.ChartStatisticsContent;
 import com.epam.ta.reportportal.exception.ReportPortalException;
 import com.epam.ta.reportportal.model.BulkRQ;
-import com.epam.ta.reportportal.model.DeleteBulkRQ;
 import com.epam.ta.reportportal.model.DeleteBulkRS;
 import com.epam.ta.reportportal.model.launch.AnalyzeLaunchRQ;
 import com.epam.ta.reportportal.model.launch.FinishLaunchRS;
@@ -451,9 +450,9 @@ public void getLaunchReport(@PathVariable String projectName, @PathVariable Long
   @ResponseStatus(OK)
   @Operation(summary = "Delete specified launches by ids")
   public DeleteBulkRS deleteLaunches(@PathVariable String projectName,
-      @RequestBody @Valid DeleteBulkRQ deleteBulkRQ,
+      @RequestParam(value = "ids") List<Long> ids,
       @AuthenticationPrincipal ReportPortalUser user) {
-    return deleteLaunchMessageHandler.deleteLaunches(deleteBulkRQ,
+    return deleteLaunchMessageHandler.deleteLaunches(ids,
         projectExtractor.extractProjectDetails(user, normalizeId(projectName)), user
     );
   }
diff --git a/src/main/java/com/epam/ta/reportportal/ws/controller/ProjectController.java b/src/main/java/com/epam/ta/reportportal/ws/controller/ProjectController.java
index 4c01922a7f..61d8f8b580 100644
--- a/src/main/java/com/epam/ta/reportportal/ws/controller/ProjectController.java
+++ b/src/main/java/com/epam/ta/reportportal/ws/controller/ProjectController.java
@@ -45,7 +45,6 @@
 import com.epam.ta.reportportal.entity.project.ProjectInfo;
 import com.epam.ta.reportportal.entity.user.User;
 import com.epam.ta.reportportal.exception.ReportPortalException;
-import com.epam.ta.reportportal.model.DeleteBulkRQ;
 import com.epam.ta.reportportal.model.DeleteBulkRS;
 import com.epam.ta.reportportal.model.EntryCreatedRS;
 import com.epam.ta.reportportal.model.preference.PreferenceResource;
@@ -74,7 +73,6 @@
 import java.util.List;
 import java.util.Map;
 import javax.servlet.http.HttpServletResponse;
-import javax.validation.Valid;
 import org.jooq.Operator;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
@@ -172,9 +170,9 @@ public OperationCompletionRS updateProjectNotificationConfig(@PathVariable Strin
   @ResponseStatus(OK)
   @PreAuthorize(ADMIN_ONLY)
   @Operation(summary =  "Delete multiple projects", description = "Could be deleted only by users with administrator role")
-  public DeleteBulkRS deleteProject(@RequestBody @Valid DeleteBulkRQ deleteBulkRQ,
+  public DeleteBulkRS deleteProject(@RequestParam(value = "ids") List<Long> ids,
       @AuthenticationPrincipal ReportPortalUser user) {
-    return deleteProjectHandler.bulkDeleteProjects(deleteBulkRQ.getIds(), user);
+    return deleteProjectHandler.bulkDeleteProjects(ids, user);
   }
 
   @DeleteMapping("/{projectId}")
diff --git a/src/main/java/com/epam/ta/reportportal/ws/controller/UserController.java b/src/main/java/com/epam/ta/reportportal/ws/controller/UserController.java
index 17e0ce1da6..d7856af975 100644
--- a/src/main/java/com/epam/ta/reportportal/ws/controller/UserController.java
+++ b/src/main/java/com/epam/ta/reportportal/ws/controller/UserController.java
@@ -40,7 +40,6 @@
 import com.epam.ta.reportportal.model.ApiKeyRQ;
 import com.epam.ta.reportportal.model.ApiKeyRS;
 import com.epam.ta.reportportal.model.ApiKeysRS;
-import com.epam.ta.reportportal.model.DeleteBulkRQ;
 import com.epam.ta.reportportal.model.DeleteBulkRS;
 import com.epam.ta.reportportal.model.ModelViews;
 import com.epam.ta.reportportal.model.YesNoRS;
@@ -67,10 +66,10 @@
 import io.swagger.v3.oas.annotations.tags.Tag;
 import java.io.IOException;
 import java.io.OutputStream;
+import java.util.List;
 import java.util.Map;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
-import javax.validation.Valid;
 import org.jooq.Operator;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
@@ -167,9 +166,9 @@ public OperationCompletionRS deleteUser(@PathVariable(value = "id") Long userId,
   @PreAuthorize(ADMIN_ONLY)
   @ResponseStatus(OK)
   @Operation(summary = "Delete specified users by ids")
-  public DeleteBulkRS deleteUsers(@RequestBody @Valid DeleteBulkRQ deleteBulkRQ,
+  public DeleteBulkRS deleteUsers(@RequestParam(value = "ids") List<Long> ids,
       @AuthenticationPrincipal ReportPortalUser user) {
-    return deleteUserHandler.deleteUsers(deleteBulkRQ.getIds(), user);
+    return deleteUserHandler.deleteUsers(ids, user);
   }
 
   @Transactional

From 7f5393491b98d19177ef303d4cdf61e9cced3657 Mon Sep 17 00:00:00 2001
From: Andrei Piankouski <andrei_piankouski@epam.com>
Date: Thu, 29 Feb 2024 15:33:02 +0300
Subject: [PATCH 19/24] Remove deleteUsers from Deprecated User Controller

---
 .../ws/controller/DeprecatedUserController.java          | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/src/main/java/com/epam/ta/reportportal/ws/controller/DeprecatedUserController.java b/src/main/java/com/epam/ta/reportportal/ws/controller/DeprecatedUserController.java
index f1eef98d46..50d21273b3 100644
--- a/src/main/java/com/epam/ta/reportportal/ws/controller/DeprecatedUserController.java
+++ b/src/main/java/com/epam/ta/reportportal/ws/controller/DeprecatedUserController.java
@@ -124,15 +124,6 @@ public OperationCompletionRS deleteUser(@PathVariable(value = "id") Long userId,
     return super.deleteUser(userId, currentUser);
   }
 
-  @DeleteMapping
-  @PreAuthorize(ADMIN_ONLY)
-  @ResponseStatus(OK)
-  @Operation(summary = "Delete specified users by ids (DEPRECATED)")
-  public DeleteBulkRS deleteUsers(@RequestBody @Valid DeleteBulkRQ deleteBulkRQ,
-      @AuthenticationPrincipal ReportPortalUser user) {
-    return super.deleteUsers(deleteBulkRQ.getIds(), user);
-  }
-
   @Transactional
   @PutMapping(value = "/{login}")
   @PreAuthorize(ALLOWED_TO_EDIT_USER)

From a34991bddcd707350ddc17960bd97bc255a811ed Mon Sep 17 00:00:00 2001
From: Andrei Piankouski <andrei_piankouski@epam.com>
Date: Fri, 1 Mar 2024 16:44:40 +0300
Subject: [PATCH 20/24] EPMRPP-89661 || Several endpoint issues on API tab in
 "API Documentation" page

---
 .../core/configs/SpringDocConfiguration.java  | 20 +++++++++++++++++++
 .../model/project/CreateProjectRQ.java        |  2 +-
 .../project/config/CreateIssueSubTypeRQ.java  |  2 +-
 .../model/project/email/SenderCaseDTO.java    |  2 +-
 .../model/user/CreateUserRQConfirm.java       |  4 ++--
 .../reportportal/model/user/EditUserRQ.java   |  3 +++
 .../ws/controller/ActivityController.java     |  1 +
 .../controller/DeprecatedUserController.java  |  9 ---------
 .../ws/controller/FileStorageController.java  |  1 +
 .../ws/controller/LaunchAsyncController.java  |  2 +-
 .../ws/controller/LaunchController.java       |  5 -----
 .../ws/controller/ProjectController.java      |  2 +-
 .../ws/controller/TestItemController.java     |  2 ++
 .../ws/controller/UserController.java         |  1 -
 14 files changed, 34 insertions(+), 22 deletions(-)

diff --git a/src/main/java/com/epam/ta/reportportal/core/configs/SpringDocConfiguration.java b/src/main/java/com/epam/ta/reportportal/core/configs/SpringDocConfiguration.java
index 53eac08095..15c0a36e43 100644
--- a/src/main/java/com/epam/ta/reportportal/core/configs/SpringDocConfiguration.java
+++ b/src/main/java/com/epam/ta/reportportal/core/configs/SpringDocConfiguration.java
@@ -32,12 +32,14 @@
 import io.swagger.v3.oas.models.tags.Tag;
 import java.util.Comparator;
 import java.util.List;
+import java.util.Locale;
 import java.util.Map;
 import java.util.TreeMap;
 import java.util.stream.Collectors;
 import javax.servlet.ServletContext;
 import org.springdoc.core.SpringDocUtils;
 import org.springdoc.core.customizers.OpenApiCustomiser;
+import org.springdoc.core.customizers.OperationCustomizer;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.context.annotation.Bean;
@@ -58,6 +60,7 @@ public class SpringDocConfiguration {
         ReportPortalUser.class, UserRole.class);
     SpringDocUtils.getConfig().replaceWithClass(org.springframework.data.domain.Pageable.class,
         org.springdoc.core.converters.models.Pageable.class);
+    SpringDocUtils.getConfig().replaceWithClass(Iterable.class, List.class);
   }
 
   @Autowired
@@ -113,4 +116,21 @@ public OpenApiCustomiser sortTagsAlphabetically() {
       openApi.setTags(sortedTags);
     };
   }
+
+  @Bean
+  public OperationCustomizer apiSummaryCustomizer() {
+    return (operation, handlerMethod) -> {
+      if (operation.getSummary() == null || operation.getSummary().isEmpty()) {
+        String methodName = handlerMethod.getMethod().getName();
+        String summary = convertMethodNameToTitle(methodName);
+        operation.setSummary(summary);
+      }
+      return operation;
+    };
+  }
+
+  private String convertMethodNameToTitle(String methodName) {
+    StringBuilder title = new StringBuilder(methodName.replaceAll("([A-Z])", " $1"));
+    return title.substring(0, 1).toUpperCase(Locale.ROOT) + title.substring(1).trim();
+  }
 }
diff --git a/src/main/java/com/epam/ta/reportportal/model/project/CreateProjectRQ.java b/src/main/java/com/epam/ta/reportportal/model/project/CreateProjectRQ.java
index 8d48eab4b5..de4719104c 100644
--- a/src/main/java/com/epam/ta/reportportal/model/project/CreateProjectRQ.java
+++ b/src/main/java/com/epam/ta/reportportal/model/project/CreateProjectRQ.java
@@ -42,7 +42,7 @@ public class CreateProjectRQ {
 	@Pattern(regexp = PROJECT_NAME_REGEXP)
 	@Size(min = ValidationConstraints.MIN_NAME_LENGTH, max = ValidationConstraints.MAX_NAME_LENGTH)
 	@JsonProperty(value = "projectName", required = true)
-	@Schema(requiredMode = RequiredMode.REQUIRED)
+	@Schema(requiredMode = RequiredMode.REQUIRED, example = "string")
 	private String projectName;
 
 	@NotBlank
diff --git a/src/main/java/com/epam/ta/reportportal/model/project/config/CreateIssueSubTypeRQ.java b/src/main/java/com/epam/ta/reportportal/model/project/config/CreateIssueSubTypeRQ.java
index 4cc197956c..862dcf125c 100644
--- a/src/main/java/com/epam/ta/reportportal/model/project/config/CreateIssueSubTypeRQ.java
+++ b/src/main/java/com/epam/ta/reportportal/model/project/config/CreateIssueSubTypeRQ.java
@@ -50,7 +50,7 @@ public class CreateIssueSubTypeRQ {
 	@NotBlank
 	@Size(min = ValidationConstraints.MIN_SUBTYPE_SHORT_NAME, max = ValidationConstraints.MAX_SUBTYPE_SHORT_NAME)
 	@JsonProperty(value = "shortName", required = true)
-	@Schema(requiredMode = RequiredMode.REQUIRED)
+	@Schema(requiredMode = RequiredMode.REQUIRED, example = "string")
 	private String shortName;
 
 	@NotBlank
diff --git a/src/main/java/com/epam/ta/reportportal/model/project/email/SenderCaseDTO.java b/src/main/java/com/epam/ta/reportportal/model/project/email/SenderCaseDTO.java
index c64130d534..2b7d6bf4e6 100644
--- a/src/main/java/com/epam/ta/reportportal/model/project/email/SenderCaseDTO.java
+++ b/src/main/java/com/epam/ta/reportportal/model/project/email/SenderCaseDTO.java
@@ -58,7 +58,7 @@ public class SenderCaseDTO implements Serializable {
 	@NotBlank
 	@JsonProperty(value = "sendCase")
 	@In(allowedValues = { "always", "failed", "toInvestigate", "more10", "more20", "more50" })
-	@Schema(allowableValues = "ALWAYS, FAILED, MORE_10, MORE_20, MORE_50")
+	@Schema(allowableValues = { "always", "failed", "toInvestigate", "more10", "more20", "more50" })
 	private String sendCase;
 
 	@NotBlankStringCollection
diff --git a/src/main/java/com/epam/ta/reportportal/model/user/CreateUserRQConfirm.java b/src/main/java/com/epam/ta/reportportal/model/user/CreateUserRQConfirm.java
index f5b0778a42..bcbeb36ffe 100644
--- a/src/main/java/com/epam/ta/reportportal/model/user/CreateUserRQConfirm.java
+++ b/src/main/java/com/epam/ta/reportportal/model/user/CreateUserRQConfirm.java
@@ -38,7 +38,7 @@ public class CreateUserRQConfirm {
 	@Pattern(regexp = "[a-zA-Z0-9-_.]+")
 	@Size(min = ValidationConstraints.MIN_LOGIN_LENGTH, max = ValidationConstraints.MAX_LOGIN_LENGTH)
 	@JsonProperty(value = "login", required = true)
-	@Schema(requiredMode = RequiredMode.REQUIRED)
+	@Schema(requiredMode = RequiredMode.REQUIRED, example = "string")
 	private String login;
 
 	@NotBlank
@@ -51,7 +51,7 @@ public class CreateUserRQConfirm {
 	@Pattern(regexp = "[\\pL0-9-_ \\.]+")
 	@Size(min = ValidationConstraints.MIN_USER_NAME_LENGTH, max = ValidationConstraints.MAX_USER_NAME_LENGTH)
 	@JsonProperty(value = "fullName", required = true)
-	@Schema(requiredMode = RequiredMode.REQUIRED)
+	@Schema(requiredMode = RequiredMode.REQUIRED, example = "string")
 	private String fullName;
 
 	@NotBlank
diff --git a/src/main/java/com/epam/ta/reportportal/model/user/EditUserRQ.java b/src/main/java/com/epam/ta/reportportal/model/user/EditUserRQ.java
index c77de134c8..1614f51c3f 100644
--- a/src/main/java/com/epam/ta/reportportal/model/user/EditUserRQ.java
+++ b/src/main/java/com/epam/ta/reportportal/model/user/EditUserRQ.java
@@ -22,6 +22,8 @@
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonInclude.Include;
 import com.fasterxml.jackson.annotation.JsonProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
+import io.swagger.v3.oas.annotations.media.Schema.RequiredMode;
 import javax.validation.constraints.Pattern;
 import javax.validation.constraints.Size;
 
@@ -46,6 +48,7 @@ public class EditUserRQ {
 	@Size(min = ValidationConstraints.MIN_USER_NAME_LENGTH, max = ValidationConstraints.MAX_USER_NAME_LENGTH)
 	@Pattern(regexp = "(\\s*[\\pL0-9-_\\.]+\\s*)+")
 	@JsonProperty(value = "fullName")
+	@Schema(requiredMode = RequiredMode.REQUIRED, example = "string")
 	private String fullName;
 
 	public String getEmail() {
diff --git a/src/main/java/com/epam/ta/reportportal/ws/controller/ActivityController.java b/src/main/java/com/epam/ta/reportportal/ws/controller/ActivityController.java
index 7f7f600246..7e90972404 100644
--- a/src/main/java/com/epam/ta/reportportal/ws/controller/ActivityController.java
+++ b/src/main/java/com/epam/ta/reportportal/ws/controller/ActivityController.java
@@ -64,6 +64,7 @@ public ActivityController(ActivityHandler activityHandler, ProjectExtractor proj
 
    @RequestMapping(value = "/{activityId}", method = RequestMethod.GET)
    @ResponseStatus(OK)
+   @Operation(summary =  "Get activity by id")
    public ActivityResource getActivity(@PathVariable String projectName,
        @PathVariable Long activityId, @AuthenticationPrincipal ReportPortalUser user) {
      ReportPortalUser.ProjectDetails projectDetails =
diff --git a/src/main/java/com/epam/ta/reportportal/ws/controller/DeprecatedUserController.java b/src/main/java/com/epam/ta/reportportal/ws/controller/DeprecatedUserController.java
index f1eef98d46..50d21273b3 100644
--- a/src/main/java/com/epam/ta/reportportal/ws/controller/DeprecatedUserController.java
+++ b/src/main/java/com/epam/ta/reportportal/ws/controller/DeprecatedUserController.java
@@ -124,15 +124,6 @@ public OperationCompletionRS deleteUser(@PathVariable(value = "id") Long userId,
     return super.deleteUser(userId, currentUser);
   }
 
-  @DeleteMapping
-  @PreAuthorize(ADMIN_ONLY)
-  @ResponseStatus(OK)
-  @Operation(summary = "Delete specified users by ids (DEPRECATED)")
-  public DeleteBulkRS deleteUsers(@RequestBody @Valid DeleteBulkRQ deleteBulkRQ,
-      @AuthenticationPrincipal ReportPortalUser user) {
-    return super.deleteUsers(deleteBulkRQ.getIds(), user);
-  }
-
   @Transactional
   @PutMapping(value = "/{login}")
   @PreAuthorize(ALLOWED_TO_EDIT_USER)
diff --git a/src/main/java/com/epam/ta/reportportal/ws/controller/FileStorageController.java b/src/main/java/com/epam/ta/reportportal/ws/controller/FileStorageController.java
index 1772934e6b..9cca1c426f 100644
--- a/src/main/java/com/epam/ta/reportportal/ws/controller/FileStorageController.java
+++ b/src/main/java/com/epam/ta/reportportal/ws/controller/FileStorageController.java
@@ -76,6 +76,7 @@ public FileStorageController(ProjectExtractor projectExtractor, EditUserHandler
   @Transactional(readOnly = true)
   @PreAuthorize(ASSIGNED_TO_PROJECT)
   @GetMapping(value = "/{projectName}/{dataId}")
+  @Operation(summary = "Get file")
   public void getFile(@PathVariable String projectName, @PathVariable("dataId") Long dataId,
       HttpServletResponse response,
       @AuthenticationPrincipal ReportPortalUser user) {
diff --git a/src/main/java/com/epam/ta/reportportal/ws/controller/LaunchAsyncController.java b/src/main/java/com/epam/ta/reportportal/ws/controller/LaunchAsyncController.java
index a8107fd4be..9bf17f38ad 100644
--- a/src/main/java/com/epam/ta/reportportal/ws/controller/LaunchAsyncController.java
+++ b/src/main/java/com/epam/ta/reportportal/ws/controller/LaunchAsyncController.java
@@ -60,7 +60,7 @@
  */
 @RestController
 @RequestMapping("/v2/{projectName}/launch")
-@Tag(name = "launch-async-controller", description = "Activity Controller")
+@Tag(name = "launch-async-controller", description = "Launch Async Controller")
 public class LaunchAsyncController {
 
   private final ProjectExtractor projectExtractor;
diff --git a/src/main/java/com/epam/ta/reportportal/ws/controller/LaunchController.java b/src/main/java/com/epam/ta/reportportal/ws/controller/LaunchController.java
index 1df89bee44..940364a5ca 100644
--- a/src/main/java/com/epam/ta/reportportal/ws/controller/LaunchController.java
+++ b/src/main/java/com/epam/ta/reportportal/ws/controller/LaunchController.java
@@ -61,8 +61,6 @@
 import com.google.common.net.HttpHeaders;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.Parameter;
-import io.swagger.v3.oas.annotations.Parameters;
-import io.swagger.v3.oas.annotations.media.Content;
 import io.swagger.v3.oas.annotations.media.Schema;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import java.io.IOException;
@@ -457,9 +455,6 @@ public DeleteBulkRS deleteLaunches(@PathVariable String projectName,
     );
   }
 
-  @Parameters(
-      @Parameter(name = "launchImportRq", content = @Content(schema = @Schema(implementation = LaunchImportRQ.class)))
-  )
   @PostMapping(value = "/import", consumes = { MediaType.MULTIPART_FORM_DATA_VALUE })
   @ResponseStatus(OK)
   @Operation(summary =  "Import junit xml report", description = "Only following formats are supported: zip and xml.")
diff --git a/src/main/java/com/epam/ta/reportportal/ws/controller/ProjectController.java b/src/main/java/com/epam/ta/reportportal/ws/controller/ProjectController.java
index 61d8f8b580..8c25b7c861 100644
--- a/src/main/java/com/epam/ta/reportportal/ws/controller/ProjectController.java
+++ b/src/main/java/com/epam/ta/reportportal/ws/controller/ProjectController.java
@@ -226,7 +226,7 @@ public ProjectResource getProject(@PathVariable String projectName,
   @PutMapping("/{projectName}/unassign")
   @ResponseStatus(OK)
   @PreAuthorize(PROJECT_MANAGER)
-  @Operation(summary = "Un assign users")
+  @Operation(summary = "Unassign users")
   public OperationCompletionRS unassignProjectUsers(@PathVariable String projectName,
       @RequestBody @Validated UnassignUsersRQ unassignUsersRQ,
       @AuthenticationPrincipal ReportPortalUser user) {
diff --git a/src/main/java/com/epam/ta/reportportal/ws/controller/TestItemController.java b/src/main/java/com/epam/ta/reportportal/ws/controller/TestItemController.java
index a6e31efee8..824fa0634e 100644
--- a/src/main/java/com/epam/ta/reportportal/ws/controller/TestItemController.java
+++ b/src/main/java/com/epam/ta/reportportal/ws/controller/TestItemController.java
@@ -64,6 +64,7 @@
 import com.epam.ta.reportportal.ws.resolver.FilterFor;
 import com.epam.ta.reportportal.ws.resolver.SortFor;
 import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.media.Schema;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import java.util.Collections;
 import java.util.List;
@@ -233,6 +234,7 @@ public OperationCompletionRS handleSuggestChoose(@PathVariable String projectNam
   @GetMapping
   @ResponseStatus(OK)
   @Operation(summary = "Find test items by specified filter")
+  @Schema(implementation = TestItemHistoryElement.class)
   public Iterable<TestItemResource> getTestItems(@PathVariable String projectName,
       @AuthenticationPrincipal ReportPortalUser user, @Nullable
   @RequestParam(value = DEFAULT_FILTER_PREFIX + Condition.EQ + CRITERIA_LAUNCH_ID, required = false)
diff --git a/src/main/java/com/epam/ta/reportportal/ws/controller/UserController.java b/src/main/java/com/epam/ta/reportportal/ws/controller/UserController.java
index d7856af975..c04405a12a 100644
--- a/src/main/java/com/epam/ta/reportportal/ws/controller/UserController.java
+++ b/src/main/java/com/epam/ta/reportportal/ws/controller/UserController.java
@@ -213,7 +213,6 @@ public Iterable<UserResource> getUsers(@FilterFor(User.class) Filter filter,
 
   @Transactional(readOnly = true)
   @GetMapping(value = "/registration/info")
-
   public YesNoRS validateInfo(@RequestParam(value = "username", required = false) String username,
       @RequestParam(value = "email", required = false) String email) {
     return getUserHandler.validateInfo(username, email);

From beee5178ca64705b20083d75d1aa96ce9caa8990 Mon Sep 17 00:00:00 2001
From: Siarhei Hrabko <45555481+grabsefx@users.noreply.github.com>
Date: Mon, 4 Mar 2024 10:47:28 +0300
Subject: [PATCH 21/24] EPMRPP-89216 HCW fix. Dao update (#1936)

* EPMRPP-89216 HCW fix. Dao update
---
 build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.gradle b/build.gradle
index eed4f2b41c..90543a5509 100644
--- a/build.gradle
+++ b/build.gradle
@@ -72,7 +72,7 @@ dependencies {
         implementation 'com.epam.reportportal:plugin-api'
     } else {
         implementation 'com.github.reportportal:commons-events:e337f8b7be'
-        implementation 'com.github.reportportal:commons-dao:d0894a1'
+        implementation 'com.github.reportportal:commons-dao:b2c73ac'
         implementation 'com.github.reportportal:commons-rules:1f6bfed'
         implementation 'com.github.reportportal:commons-model:f466951'
         implementation 'com.github.reportportal:commons-reporting:12c31b1'

From bfd0767bc107d5c431592b8242ded5259e50f756 Mon Sep 17 00:00:00 2001
From: APiankouski <109206864+APiankouski@users.noreply.github.com>
Date: Mon, 4 Mar 2024 16:35:58 +0300
Subject: [PATCH 22/24] EPMRPP-89678 || Filter parameters are missing for some
 endpoints on API tab in "API Documentation" page (#1938)

---
 .../core/configs/SpringDocConfiguration.java  | 108 +++++++++++++++++-
 .../ta/reportportal/util/SchemaFactory.java   |  51 +++++++++
 2 files changed, 155 insertions(+), 4 deletions(-)
 create mode 100644 src/main/java/com/epam/ta/reportportal/util/SchemaFactory.java

diff --git a/src/main/java/com/epam/ta/reportportal/core/configs/SpringDocConfiguration.java b/src/main/java/com/epam/ta/reportportal/core/configs/SpringDocConfiguration.java
index 15c0a36e43..675a132104 100644
--- a/src/main/java/com/epam/ta/reportportal/core/configs/SpringDocConfiguration.java
+++ b/src/main/java/com/epam/ta/reportportal/core/configs/SpringDocConfiguration.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2023 EPAM Systems
+ * Copyright 2024 EPAM Systems
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,24 +16,42 @@
 
 package com.epam.ta.reportportal.core.configs;
 
+import static com.epam.ta.reportportal.commons.querygen.constant.ProjectCriteriaConstant.CRITERIA_PROJECT_ATTRIBUTE_NAME;
+
 import com.epam.ta.reportportal.commons.ReportPortalUser;
+import com.epam.ta.reportportal.commons.querygen.CriteriaHolder;
 import com.epam.ta.reportportal.commons.querygen.Filter;
+import com.epam.ta.reportportal.commons.querygen.FilterTarget;
 import com.epam.ta.reportportal.commons.querygen.Queryable;
+import com.epam.ta.reportportal.core.statistics.StatisticsHelper;
+import com.epam.ta.reportportal.entity.item.TestItem;
+import com.epam.ta.reportportal.entity.launch.Launch;
 import com.epam.ta.reportportal.entity.user.UserRole;
+import com.epam.ta.reportportal.util.SchemaFactory;
+import com.epam.ta.reportportal.ws.resolver.FilterFor;
+import com.google.common.collect.ImmutableSet;
+import com.google.common.collect.Lists;
+import io.swagger.v3.oas.annotations.enums.ParameterIn;
 import io.swagger.v3.oas.models.Components;
 import io.swagger.v3.oas.models.OpenAPI;
+import io.swagger.v3.oas.models.Operation;
 import io.swagger.v3.oas.models.info.Contact;
 import io.swagger.v3.oas.models.info.Info;
 import io.swagger.v3.oas.models.info.License;
+import io.swagger.v3.oas.models.media.IntegerSchema;
 import io.swagger.v3.oas.models.media.Schema;
+import io.swagger.v3.oas.models.media.StringSchema;
+import io.swagger.v3.oas.models.parameters.Parameter;
 import io.swagger.v3.oas.models.security.SecurityRequirement;
 import io.swagger.v3.oas.models.security.SecurityScheme;
 import io.swagger.v3.oas.models.servers.Server;
 import io.swagger.v3.oas.models.tags.Tag;
+import java.util.ArrayList;
 import java.util.Comparator;
 import java.util.List;
 import java.util.Locale;
 import java.util.Map;
+import java.util.Set;
 import java.util.TreeMap;
 import java.util.stream.Collectors;
 import javax.servlet.ServletContext;
@@ -45,6 +63,8 @@
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.ComponentScan;
 import org.springframework.context.annotation.Configuration;
+import org.springframework.core.MethodParameter;
+import org.springframework.data.domain.Pageable;
 import org.springframework.security.core.annotation.AuthenticationPrincipal;
 
 /**
@@ -56,13 +76,14 @@ public class SpringDocConfiguration {
 
   static {
     SpringDocUtils.getConfig().addAnnotationsToIgnore(AuthenticationPrincipal.class);
-    SpringDocUtils.getConfig().addRequestWrapperToIgnore(Filter.class, Queryable.class,
+    SpringDocUtils.getConfig().addRequestWrapperToIgnore(Pageable.class, Queryable.class,
         ReportPortalUser.class, UserRole.class);
-    SpringDocUtils.getConfig().replaceWithClass(org.springframework.data.domain.Pageable.class,
-        org.springdoc.core.converters.models.Pageable.class);
     SpringDocUtils.getConfig().replaceWithClass(Iterable.class, List.class);
   }
 
+  private static final Set<String> hiddenParams = ImmutableSet.<String>builder()
+      .add(CRITERIA_PROJECT_ATTRIBUTE_NAME).build();
+
   @Autowired
   private ServletContext servletContext;
 
@@ -133,4 +154,83 @@ private String convertMethodNameToTitle(String methodName) {
     StringBuilder title = new StringBuilder(methodName.replaceAll("([A-Z])", " $1"));
     return title.substring(0, 1).toUpperCase(Locale.ROOT) + title.substring(1).trim();
   }
+
+  @Bean
+  public OperationCustomizer customizeParameters() {
+    return (operation, handlerMethod) -> {
+      for (MethodParameter parameter : handlerMethod.getMethodParameters()) {
+        Class<?> parameterType = parameter.getParameterType();
+
+        if (parameterType == Filter.class) {
+          FilterFor filterClass = parameter.getParameterAnnotation(FilterFor.class);
+
+          List<Parameter> defaultParams = Lists.newArrayList();
+          if (filterClass != null && (filterClass.value() == TestItem.class
+              || filterClass.value() == Launch.class)) {
+            defaultParams = StatisticsHelper.defaultStatisticsFields()
+                .map(this::buildFilterParameters)
+                .collect(Collectors.toList());
+          }
+
+          List<CriteriaHolder> criteriaList = FilterTarget.findByClass(filterClass.value())
+              .getCriteriaHolders();
+          List<Parameter> filterParams = criteriaList.stream()
+              .filter(ch -> !hiddenParams.contains(ch.getFilterCriteria()))
+              .map(this::buildFilterParameters)
+              .collect(Collectors.toList());
+          filterParams.addAll(defaultParams);
+          setParameters(operation, filterParams);
+        } else if (parameterType == Pageable.class) {
+          setParameters(operation, buildPageParameters());
+        }
+      }
+      return operation;
+    };
+  }
+
+  private Parameter buildFilterParameters(String parameter) {
+    return new Parameter()
+        .in(ParameterIn.QUERY.toString())
+        .name("filter.eq." + parameter)
+        .schema(new IntegerSchema())
+        .description("Filters by '" + parameter + "'");
+  }
+
+  private Parameter buildFilterParameters(CriteriaHolder criteriaHolder) {
+    Schema schema = SchemaFactory.createSchemaForType(criteriaHolder.getDataType());
+
+    return new Parameter()
+        .in(ParameterIn.QUERY.toString())
+        .name("filter.eq." + criteriaHolder.getFilterCriteria())
+        .schema(schema)
+        .description("Filters by '" + criteriaHolder.getFilterCriteria() + "'");
+  }
+
+  private List<Parameter> buildPageParameters() {
+    List<Parameter> pageParams = new ArrayList<>();
+    pageParams.add(new Parameter()
+        .in(ParameterIn.QUERY.toString())
+        .name("page.page")
+        .schema(new IntegerSchema())
+        .description("Results page you want to retrieve (0..N)"));
+    pageParams.add(new Parameter()
+        .in(ParameterIn.QUERY.toString())
+        .name("page.size")
+        .schema(new IntegerSchema())
+        .description("Number of records per page"));
+    pageParams.add(new Parameter()
+        .in(ParameterIn.QUERY.toString())
+        .name("page.sort")
+        .schema(new StringSchema())
+        .description("Sorting criteria in the format: property, (asc|desc). "
+            + "Default sort order is ascending. "
+            + "Multiple sort criteria are supported."));
+    return pageParams;
+  }
+
+  private void setParameters(Operation operation, List<Parameter> parameters) {
+    for (Parameter parameter : parameters) {
+      operation.addParametersItem(parameter);
+    }
+  }
 }
diff --git a/src/main/java/com/epam/ta/reportportal/util/SchemaFactory.java b/src/main/java/com/epam/ta/reportportal/util/SchemaFactory.java
new file mode 100644
index 0000000000..7447b17ff7
--- /dev/null
+++ b/src/main/java/com/epam/ta/reportportal/util/SchemaFactory.java
@@ -0,0 +1,51 @@
+/*
+ * Copyright 2024 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.ta.reportportal.util;
+
+
+import io.swagger.v3.oas.models.media.*;
+import java.sql.Timestamp;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Optional;
+import java.util.function.Supplier;
+
+
+/**
+ * @author <a href="mailto:andrei_piankouski@epam.com">Andrei Piankouski</a>
+ */
+public class SchemaFactory {
+
+  private static final Map<Class<?>, Supplier<Schema>> schemas = new HashMap<>();
+
+  static {
+    schemas.put(String.class, StringSchema::new);
+    schemas.put(Integer.class, IntegerSchema::new);
+    schemas.put(Long.class, IntegerSchema::new);
+    schemas.put(Boolean.class, BooleanSchema::new);
+    schemas.put(Timestamp.class, DateSchema::new);
+    schemas.put(Date.class, DateSchema::new);
+    schemas.put(List.class, ArraySchema::new);
+  }
+
+  public static Schema createSchemaForType(Class<?> type) {
+    return Optional.ofNullable(schemas.get(type))
+        .map(Supplier::get)
+        .orElse(new StringSchema());
+  }
+}

From 2e786f9dfbe9af60caa72573e3892e614962e26b Mon Sep 17 00:00:00 2001
From: Andrei Piankouski <andrei_piankouski@epam.com>
Date: Tue, 5 Mar 2024 10:58:06 +0300
Subject: [PATCH 23/24] EPMRPP-89661 || Fix Api doc

---
 .../core/configs/SpringDocConfiguration.java             | 7 ++++---
 .../model/project/config/CreateIssueSubTypeRQ.java       | 2 +-
 .../model/project/config/UpdateOneIssueSubTypeRQ.java    | 2 ++
 .../ta/reportportal/model/user/CreateUserRQFull.java     | 6 +++---
 .../reportportal/ws/controller/TestItemController.java   | 9 +++++----
 5 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/src/main/java/com/epam/ta/reportportal/core/configs/SpringDocConfiguration.java b/src/main/java/com/epam/ta/reportportal/core/configs/SpringDocConfiguration.java
index 675a132104..99c1c6c98a 100644
--- a/src/main/java/com/epam/ta/reportportal/core/configs/SpringDocConfiguration.java
+++ b/src/main/java/com/epam/ta/reportportal/core/configs/SpringDocConfiguration.java
@@ -47,6 +47,7 @@
 import io.swagger.v3.oas.models.servers.Server;
 import io.swagger.v3.oas.models.tags.Tag;
 import java.util.ArrayList;
+import java.util.Collection;
 import java.util.Comparator;
 import java.util.List;
 import java.util.Locale;
@@ -174,10 +175,10 @@ public OperationCustomizer customizeParameters() {
 
           List<CriteriaHolder> criteriaList = FilterTarget.findByClass(filterClass.value())
               .getCriteriaHolders();
-          List<Parameter> filterParams = criteriaList.stream()
+          Set<Parameter> filterParams = criteriaList.stream()
               .filter(ch -> !hiddenParams.contains(ch.getFilterCriteria()))
               .map(this::buildFilterParameters)
-              .collect(Collectors.toList());
+              .collect(Collectors.toSet());
           filterParams.addAll(defaultParams);
           setParameters(operation, filterParams);
         } else if (parameterType == Pageable.class) {
@@ -228,7 +229,7 @@ private List<Parameter> buildPageParameters() {
     return pageParams;
   }
 
-  private void setParameters(Operation operation, List<Parameter> parameters) {
+  private void setParameters(Operation operation, Collection<Parameter> parameters) {
     for (Parameter parameter : parameters) {
       operation.addParametersItem(parameter);
     }
diff --git a/src/main/java/com/epam/ta/reportportal/model/project/config/CreateIssueSubTypeRQ.java b/src/main/java/com/epam/ta/reportportal/model/project/config/CreateIssueSubTypeRQ.java
index 862dcf125c..92432061c0 100644
--- a/src/main/java/com/epam/ta/reportportal/model/project/config/CreateIssueSubTypeRQ.java
+++ b/src/main/java/com/epam/ta/reportportal/model/project/config/CreateIssueSubTypeRQ.java
@@ -56,7 +56,7 @@ public class CreateIssueSubTypeRQ {
 	@NotBlank
 	@Pattern(regexp = HEX_COLOR_REGEXP)
 	@JsonProperty(value = "color", required = true)
-	@Schema(requiredMode = RequiredMode.REQUIRED)
+	@Schema(requiredMode = RequiredMode.REQUIRED, example = "string")
 	private String color;
 
 	public void setTypeRef(String typeRef) {
diff --git a/src/main/java/com/epam/ta/reportportal/model/project/config/UpdateOneIssueSubTypeRQ.java b/src/main/java/com/epam/ta/reportportal/model/project/config/UpdateOneIssueSubTypeRQ.java
index b15ce5403b..443d7ccdef 100644
--- a/src/main/java/com/epam/ta/reportportal/model/project/config/UpdateOneIssueSubTypeRQ.java
+++ b/src/main/java/com/epam/ta/reportportal/model/project/config/UpdateOneIssueSubTypeRQ.java
@@ -53,12 +53,14 @@ public class UpdateOneIssueSubTypeRQ {
 	@NotBlank
 	@JsonProperty(value = "shortName")
 	@Size(min = ValidationConstraints.MIN_SUBTYPE_SHORT_NAME, max = ValidationConstraints.MAX_SUBTYPE_SHORT_NAME)
+	@Schema(requiredMode = RequiredMode.REQUIRED, example = "string")
 	private String shortName;
 
 	@NotBlank
 	@Pattern(regexp = HEX_COLOR_REGEXP)
 	@JsonProperty(value = "color")
 	@Size(min = ValidationConstraints.MIN_SUBTYPE_LONG_NAME, max = ValidationConstraints.MAX_SUBTYPE_LONG_NAME)
+	@Schema(requiredMode = RequiredMode.REQUIRED, example = "string")
 	private String color;
 
 	public UpdateOneIssueSubTypeRQ() {
diff --git a/src/main/java/com/epam/ta/reportportal/model/user/CreateUserRQFull.java b/src/main/java/com/epam/ta/reportportal/model/user/CreateUserRQFull.java
index b8df47c607..12cc34206e 100644
--- a/src/main/java/com/epam/ta/reportportal/model/user/CreateUserRQFull.java
+++ b/src/main/java/com/epam/ta/reportportal/model/user/CreateUserRQFull.java
@@ -40,7 +40,7 @@ public class CreateUserRQFull {
 	@Pattern(regexp = "[a-zA-Z0-9-_.]+")
 	@Size(min = ValidationConstraints.MIN_LOGIN_LENGTH, max = ValidationConstraints.MAX_LOGIN_LENGTH)
 	@JsonProperty(value = "login", required = true)
-	@Schema(requiredMode = RequiredMode.REQUIRED)
+	@Schema(requiredMode = RequiredMode.REQUIRED, example = "string")
 	private String login;
 
 	@NotBlank
@@ -53,7 +53,7 @@ public class CreateUserRQFull {
 	@Pattern(regexp = "[\\pL0-9-_ \\.]+")
 	@Size(min = ValidationConstraints.MIN_USER_NAME_LENGTH, max = ValidationConstraints.MAX_USER_NAME_LENGTH)
 	@JsonProperty(value = "fullName", required = true)
-	@Schema(requiredMode = RequiredMode.REQUIRED)
+	@Schema(requiredMode = RequiredMode.REQUIRED, example = "string")
 	private String fullName;
 
 	@NotBlank
@@ -70,7 +70,7 @@ public class CreateUserRQFull {
 	@NotNull
 	@JsonProperty(value = "projectRole", required = true)
 	@In(allowedValues = { "operator", "customer", "member", "project_manager" })
-	@Schema(required = true, allowableValues = "CUSTOMER, MEMBER, LEAD, PROJECT_MANAGER")
+	@Schema(required = true, allowableValues = "CUSTOMER, MEMBER, PROJECT_MANAGER")
 	private String projectRole;
 
 	@NotBlank
diff --git a/src/main/java/com/epam/ta/reportportal/ws/controller/TestItemController.java b/src/main/java/com/epam/ta/reportportal/ws/controller/TestItemController.java
index 824fa0634e..50a88f964b 100644
--- a/src/main/java/com/epam/ta/reportportal/ws/controller/TestItemController.java
+++ b/src/main/java/com/epam/ta/reportportal/ws/controller/TestItemController.java
@@ -64,6 +64,7 @@
 import com.epam.ta.reportportal.ws.resolver.FilterFor;
 import com.epam.ta.reportportal.ws.resolver.SortFor;
 import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.Parameter;
 import io.swagger.v3.oas.annotations.media.Schema;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import java.util.Collections;
@@ -237,7 +238,7 @@ public OperationCompletionRS handleSuggestChoose(@PathVariable String projectNam
   @Schema(implementation = TestItemHistoryElement.class)
   public Iterable<TestItemResource> getTestItems(@PathVariable String projectName,
       @AuthenticationPrincipal ReportPortalUser user, @Nullable
-  @RequestParam(value = DEFAULT_FILTER_PREFIX + Condition.EQ + CRITERIA_LAUNCH_ID, required = false)
+  @Parameter(hidden = true) @RequestParam(value = DEFAULT_FILTER_PREFIX + Condition.EQ + CRITERIA_LAUNCH_ID, required = false)
   Long launchId,
       @Nullable @RequestParam(value = FILTER_ID_REQUEST_PARAM, required = false) Long filterId,
       @RequestParam(value = IS_LATEST_LAUNCHES_REQUEST_PARAM, defaultValue = "false", required = false)
@@ -327,11 +328,11 @@ public Iterable<TestItemHistoryElement> getItemsHistory(@PathVariable String pro
       @AuthenticationPrincipal ReportPortalUser user, @FilterFor(TestItem.class) Filter filter,
       @FilterFor(TestItem.class) Queryable predefinedFilter,
       @SortFor(TestItem.class) Pageable pageable, @Nullable
-  @RequestParam(value = DEFAULT_FILTER_PREFIX + Condition.EQ + CRITERIA_PARENT_ID, required = false)
+  @Parameter(hidden = true) @RequestParam(value = DEFAULT_FILTER_PREFIX + Condition.EQ + CRITERIA_PARENT_ID, required = false)
   Long parentId, @Nullable
-  @RequestParam(value = DEFAULT_FILTER_PREFIX + Condition.EQ + CRITERIA_ID, required = false)
+  @Parameter(hidden = true) @RequestParam(value = DEFAULT_FILTER_PREFIX + Condition.EQ + CRITERIA_ID, required = false)
   Long itemId, @Nullable
-  @RequestParam(value = DEFAULT_FILTER_PREFIX + Condition.EQ + CRITERIA_LAUNCH_ID, required = false)
+  @Parameter(hidden = true) @RequestParam(value = DEFAULT_FILTER_PREFIX + Condition.EQ + CRITERIA_LAUNCH_ID, required = false)
   Long launchId, @Nullable @RequestParam(value = HISTORY_TYPE_PARAM, required = false) String type,
       @Nullable @RequestParam(value = FILTER_ID_REQUEST_PARAM, required = false) Long filterId,
       @RequestParam(value = IS_LATEST_LAUNCHES_REQUEST_PARAM, defaultValue = "false", required = false)

From 385ec9b28934c7609fb08db97ef5e26a3dc06058 Mon Sep 17 00:00:00 2001
From: Siarhei Hrabko <45555481+grabsefx@users.noreply.github.com>
Date: Tue, 5 Mar 2024 13:45:21 +0300
Subject: [PATCH 24/24] EPMRPP-89396 || fix failing tests (#1939)

* EPMRPP-89396 || fix failing tests
---
 .../ProjectInfoWidgetDataConverterTest.java   |  5 +-
 .../ws/controller/LaunchControllerTest.java   |  5 +-
 .../ws/controller/ProjectControllerTest.java  | 42 ++++++++++------
 .../ws/controller/UserControllerTest.java     | 50 ++++++++++++-------
 .../ws/controller/WidgetControllerTest.java   |  2 +-
 .../ws/validation/TicketsValidationTest.java  |  2 +
 6 files changed, 68 insertions(+), 38 deletions(-)

diff --git a/src/test/java/com/epam/ta/reportportal/core/project/impl/ProjectInfoWidgetDataConverterTest.java b/src/test/java/com/epam/ta/reportportal/core/project/impl/ProjectInfoWidgetDataConverterTest.java
index 0d0a96ca88..36ae0fafd0 100644
--- a/src/test/java/com/epam/ta/reportportal/core/project/impl/ProjectInfoWidgetDataConverterTest.java
+++ b/src/test/java/com/epam/ta/reportportal/core/project/impl/ProjectInfoWidgetDataConverterTest.java
@@ -44,6 +44,7 @@
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
+import java.util.Locale;
 import java.util.Map;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
@@ -65,6 +66,7 @@ class ProjectInfoWidgetDataConverterTest {
 
   @BeforeEach
   void setUp() {
+    Locale.setDefault(Locale.US);
     converter = new ProjectInfoWidgetDataConverter(
         ImmutableMap.<InfoInterval, ProjectInfoWidgetDataConverter.ProjectInfoGroup>builder()
             .put(InfoInterval.ONE_MONTH, ProjectInfoWidgetDataConverter.ProjectInfoGroup.BY_DAY)
@@ -88,6 +90,7 @@ void setUp() {
 
   @Test
   void getInvestigatedProjectInfo() {
+    Locale.setDefault(Locale.US);
     Map<String, List<ChartObject>> investigatedProjectInfo =
         converter.getInvestigatedProjectInfo(getTestData(), InfoInterval.ONE_MONTH);
 
@@ -233,4 +236,4 @@ private Statistics getStatistics(String statisticsFieldName, int counter) {
     statistics.setCounter(counter);
     return statistics;
   }
-}
\ No newline at end of file
+}
diff --git a/src/test/java/com/epam/ta/reportportal/ws/controller/LaunchControllerTest.java b/src/test/java/com/epam/ta/reportportal/ws/controller/LaunchControllerTest.java
index 07078629b4..95ce0a8469 100644
--- a/src/test/java/com/epam/ta/reportportal/ws/controller/LaunchControllerTest.java
+++ b/src/test/java/com/epam/ta/reportportal/ws/controller/LaunchControllerTest.java
@@ -256,7 +256,8 @@ void bulkDeleteLaunches() throws Exception {
     deleteBulkRQ.setIds(ids);
     mockMvc.perform(delete(DEFAULT_PROJECT_BASE_URL + "/launch").contentType(APPLICATION_JSON)
         .with(token(oAuthHelper.getDefaultToken()))
-        .content(objectMapper.writeValueAsBytes(deleteBulkRQ))).andExpect(status().is(200));
+        .param("ids" , "1", "2"))
+        .andExpect(status().is(200));
     List<Launch> launches = launchRepository.findAllById(ids);
     assertTrue(launches.isEmpty());
   }
@@ -420,4 +421,4 @@ void bulkDeleteAttributes() throws Exception {
       assertEquals(comment, it.getDescription());
     });
   }
-}
\ No newline at end of file
+}
diff --git a/src/test/java/com/epam/ta/reportportal/ws/controller/ProjectControllerTest.java b/src/test/java/com/epam/ta/reportportal/ws/controller/ProjectControllerTest.java
index 1a6e27ad6a..a1d8712c50 100644
--- a/src/test/java/com/epam/ta/reportportal/ws/controller/ProjectControllerTest.java
+++ b/src/test/java/com/epam/ta/reportportal/ws/controller/ProjectControllerTest.java
@@ -16,14 +16,30 @@
 
 package com.epam.ta.reportportal.ws.controller;
 
+import static java.util.Collections.singletonList;
+import static org.hamcrest.Matchers.hasSize;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.Mockito.eq;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+import static org.springframework.http.MediaType.APPLICATION_JSON;
+import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.delete;
+import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get;
+import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.post;
+import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.put;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.jsonPath;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
+
 import com.epam.ta.reportportal.core.events.activity.ProjectIndexEvent;
 import com.epam.ta.reportportal.dao.ProjectRepository;
 import com.epam.ta.reportportal.entity.enums.LogicalOperator;
 import com.epam.ta.reportportal.entity.project.Project;
 import com.epam.ta.reportportal.entity.project.ProjectAttribute;
-import com.epam.ta.reportportal.ws.BaseMvcTest;
 import com.epam.ta.reportportal.model.DeleteBulkRQ;
-import com.epam.ta.reportportal.ws.reporting.ItemAttributeResource;
 import com.epam.ta.reportportal.model.project.AssignUsersRQ;
 import com.epam.ta.reportportal.model.project.CreateProjectRQ;
 import com.epam.ta.reportportal.model.project.UnassignUsersRQ;
@@ -31,11 +47,18 @@
 import com.epam.ta.reportportal.model.project.config.ProjectConfigurationUpdate;
 import com.epam.ta.reportportal.model.project.email.ProjectNotificationConfigDTO;
 import com.epam.ta.reportportal.model.project.email.SenderCaseDTO;
+import com.epam.ta.reportportal.ws.BaseMvcTest;
+import com.epam.ta.reportportal.ws.reporting.ItemAttributeResource;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.google.common.collect.Lists;
 import com.google.common.collect.Sets;
 import com.rabbitmq.http.client.Client;
 import com.rabbitmq.http.client.domain.ExchangeInfo;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Optional;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
@@ -48,18 +71,6 @@
 import org.springframework.test.context.jdbc.Sql;
 import org.springframework.test.web.servlet.ResultActions;
 
-import java.util.*;
-
-import static java.util.Collections.singletonList;
-import static org.hamcrest.Matchers.hasSize;
-import static org.junit.jupiter.api.Assertions.*;
-import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.Mockito.*;
-import static org.springframework.http.MediaType.APPLICATION_JSON;
-import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.*;
-import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.jsonPath;
-import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
-
 /**
  * @author <a href="mailto:ihar_kahadouski@epam.com">Ihar Kahadouski</a>
  */
@@ -300,7 +311,8 @@ void bulkDeleteProjects() throws Exception {
 		bulkRQ.setIds(Lists.newArrayList(2L, 3L));
 		mockMvc.perform(delete("/v1/project").with(token(oAuthHelper.getSuperadminToken()))
 				.contentType(APPLICATION_JSON)
-				.content(objectMapper.writeValueAsBytes(bulkRQ))).andExpect(status().isOk());
+            .param("ids" , "2", "3"))
+        .andExpect(status().isOk());
 	}
 
 	@Test
diff --git a/src/test/java/com/epam/ta/reportportal/ws/controller/UserControllerTest.java b/src/test/java/com/epam/ta/reportportal/ws/controller/UserControllerTest.java
index 7807873e40..d65355dcd6 100644
--- a/src/test/java/com/epam/ta/reportportal/ws/controller/UserControllerTest.java
+++ b/src/test/java/com/epam/ta/reportportal/ws/controller/UserControllerTest.java
@@ -16,6 +16,20 @@
 
 package com.epam.ta.reportportal.ws.controller;
 
+import static com.epam.ta.reportportal.commons.EntityUtils.normalizeId;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.Mockito.doNothing;
+import static org.mockito.Mockito.when;
+import static org.springframework.http.MediaType.APPLICATION_JSON;
+import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.delete;
+import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get;
+import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.post;
+import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.put;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
+
 import com.epam.ta.reportportal.dao.IssueTypeRepository;
 import com.epam.ta.reportportal.dao.ProjectRepository;
 import com.epam.ta.reportportal.dao.UserRepository;
@@ -24,34 +38,31 @@
 import com.epam.ta.reportportal.entity.item.issue.IssueType;
 import com.epam.ta.reportportal.entity.project.Project;
 import com.epam.ta.reportportal.entity.project.ProjectIssueType;
-import com.epam.ta.reportportal.ws.BaseMvcTest;
 import com.epam.ta.reportportal.model.DeleteBulkRQ;
 import com.epam.ta.reportportal.model.Page;
+import com.epam.ta.reportportal.model.user.ChangePasswordRQ;
+import com.epam.ta.reportportal.model.user.CreateUserBidRS;
+import com.epam.ta.reportportal.model.user.CreateUserRQ;
+import com.epam.ta.reportportal.model.user.CreateUserRQConfirm;
+import com.epam.ta.reportportal.model.user.CreateUserRQFull;
+import com.epam.ta.reportportal.model.user.CreateUserRS;
+import com.epam.ta.reportportal.model.user.EditUserRQ;
+import com.epam.ta.reportportal.model.user.ResetPasswordRQ;
+import com.epam.ta.reportportal.model.user.RestorePasswordRQ;
+import com.epam.ta.reportportal.ws.BaseMvcTest;
 import com.epam.ta.reportportal.ws.model.ValidationConstraints;
-import com.epam.ta.reportportal.model.user.*;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.google.common.collect.Lists;
+import java.util.List;
+import java.util.Optional;
+import java.util.stream.Collectors;
 import org.apache.commons.lang3.RandomStringUtils;
 import org.junit.jupiter.api.Assertions;
-import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.test.context.jdbc.Sql;
 import org.springframework.test.web.servlet.MvcResult;
 
-import java.util.List;
-import java.util.Optional;
-import java.util.stream.Collectors;
-
-import static com.epam.ta.reportportal.commons.EntityUtils.normalizeId;
-import static org.junit.jupiter.api.Assertions.*;
-import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.Mockito.doNothing;
-import static org.mockito.Mockito.when;
-import static org.springframework.http.MediaType.APPLICATION_JSON;
-import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.*;
-import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
-
 /**
  * @author <a href="mailto:ihar_kahadouski@epam.com">Ihar Kahadouski</a>
  */
@@ -189,8 +200,9 @@ void deleteUsers() throws Exception {
     deleteBulkRQ.setIds(Lists.newArrayList(2L));
 
     mockMvc.perform(delete("/v1/user").with(token(oAuthHelper.getSuperadminToken()))
-        .contentType(APPLICATION_JSON)
-        .content(objectMapper.writeValueAsBytes(deleteBulkRQ))).andExpect(status().isOk());
+            .contentType(APPLICATION_JSON)
+            .param("ids", "1", "2"))
+        .andExpect(status().isOk());
   }
 
   @Test
@@ -376,4 +388,4 @@ void exportUsers() throws Exception {
     mockMvc.perform(get("/v1/user/export").with(token(oAuthHelper.getSuperadminToken())))
         .andExpect(status().isOk());
   }
-}
\ No newline at end of file
+}
diff --git a/src/test/java/com/epam/ta/reportportal/ws/controller/WidgetControllerTest.java b/src/test/java/com/epam/ta/reportportal/ws/controller/WidgetControllerTest.java
index a4cfb42657..f65d3909dd 100644
--- a/src/test/java/com/epam/ta/reportportal/ws/controller/WidgetControllerTest.java
+++ b/src/test/java/com/epam/ta/reportportal/ws/controller/WidgetControllerTest.java
@@ -876,4 +876,4 @@ void getEmptyContentProductStatusGroupedByLaunchWidget() throws Exception {
         .andExpect(jsonPath("$.widgetType").value("productStatus"))
         .andExpect(jsonPath("$.content").isEmpty());
   }
-}
\ No newline at end of file
+}
diff --git a/src/test/java/com/epam/ta/reportportal/ws/validation/TicketsValidationTest.java b/src/test/java/com/epam/ta/reportportal/ws/validation/TicketsValidationTest.java
index 05e230a4d7..9e433bf7b6 100644
--- a/src/test/java/com/epam/ta/reportportal/ws/validation/TicketsValidationTest.java
+++ b/src/test/java/com/epam/ta/reportportal/ws/validation/TicketsValidationTest.java
@@ -10,6 +10,7 @@
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.HashSet;
+import java.util.Locale;
 import java.util.Set;
 import javax.validation.ConstraintViolation;
 import javax.validation.Validation;
@@ -26,6 +27,7 @@ public class TicketsValidationTest {
 
   @BeforeAll
   public static void init() {
+    Locale.setDefault(Locale.US);
     validator = Validation.buildDefaultValidatorFactory().getValidator();
   }