From fe4bca5c2942958184d196d913935fffeee931c3 Mon Sep 17 00:00:00 2001 From: Nikita Kudrin Date: Tue, 26 May 2020 18:12:42 +0300 Subject: [PATCH] fix integration with Android project. Replaced DatatypeConverter --- .gitignore | 6 ++++++ pom.xml | 2 +- src/main/java/com/codepine/api/testrail/Request.java | 8 ++++---- 3 files changed, 11 insertions(+), 5 deletions(-) create mode 100644 .gitignore diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..558768a --- /dev/null +++ b/.gitignore @@ -0,0 +1,6 @@ +# Default ignored files +/shelf/ +/workspace.xml +/.idea +/target +*.iml \ No newline at end of file diff --git a/pom.xml b/pom.xml index 700dbfc..9d782d9 100644 --- a/pom.xml +++ b/pom.xml @@ -3,7 +3,7 @@ 4.0.0 com.codepine.api testrail-api-java-client - 2.0.2-SNAPSHOT + 2.0.3-SNAPSHOT jar TestRail API Java Client diff --git a/src/main/java/com/codepine/api/testrail/Request.java b/src/main/java/com/codepine/api/testrail/Request.java index 219a859..6e642fb 100644 --- a/src/main/java/com/codepine/api/testrail/Request.java +++ b/src/main/java/com/codepine/api/testrail/Request.java @@ -44,7 +44,6 @@ import lombok.RequiredArgsConstructor; import lombok.extern.log4j.Log4j; -import javax.xml.bind.DatatypeConverter; import java.io.BufferedInputStream; import java.io.BufferedOutputStream; import java.io.IOException; @@ -55,6 +54,7 @@ import java.net.HttpURLConnection; import java.net.MalformedURLException; import java.nio.charset.Charset; +import java.util.Base64; /** * TestRail request. @@ -118,9 +118,9 @@ public T execute() { con.setRequestProperty("User-Agent", config.getApplicationName().get()); } con.setRequestProperty("Content-Type", "application/json"); - String basicAuth = "Basic " - + DatatypeConverter.printBase64Binary((config.getUsername() - + ":" + config.getPassword()).getBytes(Charset.forName("UTF-8"))); + String sourceString = config.getUsername() + ":" + config.getPassword(); + String basicAuth = "Basic " + + Base64.getEncoder().encodeToString(sourceString.getBytes(Charset.forName("UTF-8"))); con.setRequestProperty("Authorization", basicAuth); if (method == Method.POST) { con.setDoOutput(true);