From 069f9c0ea291ff058f0d0946cbf3360407abe00c Mon Sep 17 00:00:00 2001 From: edyta Date: Tue, 21 Apr 2020 14:37:56 +0200 Subject: Fix sonar issue KeywordsHandler RuntimeException Issue-ID: INT-1517 Signed-off-by: Edyta Krukowska Change-Id: Ib862d81a6ab3b26cfeebc2f9175ed6b6f061706c --- .../pnfsimulator/simulator/KeywordsHandler.java | 10 ++++---- .../simulator/KeywordsHandlerException.java | 28 ++++++++++++++++++++++ 2 files changed, 34 insertions(+), 4 deletions(-) create mode 100644 pnfsimulator/src/main/java/org/onap/pnfsimulator/simulator/KeywordsHandlerException.java diff --git a/pnfsimulator/src/main/java/org/onap/pnfsimulator/simulator/KeywordsHandler.java b/pnfsimulator/src/main/java/org/onap/pnfsimulator/simulator/KeywordsHandler.java index 51e0c1f..ac80647 100644 --- a/pnfsimulator/src/main/java/org/onap/pnfsimulator/simulator/KeywordsHandler.java +++ b/pnfsimulator/src/main/java/org/onap/pnfsimulator/simulator/KeywordsHandler.java @@ -24,9 +24,11 @@ import com.google.gson.JsonElement; import com.google.gson.stream.JsonReader; import com.google.gson.stream.JsonToken; import com.google.gson.stream.JsonWriter; + import java.io.IOException; import java.io.StringReader; import java.io.StringWriter; + import org.springframework.stereotype.Component; @Component @@ -43,14 +45,14 @@ public class KeywordsHandler { public JsonElement substituteKeywords(JsonElement jsonBody, String jobId) { int counter = incrementProvider.getAndIncrement(jobId); try ( - JsonReader reader = new JsonReader(new StringReader(jsonBody.toString())); - StringWriter stringWriter = new StringWriter(); - JsonWriter jsonWriter = new JsonWriter(stringWriter); + JsonReader reader = new JsonReader(new StringReader(jsonBody.toString())); + StringWriter stringWriter = new StringWriter(); + JsonWriter jsonWriter = new JsonWriter(stringWriter); ) { modify(reader, jsonWriter, counter); return new Gson().fromJson(stringWriter.getBuffer().toString(), JsonElement.class); } catch (IOException e) { - throw new RuntimeException(e); + throw new KeywordsHandlerException(e); } } diff --git a/pnfsimulator/src/main/java/org/onap/pnfsimulator/simulator/KeywordsHandlerException.java b/pnfsimulator/src/main/java/org/onap/pnfsimulator/simulator/KeywordsHandlerException.java new file mode 100644 index 0000000..9685bc3 --- /dev/null +++ b/pnfsimulator/src/main/java/org/onap/pnfsimulator/simulator/KeywordsHandlerException.java @@ -0,0 +1,28 @@ +/* + * ============LICENSE_START======================================================= + * PNF-REGISTRATION-HANDLER + * ================================================================================ + * Copyright (C) 2020 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. + * See the License for the specific language governing permissions and + * limitations under the License. + * ============LICENSE_END========================================================= + */ + +package org.onap.pnfsimulator.simulator; + +public class KeywordsHandlerException extends RuntimeException { + + public KeywordsHandlerException(Throwable cause) { + super(cause); + } +} -- cgit 1.2.3-korg