diff options
Diffstat (limited to 'csarvalidation')
3 files changed, 0 insertions, 86 deletions
diff --git a/csarvalidation/pom.xml b/csarvalidation/pom.xml index 8b4c922..ea25916 100644 --- a/csarvalidation/pom.xml +++ b/csarvalidation/pom.xml @@ -77,11 +77,6 @@ </dependency> <dependency> <groupId>com.fasterxml.jackson.core</groupId> - <artifactId>jackson-databind</artifactId> - <version>2.9.4</version> - </dependency> - <dependency> - <groupId>com.fasterxml.jackson.core</groupId> <artifactId>jackson-annotations</artifactId> <version>2.9.4</version> </dependency> diff --git a/csarvalidation/src/main/java/org/onap/validation/csar/FileUtil.java b/csarvalidation/src/main/java/org/onap/validation/csar/FileUtil.java index 16faf2d..e5605ac 100644 --- a/csarvalidation/src/main/java/org/onap/validation/csar/FileUtil.java +++ b/csarvalidation/src/main/java/org/onap/validation/csar/FileUtil.java @@ -20,9 +20,6 @@ import org.slf4j.LoggerFactory; import com.fasterxml.jackson.core.JsonGenerationException; import com.fasterxml.jackson.core.JsonParseException; -import com.fasterxml.jackson.databind.DeserializationFeature; -import com.fasterxml.jackson.databind.JsonMappingException; -import com.fasterxml.jackson.databind.ObjectMapper; import java.io.File; import java.io.FileInputStream; import java.io.IOException; @@ -159,79 +156,6 @@ public final class FileUtil { File file = new File(filePath); return deleteFile(file); } - - public static boolean writeJsonDatatoFile(String fileAbsPath, Object obj) - { - logger.info("Write JsonData to file :"+fileAbsPath); - - boolean bResult = false; - if(checkFileExists(fileAbsPath)) - { - deleteFile(fileAbsPath); - } - - ObjectMapper mapper = new ObjectMapper(); - try - { - mapper.writeValue(new File(fileAbsPath), obj); - bResult = true; - } - catch (JsonGenerationException e) - { - logger.error("JSON_GENERATION" + ":" + "JsonGenerationException Exception: writeJsonDatatoFile-->"+fileAbsPath+" : " +ErrorCodes.JSON_GENERATION_ERROR+" " + e.getMessage(), e); - throw new ValidationException(ErrorCodes.JSON_GENERATION_ERROR); - } - catch (JsonMappingException e) - { - logger.error("JSON_MAPPING" + ":" + "JsonMappingException Exception: writeJsonDatatoFile-->"+fileAbsPath+" : " +ErrorCodes.JSON_MAPPING_FAILED+" " + e.getMessage(), e); - throw new ValidationException(ErrorCodes.JSON_MAPPING_FAILED); - } - catch (IOException e) - { - logger.error("FILE_IO" + ":" + "IOException Exception: writeJsonDatatoFile-->"+fileAbsPath+" : " +ErrorCodes.FILE_IO+" " + e.getMessage(), e); - throw new ValidationException(ErrorCodes.FILE_IO); - } - return bResult; - } - - public static <T> Object readJsonDatafFromFile(String fileAbsPath, Class<T> clazz) - { - if(!checkFileExists(fileAbsPath)) - { - logger.info("read JsonData from file , file not found :"+fileAbsPath); - return null; - } - - logger.info("read JsonData from file :"+fileAbsPath); - - T obj = null; - ObjectMapper mapper = new ObjectMapper(); - mapper.disable(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES); - try - { - obj = mapper.readValue(new File(fileAbsPath), clazz); - } - catch (JsonParseException e1) - { - logger.error("JSON_PARSING" + ":" + "JsonParseException Exception: writeJsonDatatoFile-->"+fileAbsPath+" : " + e1.getMessage(), e1); - logger.error("CSAR extraction error ! " +ErrorCodes.PARSE_ERROR); - throw new ValidationException(ErrorCodes.PARSE_ERROR); - } - catch (JsonMappingException e1) - { - logger.error("JSON_MAPPING" + ":" + "JsonMappingException Exception: writeJsonDatatoFile-->"+fileAbsPath+" : " + e1.getMessage(), e1); - logger.error("CSAR extraction error ! " +ErrorCodes.JSON_MAPPING_FAILED); - throw new ValidationException(ErrorCodes.JSON_MAPPING_FAILED); - } - catch (IOException e1) - { - logger.error("FILE_IO" + ":" + "IOException Exception: writeJsonDatatoFile-->"+fileAbsPath+" : " + e1.getMessage(), e1); - logger.error("CSAR extraction error ! " +ErrorCodes.FILE_IO); - throw new ValidationException(ErrorCodes.FILE_IO); - } - return obj; - } - public static boolean deleteDirectory(String path) { File file = new File(path); diff --git a/csarvalidation/src/test/java/org/onap/validation/csarvalidationtest/CsarValidatorTest.java b/csarvalidation/src/test/java/org/onap/validation/csarvalidationtest/CsarValidatorTest.java index cc1ada7..846d9af 100644 --- a/csarvalidation/src/test/java/org/onap/validation/csarvalidationtest/CsarValidatorTest.java +++ b/csarvalidation/src/test/java/org/onap/validation/csarvalidationtest/CsarValidatorTest.java @@ -132,11 +132,6 @@ public class CsarValidatorTest { assertTrue(true); } - @Test(expected = IllegalArgumentException.class) - public void testReadJsonDatafFromFile() { - FileUtil.readJsonDatafFromFile(sample1, null); - } - @Test public void testCloseZipFile() throws ZipException, IOException { File file = new File(sample1); |