From 1742765899bf6d904c6db9625afdb6b4c0e6f007 Mon Sep 17 00:00:00 2001 From: Andrei Piankouski Date: Mon, 23 Oct 2023 15:39:58 +0300 Subject: [PATCH 1/3] EPMRPP-87223 || Fix duplicated logs --- .../ws/rabbit/AsyncReportingListener.java | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) 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 bccbac8713..8b0e41284b 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 @@ -296,14 +296,16 @@ private void createItemLog(SaveLogRQ request, TestItem item, BinaryDataMetaInfo Launch effectiveLaunch = testItemService.getEffectiveLaunch(item); logService.saveLogMessageToElasticSearch(log, effectiveLaunch.getId()); - saveAttachment(request.getFile().getName(), metaInfo, - log.getId(), - projectId, - effectiveLaunch.getId(), - item.getItemId(), - effectiveLaunch.getUuid(), - log.getUuid() - ); + if (Objects.nonNull(request.getFile())) { + saveAttachment(request.getFile().getName(), metaInfo, + log.getId(), + projectId, + effectiveLaunch.getId(), + item.getItemId(), + effectiveLaunch.getUuid(), + log.getUuid() + ); + } } private void createLaunchLog(SaveLogRQ request, Launch launch, BinaryDataMetaInfo metaInfo, From 53bddd17f2eb207a0a454b9edaf75f5fc35ee8f0 Mon Sep 17 00:00:00 2001 From: Andrei Piankouski Date: Mon, 23 Oct 2023 15:46:11 +0300 Subject: [PATCH 2/3] EPMRPP-87223 || Iterate release version --- .github/workflows/release.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index d6d1335791..11f7c0cd29 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -11,7 +11,7 @@ on: env: GH_USER_NAME: github.actor - RELEASE_VERSION: 5.10.0 + RELEASE_VERSION: 5.10.1 REPOSITORY_URL: 'https://maven.pkg.github.com/' jobs: From 8fa6cc588b8423d5d7446725d92fda7046cef0fd Mon Sep 17 00:00:00 2001 From: Andrei Piankouski Date: Mon, 23 Oct 2023 16:00:35 +0300 Subject: [PATCH 3/3] EPMRPP-87223 || Fix checkstyle --- .../ws/rabbit/AsyncReportingListener.java | 20 +++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) 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 8b0e41284b..574610eeef 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 @@ -296,16 +296,16 @@ private void createItemLog(SaveLogRQ request, TestItem item, BinaryDataMetaInfo Launch effectiveLaunch = testItemService.getEffectiveLaunch(item); logService.saveLogMessageToElasticSearch(log, effectiveLaunch.getId()); - if (Objects.nonNull(request.getFile())) { - saveAttachment(request.getFile().getName(), metaInfo, - log.getId(), - projectId, - effectiveLaunch.getId(), - item.getItemId(), - effectiveLaunch.getUuid(), - log.getUuid() - ); - } + if (Objects.nonNull(request.getFile())) { + saveAttachment(request.getFile().getName(), metaInfo, + log.getId(), + projectId, + effectiveLaunch.getId(), + item.getItemId(), + effectiveLaunch.getUuid(), + log.getUuid() + ); + } } private void createLaunchLog(SaveLogRQ request, Launch launch, BinaryDataMetaInfo metaInfo,