summaryrefslogtreecommitdiffstats
path: root/sdc-distribution-ci
diff options
context:
space:
mode:
authorTomasz Golabek <tomasz.golabek@nokia.com>2019-09-05 10:35:58 +0200
committerTomasz Golabek <tomasz.golabek@nokia.com>2019-09-05 10:35:58 +0200
commit59d971d7b0095bbf07e079f84ec36caeb44735a3 (patch)
tree9076c557454967355dd8a4f30faa1e3cecc82cb0 /sdc-distribution-ci
parenta6906f05493e09a0a0787ac5dbd3066407b13827 (diff)
Increasing code quality
- Removal of commons-codecs - Additional code coverage Change-Id: Ib004cc3c893ea3b22f2f929e4fd211e83b203532 Issue-ID: SDC-2326 Signed-off-by: Tomasz Golabek <tomasz.golabek@nokia.com>
Diffstat (limited to 'sdc-distribution-ci')
-rw-r--r--sdc-distribution-ci/pom.xml7
-rw-r--r--sdc-distribution-ci/src/main/java/org/onap/test/Decoder.java16
2 files changed, 8 insertions, 15 deletions
diff --git a/sdc-distribution-ci/pom.xml b/sdc-distribution-ci/pom.xml
index 1914d07..7b32b37 100644
--- a/sdc-distribution-ci/pom.xml
+++ b/sdc-distribution-ci/pom.xml
@@ -45,13 +45,6 @@
</dependency>
<dependency>
- <groupId>commons-codec</groupId>
- <artifactId>commons-codec</artifactId>
- <version>1.9</version>
- <scope>compile</scope>
- </dependency>
-
- <dependency>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-classic</artifactId>
<version>${logback.version}</version>
diff --git a/sdc-distribution-ci/src/main/java/org/onap/test/Decoder.java b/sdc-distribution-ci/src/main/java/org/onap/test/Decoder.java
index 384d26d..fc029ff 100644
--- a/sdc-distribution-ci/src/main/java/org/onap/test/Decoder.java
+++ b/sdc-distribution-ci/src/main/java/org/onap/test/Decoder.java
@@ -3,13 +3,14 @@
* sdc-distribution-client
* ================================================================================
* Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * Modifications copyright (C) 2019 Nokia. All rights reserved.
* ================================================================================
* 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.
@@ -23,22 +24,21 @@ package org.onap.test;
import java.io.BufferedReader;
import java.io.FileReader;
import java.io.IOException;
-import org.apache.commons.codec.binary.Base64;
+import java.util.Base64;
public class Decoder {
public static String encode(byte[] byteArrayToEncode) {
- return new String(Base64.encodeBase64(byteArrayToEncode));
+ return new String(Base64.getEncoder().encode(byteArrayToEncode));
}
public static String decode(String strEncoded) {
- return new String(Base64.decodeBase64(strEncoded));
+ return new String(Base64.getDecoder().decode(strEncoded));
}
public static String readFileToString(String file) throws IOException {
- try (FileReader fileReader = new FileReader(file);
- BufferedReader reader = new BufferedReader(fileReader)) {
+ try (FileReader fileReader = new FileReader(file); BufferedReader reader = new BufferedReader(fileReader)) {
String line;
StringBuilder stringBuilder = new StringBuilder();
String ls = System.getProperty("line.separator");
@@ -47,7 +47,7 @@ public class Decoder {
stringBuilder.append(line);
stringBuilder.append(ls);
}
-
+
reader.close();
fileReader.close();
return stringBuilder.toString();