From 7679a6f8177d47116aa8dbae0b38f8b0a8174dc5 Mon Sep 17 00:00:00 2001 From: wasala Date: Tue, 7 Aug 2018 13:40:42 +0200 Subject: Fix corrections in code *FindBugs scan fixed errors *Checkstyle fixed errors Change-Id: I8553a56859de91f8886fc1518ff26e7b16c5c1d6 Issue-ID: DCAEGEN2-606 Signed-off-by: wasala --- .../services/prh/configuration/PrhAppConfig.java | 3 +- .../prh/service/DmaapConsumerJsonParser.java | 4 +-- .../services/prh/tasks/ScheduledTasks.java | 1 - .../org/onap/dcaegen2/services/prh/tasks/Task.java | 42 ---------------------- 4 files changed, 4 insertions(+), 46 deletions(-) delete mode 100644 prh-app-server/src/main/java/org/onap/dcaegen2/services/prh/tasks/Task.java (limited to 'prh-app-server/src/main/java/org/onap') diff --git a/prh-app-server/src/main/java/org/onap/dcaegen2/services/prh/configuration/PrhAppConfig.java b/prh-app-server/src/main/java/org/onap/dcaegen2/services/prh/configuration/PrhAppConfig.java index a6ed3146..ad040f6e 100644 --- a/prh-app-server/src/main/java/org/onap/dcaegen2/services/prh/configuration/PrhAppConfig.java +++ b/prh-app-server/src/main/java/org/onap/dcaegen2/services/prh/configuration/PrhAppConfig.java @@ -33,6 +33,7 @@ import java.io.IOException; import java.io.InputStream; import java.io.InputStreamReader; +import java.nio.charset.StandardCharsets; import java.util.ServiceLoader; import javax.validation.constraints.NotEmpty; import javax.validation.constraints.NotNull; @@ -119,7 +120,7 @@ public abstract class PrhAppConfig implements Config { } JsonElement getJsonElement(JsonParser parser, InputStream inputStream) { - return parser.parse(new InputStreamReader(inputStream)); + return parser.parse(new InputStreamReader(inputStream, StandardCharsets.UTF_8)); } private T deserializeType(@NotNull GsonBuilder gsonBuilder, @NotNull JsonObject jsonObject, diff --git a/prh-app-server/src/main/java/org/onap/dcaegen2/services/prh/service/DmaapConsumerJsonParser.java b/prh-app-server/src/main/java/org/onap/dcaegen2/services/prh/service/DmaapConsumerJsonParser.java index e46c97a5..1b8aaca3 100644 --- a/prh-app-server/src/main/java/org/onap/dcaegen2/services/prh/service/DmaapConsumerJsonParser.java +++ b/prh-app-server/src/main/java/org/onap/dcaegen2/services/prh/service/DmaapConsumerJsonParser.java @@ -119,11 +119,11 @@ public class DmaapConsumerJsonParser { private String printMessage(String pnfVendorName, String pnfSerialNumber, String pnfOamIpv4Address, String pnfOamIpv6Address) { - return String.format("\n{" + return String.format("%n{" + "\"pnfVendorName\" : \"%s\"," + "\"pnfSerialNumber\": \"%s\"," + "\"pnfOamIpv4Address\": \"%s\"," + "\"pnfOamIpv6Address\": \"%s\"" - + "\n}", pnfVendorName, pnfSerialNumber, pnfOamIpv4Address, pnfOamIpv6Address); + + "%n}", pnfVendorName, pnfSerialNumber, pnfOamIpv4Address, pnfOamIpv6Address); } } diff --git a/prh-app-server/src/main/java/org/onap/dcaegen2/services/prh/tasks/ScheduledTasks.java b/prh-app-server/src/main/java/org/onap/dcaegen2/services/prh/tasks/ScheduledTasks.java index e00a606d..664eb33c 100644 --- a/prh-app-server/src/main/java/org/onap/dcaegen2/services/prh/tasks/ScheduledTasks.java +++ b/prh-app-server/src/main/java/org/onap/dcaegen2/services/prh/tasks/ScheduledTasks.java @@ -20,7 +20,6 @@ package org.onap.dcaegen2.services.prh.tasks; -import java.util.Optional; import java.util.concurrent.Callable; import org.onap.dcaegen2.services.prh.exceptions.DmaapEmptyResponseException; import org.onap.dcaegen2.services.prh.exceptions.PrhTaskException; diff --git a/prh-app-server/src/main/java/org/onap/dcaegen2/services/prh/tasks/Task.java b/prh-app-server/src/main/java/org/onap/dcaegen2/services/prh/tasks/Task.java deleted file mode 100644 index c26028a7..00000000 --- a/prh-app-server/src/main/java/org/onap/dcaegen2/services/prh/tasks/Task.java +++ /dev/null @@ -1,42 +0,0 @@ -/* - * ============LICENSE_START======================================================= - * PNF-REGISTRATION-HANDLER - * ================================================================================ - * Copyright (C) 2018 NOKIA Intellectual Property. 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. - * See the License for the specific language governing permissions and - * limitations under the License. - * ============LICENSE_END========================================================= - */ -package org.onap.dcaegen2.services.prh.tasks; - -import org.onap.dcaegen2.services.prh.exceptions.PrhTaskException; - -/** - * @author Przemysław Wąsala on 4/13/18 - */ - - -public abstract class Task { - - Task taskProcess; - - protected abstract void receiveRequest(R body) throws PrhTaskException; - - protected abstract S execute(R object) throws PrhTaskException; - - protected abstract C resolveConfiguration(); - - void setNext(Task task) { - this.taskProcess = task; - } -} -- cgit 1.2.3-korg