From 47edf03875f2aef572d96198a3dc0434c30e7039 Mon Sep 17 00:00:00 2001 From: Vadzim Hushchanskou Date: Wed, 27 Mar 2024 15:34:00 +0300 Subject: [PATCH 1/2] Dependency update --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 2891385..541de80 100644 --- a/build.gradle +++ b/build.gradle @@ -52,7 +52,7 @@ dependencies { testImplementation 'org.mockito:mockito-core:3.3.3' testImplementation 'org.mockito:mockito-junit-jupiter:3.3.3' testImplementation 'ch.qos.logback:logback-classic:1.3.12' - testImplementation 'com.epam.reportportal:logger-java-logback:5.2.0' + testImplementation 'com.epam.reportportal:logger-java-logback:5.2.2' testImplementation ("org.junit.platform:junit-platform-runner:${project.junit_runner_version}") { exclude module: 'junit' } From df25f7b5d860d2462e9b6725fc5232655886151b Mon Sep 17 00:00:00 2001 From: Vadzim Hushchanskou Date: Thu, 4 Apr 2024 15:48:36 +0300 Subject: [PATCH 2/2] Dependencies update --- CHANGELOG.md | 4 ++++ build.gradle | 7 +++---- .../epam/reportportal/cucumber/AbstractReporter.java | 12 ++---------- .../epam/reportportal/cucumber/EmbeddingTest.java | 2 +- 4 files changed, 10 insertions(+), 15 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index e1afc00..8f8e534 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,10 @@ # Changelog ## [Unreleased] +### Changed +- Client version updated on [5.2.13](https://github.com/reportportal/client-java/releases/tag/5.2.13), by @HardNorth +### Removed +- `OkHttp` dependency, by @HardNorth ## [5.2.1] ### Changed diff --git a/build.gradle b/build.gradle index 541de80..3fc1a26 100644 --- a/build.gradle +++ b/build.gradle @@ -37,15 +37,14 @@ repositories { } dependencies { - api 'com.epam.reportportal:client-java:5.2.4' - api 'com.google.code.findbugs:jsr305:3.0.2' + api 'com.epam.reportportal:client-java:5.2.13' api "io.cucumber:cucumber-java:${project.cucumber_version}" - implementation 'com.squareup.okhttp3:okhttp:4.12.0' implementation 'org.slf4j:slf4j-api:2.0.7' - testImplementation 'com.epam.reportportal:agent-java-test-utils:0.0.2' + testImplementation 'com.epam.reportportal:agent-java-test-utils:0.0.6' + testImplementation 'com.squareup.okhttp3:okhttp:4.12.0' testImplementation 'org.aspectj:aspectjweaver:1.9.19' testImplementation "io.cucumber:cucumber-testng:${project.cucumber_version}" testImplementation 'org.hamcrest:hamcrest-core:2.2' diff --git a/src/main/java/com/epam/reportportal/cucumber/AbstractReporter.java b/src/main/java/com/epam/reportportal/cucumber/AbstractReporter.java index dae7931..af95a12 100644 --- a/src/main/java/com/epam/reportportal/cucumber/AbstractReporter.java +++ b/src/main/java/com/epam/reportportal/cucumber/AbstractReporter.java @@ -27,6 +27,7 @@ import com.epam.reportportal.service.tree.TestItemTree; import com.epam.reportportal.utils.*; import com.epam.reportportal.utils.files.ByteSource; +import com.epam.reportportal.utils.http.ContentType; import com.epam.reportportal.utils.markdown.MarkdownUtils; import com.epam.reportportal.utils.properties.SystemAttributesExtractor; import com.epam.ta.reportportal.ws.model.FinishExecutionRQ; @@ -46,7 +47,6 @@ import gherkin.ast.Tag; import gherkin.pickles.*; import io.reactivex.Maybe; -import okhttp3.MediaType; import org.apache.commons.lang3.tuple.Pair; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -535,15 +535,7 @@ private static String getDataType(@Nonnull byte[] data) { * @param data data to attach */ protected void embedding(String mimeType, byte[] data) { - String type = ofNullable(mimeType).filter(m -> { - try { - MediaType.get(m); - return true; - } catch (IllegalArgumentException e) { - LOGGER.warn("Incorrect media type '{}'", m); - return false; - } - }).orElseGet(() -> getDataType(data)); + String type = ofNullable(mimeType).filter(ContentType::isValidType).orElseGet(() -> getDataType(data)); String attachmentName = ofNullable(type).map(t -> t.substring(0, t.indexOf("/"))).orElse(""); ReportPortal.emitLog(new ReportPortalMessage(ByteSource.wrap(data), type, attachmentName), "UNKNOWN", diff --git a/src/test/java/com/epam/reportportal/cucumber/EmbeddingTest.java b/src/test/java/com/epam/reportportal/cucumber/EmbeddingTest.java index 05e1094..ee10f08 100644 --- a/src/test/java/com/epam/reportportal/cucumber/EmbeddingTest.java +++ b/src/test/java/com/epam/reportportal/cucumber/EmbeddingTest.java @@ -140,7 +140,7 @@ public void verify_text_embedding() { List types = getTypes(logCaptor, logs); assertThat(types, hasSize(3)); - assertThat(types, containsInAnyOrder("text/plain", "image/png", "application/octet-stream")); + assertThat(types, containsInAnyOrder("text/plain", "image/png", "text/plain")); } @Test