summaryrefslogtreecommitdiffstats
path: root/sdc-distribution-ci
diff options
context:
space:
mode:
authorOfir Sonsino <os0695@intl.att.com>2019-10-15 20:48:56 +0300
committerOfir Sonsino <os0695@intl.att.com>2019-10-15 20:48:56 +0300
commitb6ac738434954b586b751f7a04ff3d1ea94f1460 (patch)
tree3c8fe01ba26473dbcfdda9e6a927962029cd80bc /sdc-distribution-ci
parent75b5636a5ecb293b021409e287d4c22481c1aa90 (diff)
Aligning elalto branch to 1.4.05.0.2-ONAP1.4.0elalto
Change-Id: Iaca7575f385ee448b54ccaf1f8c2b9b6668a3739 Issue-ID: SDC-2504 Signed-off-by: Ofir Sonsino <os0695@intl.att.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, 15 insertions, 8 deletions
diff --git a/sdc-distribution-ci/pom.xml b/sdc-distribution-ci/pom.xml
index 7b32b37..1914d07 100644
--- a/sdc-distribution-ci/pom.xml
+++ b/sdc-distribution-ci/pom.xml
@@ -45,6 +45,13 @@
</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 fc029ff..384d26d 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,14 +3,13 @@
* 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.
@@ -24,21 +23,22 @@ package org.onap.test;
import java.io.BufferedReader;
import java.io.FileReader;
import java.io.IOException;
-import java.util.Base64;
+import org.apache.commons.codec.binary.Base64;
public class Decoder {
public static String encode(byte[] byteArrayToEncode) {
- return new String(Base64.getEncoder().encode(byteArrayToEncode));
+ return new String(Base64.encodeBase64(byteArrayToEncode));
}
public static String decode(String strEncoded) {
- return new String(Base64.getDecoder().decode(strEncoded));
+ return new String(Base64.decodeBase64(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();