Merge pull request #52 from reportportal/develop

Release

CHANGELOG.md

@@ -1,6 +1,8 @@
 # Changelog
 
 ## [Unreleased]
+### Changed
+- Client version updated on [5.2.0](https://github.com/reportportal/client-java/releases/tag/5.2.0), by @HardNorth
 
 ## [5.1.8]
 ### Changed

README.md

@@ -1,6 +1,6 @@
 # Log4j2 appender for Report Portal
 
-[![Maven Central](https://img.shields.io/maven-central/v/com.epam.reportportal/logger-java-log4j.svg?label=Maven%20Central)](https://search.maven.org/search?q=g:%22com.epam.reportportal%22%20AND%20a:%22logger-java-log4j%22)
+[![Maven Central](https://img.shields.io/maven-central/v/com.epam.reportportal/logger-java-log4j.svg?label=Maven%20Central)](https://central.sonatype.com/artifact/com.epam.reportportal/logger-java-log4j)
 [![CI Build](https://github.com/reportportal/logger-java-log4j/actions/workflows/ci.yml/badge.svg)](https://github.com/reportportal/logger-java-log4j/actions/workflows/ci.yml)
 [![codecov](https://codecov.io/gh/reportportal/logger-java-log4j/branch/develop/graph/badge.svg?token=iEy7fURz1P)](https://codecov.io/gh/reportportal/logger-java-log4j)
 [![Join Slack chat!](https://slack.epmrpp.reportportal.io/badge.svg)](https://slack.epmrpp.reportportal.io/)

README_TEMPLATE.md

@@ -1,6 +1,6 @@
 # Log4j2 appender for Report Portal
 
-[![Maven Central](https://img.shields.io/maven-central/v/com.epam.reportportal/logger-java-log4j.svg?label=Maven%20Central)](https://search.maven.org/search?q=g:%22com.epam.reportportal%22%20AND%20a:%22logger-java-log4j%22)
+[![Maven Central](https://img.shields.io/maven-central/v/com.epam.reportportal/logger-java-log4j.svg?label=Maven%20Central)](https://central.sonatype.com/artifact/com.epam.reportportal/logger-java-log4j)
 [![CI Build](https://github.com/reportportal/logger-java-log4j/actions/workflows/ci.yml/badge.svg)](https://github.com/reportportal/logger-java-log4j/actions/workflows/ci.yml)
 [![codecov](https://codecov.io/gh/reportportal/logger-java-log4j/branch/develop/graph/badge.svg?token=iEy7fURz1P)](https://codecov.io/gh/reportportal/logger-java-log4j)
 [![Join Slack chat!](https://slack.epmrpp.reportportal.io/badge.svg)](https://slack.epmrpp.reportportal.io/)

build.gradle

@@ -37,7 +37,7 @@ repositories {
 dependencies {
     implementation "org.apache.logging.log4j:log4j-core:${log4j_version}"
     annotationProcessor "org.apache.logging.log4j:log4j-core:${log4j_version}"
-    implementation 'com.epam.reportportal:client-java:5.1.22'
+    implementation 'com.epam.reportportal:client-java:5.2.0'
     implementation 'com.epam.reportportal:commons-model:5.0.0'
 
     testImplementation 'com.epam.reportportal:agent-java-test-utils:0.0.2'
@@ -53,6 +53,7 @@ dependencies {
     testImplementation "org.mockito:mockito-core:${project.mockito_version}"
     testImplementation "org.mockito:mockito-junit-jupiter:${project.mockito_version}"
     testImplementation 'org.apache.commons:commons-io:1.3.2'
+    testImplementation 'com.squareup.okhttp3:okhttp:4.12.0'
 }
 
 test {

gradle.properties

@@ -1,5 +1,5 @@
-version=5.1.9-SNAPSHOT
-description=EPAM Report portal. Log4j Intergration
+version=5.2.0-SNAPSHOT
+description=EPAM Report portal. Log4j Integration
 scripts_url=https://raw.githubusercontent.com/reportportal/gradle-scripts
 scripts_branch=master
 junit_version=5.6.3

src/main/java/com/epam/ta/reportportal/log4j/appender/ReportPortalLog4j2Appender.java

@@ -17,6 +17,7 @@
 
 import com.epam.reportportal.message.ReportPortalMessage;
 import com.epam.reportportal.message.TypeAwareByteSource;
+import com.epam.reportportal.utils.files.Utils;
 import com.epam.ta.reportportal.ws.model.log.SaveLogRQ;
 import org.apache.logging.log4j.core.Filter;
 import org.apache.logging.log4j.core.Layout;
@@ -38,8 +39,6 @@
 import java.util.UUID;
 
 import static com.epam.reportportal.service.ReportPortal.emitLog;
-import static com.epam.reportportal.utils.MimeTypeDetector.detect;
-import static com.google.common.io.Files.asByteSource;
 
 /**
  * Log4j2 appender for report portal
@@ -105,7 +104,7 @@ public void append(final LogEvent logEvent) {
 						message = rpMessage.getMessage();
 					} else if (objectMessage instanceof File) {
 						final File file = (File) objectMessage;
-						byteSource = new TypeAwareByteSource(asByteSource(file), detect(file));
+						byteSource = Utils.getFile(file);
 						message = "File reported";
 
 					} else {

src/test/java/com/epam/ta/reportportal/log4j/appender/ReportPortalLog4j2AppenderTest.java

@@ -6,8 +6,8 @@
 import com.epam.reportportal.service.ReportPortalClient;
 import com.epam.reportportal.service.logs.LoggingSubscriber;
 import com.epam.reportportal.util.test.CommonUtils;
+import com.epam.reportportal.utils.files.ByteSource;
 import com.epam.ta.reportportal.ws.model.BatchSaveOperatingRS;
-import com.google.common.io.ByteSource;
 import io.reactivex.Maybe;
 import io.reactivex.Scheduler;
 import io.reactivex.schedulers.Schedulers;