From 699f195e74c09b6a47cefc406bee01d5e69bb388 Mon Sep 17 00:00:00 2001 From: wasala Date: Tue, 22 May 2018 12:42:16 +0200 Subject: Improve tests in PrhAppConfig Change-Id: I23b3bd3ba89d9df7451a7e2251b1bfc98adf3a2b Issue-ID: DCAEGEN2-396 Signed-off-by: wasala --- .../onap/dcaegen2/services/prh/configuration/PrhAppConfig.java | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'prh-app-server/src/main/java/org') 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 ece1621d..6d24ade6 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 @@ -84,7 +84,7 @@ public abstract class PrhAppConfig implements Config { JsonParser parser = new JsonParser(); JsonObject jsonObject; try (InputStream inputStream = getInputStream(filepath)) { - JsonElement rootElement = parser.parse(new InputStreamReader(inputStream)); + JsonElement rootElement = getJsonElement(parser, inputStream); if (rootElement.isJsonObject()) { jsonObject = rootElement.getAsJsonObject(); aaiClientConfiguration = deserializeType(gsonBuilder, @@ -99,8 +99,6 @@ public abstract class PrhAppConfig implements Config { jsonObject.getAsJsonObject(CONFIG).getAsJsonObject(DMAAP).getAsJsonObject(DMAAP_PRODUCER), DmaapPublisherConfiguration.class); } - } catch (FileNotFoundException e) { - logger.warn("File doesn't exist in filepath: {}", filepath, e); } catch (IOException e) { logger.warn("Problem with file loading, file: {}", filepath, e); } catch (JsonSyntaxException e) { @@ -108,12 +106,16 @@ public abstract class PrhAppConfig implements Config { } } + JsonElement getJsonElement(JsonParser parser, InputStream inputStream) { + return parser.parse(new InputStreamReader(inputStream)); + } + private T deserializeType(@NotNull GsonBuilder gsonBuilder, @NotNull JsonObject jsonObject, @NotNull Class type) { return gsonBuilder.create().fromJson(jsonObject, type); } - InputStream getInputStream(@NotNull String filepath) throws FileNotFoundException { + InputStream getInputStream(@NotNull String filepath) throws IOException { return new BufferedInputStream(new FileInputStream(filepath)); } -- cgit 1.2.3-korg