From 59d971d7b0095bbf07e079f84ec36caeb44735a3 Mon Sep 17 00:00:00 2001 From: Tomasz Golabek Date: Thu, 5 Sep 2019 10:35:58 +0200 Subject: Increasing code quality - Removal of commons-codecs - Additional code coverage Change-Id: Ib004cc3c893ea3b22f2f929e4fd211e83b203532 Issue-ID: SDC-2326 Signed-off-by: Tomasz Golabek --- .../src/main/java/org/onap/test/Decoder.java | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'sdc-distribution-ci/src/main/java/org/onap') 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(); -- cgit 1.2.3-korg