diff options
author | Bharat saraswal <bharat.saraswal@huawei.com> | 2017-09-19 21:31:18 +0530 |
---|---|---|
committer | Bharat saraswal <bharat.saraswal@huawei.com> | 2017-09-22 04:14:50 +0000 |
commit | 699852522db59909e8a6cd0fc4f9e592ed800542 (patch) | |
tree | f76d54d5c3d7b3131dc59e66df1fa9875271b08b /dcae-analytics-model/src/main/java/org/openecomp/dcae/apod/analytics/model/util/AnalyticsModelIOUtils.java | |
parent | 2c0f2bface56c0cd36bdb1707bc5648792b2e712 (diff) |
Fixing checkstyle and javadoc errors
(followed:onap-java-style) removed redundant code. merged all changes in one commit for one repo.
Issue-Id:DCAEGEN2-92
Change-Id: I072e02dbedd93c01fcf3a297170cb2f7286b3b72
Signed-off-by: Bharat saraswal <bharat.saraswal@huawei.com>
Diffstat (limited to 'dcae-analytics-model/src/main/java/org/openecomp/dcae/apod/analytics/model/util/AnalyticsModelIOUtils.java')
-rw-r--r-- | dcae-analytics-model/src/main/java/org/openecomp/dcae/apod/analytics/model/util/AnalyticsModelIOUtils.java | 23 |
1 files changed, 9 insertions, 14 deletions
diff --git a/dcae-analytics-model/src/main/java/org/openecomp/dcae/apod/analytics/model/util/AnalyticsModelIOUtils.java b/dcae-analytics-model/src/main/java/org/openecomp/dcae/apod/analytics/model/util/AnalyticsModelIOUtils.java index d6d5dc2..df1d46d 100644 --- a/dcae-analytics-model/src/main/java/org/openecomp/dcae/apod/analytics/model/util/AnalyticsModelIOUtils.java +++ b/dcae-analytics-model/src/main/java/org/openecomp/dcae/apod/analytics/model/util/AnalyticsModelIOUtils.java @@ -22,15 +22,14 @@ package org.openecomp.dcae.apod.analytics.model.util; import com.fasterxml.jackson.core.JsonParseException; import com.fasterxml.jackson.databind.JsonMappingException; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - import java.io.FileNotFoundException; import java.io.IOException; import java.io.InputStream; import java.io.InputStreamReader; import java.nio.charset.Charset; import java.util.Properties; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * Utility class containing methods for IO related operations @@ -50,8 +49,9 @@ public abstract class AnalyticsModelIOUtils extends AnalyticsModelJsonUtils { * @param <T> binding Class Type * * @return binding Class Object which properties populated from JSON File Location + * @throws IOException when fails to do IO operations */ - public static final <T> T convertToJsonObject(String fileLocation, Class<T> bindingClass) { + public static final <T> T convertToJsonObject(String fileLocation, Class<T> bindingClass) throws IOException { // Load Resource from give path final InputStream resourceAsStream = loadResourceAsStream(fileLocation); @@ -59,14 +59,13 @@ public abstract class AnalyticsModelIOUtils extends AnalyticsModelJsonUtils { // If resource is null throw an exception if (resourceAsStream == null) { final String errorMessage = String.format("Invalid File location: %s", fileLocation); - throw new RuntimeException(errorMessage, new FileNotFoundException(errorMessage)); + throw new IOException(errorMessage, new FileNotFoundException(errorMessage)); } // Parse input stream try (InputStreamReader inputStreamReader = new InputStreamReader(resourceAsStream, Charset.forName("UTF-8"))) { return ANALYTICS_MODEL_OBJECT_MAPPER.readValue(inputStreamReader, bindingClass); - } catch (JsonMappingException | JsonParseException e) { // If parsing fails due to Invalid Json or Json IO Issues throw an exception @@ -74,17 +73,14 @@ public abstract class AnalyticsModelIOUtils extends AnalyticsModelJsonUtils { fileLocation); LOG.error(errorMessage); - throw new RuntimeException(errorMessage, e); - + throw new IOException(errorMessage, e); } catch (IOException e) { // If parsing fails due to IO Issues throw an exception final String errorMessage = String.format("IO Error while parsing Json File location: %s", fileLocation); LOG.error(errorMessage); - throw new RuntimeException(errorMessage, e); - + throw new IOException(errorMessage, e); } - } /** @@ -105,7 +101,8 @@ public abstract class AnalyticsModelIOUtils extends AnalyticsModelJsonUtils { // If properties file is not present throw an exception if (propertiesFileInputStream == null) { final String errorMessage = String.format("Invalid Properties File at location: %s", - propertiesFileLocation); + propertiesFileLocation); + //TODO: discuss and change this excpeiton as well. throw new RuntimeException(errorMessage, new FileNotFoundException(errorMessage)); } @@ -132,6 +129,4 @@ public abstract class AnalyticsModelIOUtils extends AnalyticsModelJsonUtils { // Load Resource from give path return Thread.currentThread().getContextClassLoader().getResourceAsStream(fileLocation); } - - } |