- relaxed the conditions for package images a bit - missing binary data now returns null instead of throwing an exception

- lots of dependency updates

Author: JohannesJander

pom.xml

@@ -4,7 +4,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>io.frictionlessdata</groupId>
     <artifactId>datapackage-java</artifactId>
-    <version>0.9.8-SNAPSHOT</version>
+    <version>0.9.9-SNAPSHOT</version>
     <packaging>jar</packaging>
     <issueManagement>
         <url>https://github.com/frictionlessdata/datapackage-java/issues</url>
@@ -23,7 +23,7 @@
         <maven.compiler.source>${java.version}</maven.compiler.source>
         <maven.compiler.target>${java.version}</maven.compiler.target>
         <maven.compiler.compiler>${java.version}</maven.compiler.compiler>
-        <tableschema-java-version>0.9.8</tableschema-java-version>
+        <tableschema-java-version>0.9.9</tableschema-java-version>
         <junit.version>6.0.0</junit.version>
         <slf4j-simple.version>2.0.17</slf4j-simple.version>
         <apache-commons-collections4.version>4.5.0</apache-commons-collections4.version>

src/main/java/io/frictionlessdata/datapackage/JSONBase.java

@@ -336,33 +336,38 @@ private static ZipEntry findZipEntry(ZipFile zipFile, String fileName) {
         return null;
     }
 
-    protected static String getZipFileContentAsString(Path inFilePath, String fileName) throws IOException {
+    protected static String getZipFileContentAsString(Path inFilePath, String fileName, boolean strict) throws IOException {
         // Read in memory the file inside the zip.
         ZipFile zipFile = new ZipFile(inFilePath.toFile());
         ZipEntry entry = findZipEntry(zipFile, fileName);
 
-        // Throw exception if expected datapackage.json file not found.
-        if(entry == null){
-            throw new DataPackageException("The zip file does not contain the expected file: " + fileName);
+        if (entry == null) {
+            if (strict) {
+                throw new DataPackageException("The zip file does not contain the expected file: " + fileName);
+            } else {
+                return null;
+            }
         }
 
         String content;
-        // Read the datapackage.json file inside the zip
         try (InputStream stream = zipFile.getInputStream(entry)) {
             content = getFileContentAsString(stream);
         }
         zipFile.close();
         return content;
     }
 
-    protected static byte[] getZipFileContentAsByteArray(Path inFilePath, String fileName) throws IOException {
+    protected static byte[] getZipFileContentAsByteArray(Path inFilePath, String fileName, boolean strict) throws IOException {
         // Read in memory the file inside the zip.
         ZipFile zipFile = new ZipFile(inFilePath.toFile());
         ZipEntry entry = findZipEntry(zipFile, fileName);
 
-        // Throw exception if expected datapackage.json file not found.
-        if(entry == null){
-            throw new DataPackageException("The zip file does not contain the expected file: " + fileName);
+        if (entry == null) {
+            if (strict) {
+                throw new DataPackageException("The zip file does not contain the expected file: " + fileName);
+            } else {
+                return null;
+            }
         }
         try (InputStream inputStream = zipFile.getInputStream(entry);
              ByteArrayOutputStream out = new ByteArrayOutputStream()) {
@@ -380,7 +385,7 @@ public static ObjectNode dereference(File fileObj, Path basePath, boolean isArch
             if (File.separator.equals("\\")) {
                 filePath = filePath.replaceAll("\\\\", "/");
             }
-            jsonContentString = getZipFileContentAsString(basePath, filePath);
+            jsonContentString = getZipFileContentAsString(basePath, filePath, true);
         } else {
             /* If reference is file path.
                from the spec: "SECURITY: / (absolute path) and ../ (relative parent path)

src/main/java/io/frictionlessdata/datapackage/Package.java

@@ -213,7 +213,7 @@ public Package(Path descriptorFile, boolean strict) throws Exception {
             if (isArchive(descriptorFile.toFile())) {
                 isArchivePackage = true;
                 basePath = descriptorFile;
-                sourceJsonNode = createNode(JSONBase.getZipFileContentAsString(descriptorFile, DATAPACKAGE_FILENAME));
+                sourceJsonNode = createNode(JSONBase.getZipFileContentAsString(descriptorFile, DATAPACKAGE_FILENAME, true));
             } else {
                 basePath = descriptorFile.getParent();
                 String sourceJsonString = getFileContentAsString(descriptorFile);
@@ -299,7 +299,9 @@ public String getImagePath() {
 
     /**
      * Returns the image data if the image is stored inside the data package, null if {@link #getImagePath()}
-     * would return a URL
+     * would return a URL.
+     *
+     * If the referenced file does not exist in the package, return null
      *
      * @return binary image data
      */
@@ -309,7 +311,7 @@ public byte[] getImage() throws IOException {
             return imageData;
         if (!StringUtils.isEmpty(image)) {
             if (isArchivePackage) {
-                return getZipFileContentAsByteArray((Path)basePath, image);
+                return getZipFileContentAsByteArray((Path)basePath, image, false);
             } else {
                 File imgFile = new File (((Path)basePath).toFile(), image);
                 try (InputStream inputStream = new FileInputStream(imgFile);

src/main/java/io/frictionlessdata/datapackage/resource/FilebasedResource.java

@@ -96,7 +96,7 @@ public File getBasePath() {
     byte[] getRawData(File input)  throws IOException {
         if (this.isInArchive) {
             String fileName = input.getPath().replaceAll("\\\\", "/");
-            return getZipFileContentAsString (basePath.toPath(), fileName).getBytes(charset);
+            return getZipFileContentAsString (basePath.toPath(), fileName, true).getBytes(charset);
         } else {
             File file = new File(this.basePath, input.getPath());
             try (InputStream inputStream = Files.newInputStream(file.toPath())) {
@@ -133,24 +133,24 @@ public String[] getHeaders() throws Exception{
     List<Table> readData () throws Exception{
         List<Table> tables;
         if (this.isInArchive) {
-            tables = readfromZipFile();
+            tables = readFromZipFile();
         } else {
-            tables = readfromOrdinaryFile();
+            tables = readFromOrdinaryFile();
         }
         return tables;
     }
 
-    private List<Table> readfromZipFile() throws IOException {
+    private List<Table> readFromZipFile() throws IOException {
         List<Table> tables = new ArrayList<>();
         for (File file : paths) {
             String fileName = file.getPath().replaceAll("\\\\", "/");
-            String content = getZipFileContentAsString (basePath.toPath(), fileName);
+            String content = getZipFileContentAsString (basePath.toPath(), fileName, true);
             Table table = Table.fromSource(content, schema, getCsvFormat());
             tables.add(table);
         }
         return tables;
     }
-    private List<Table> readfromOrdinaryFile() throws IOException {
+    private List<Table> readFromOrdinaryFile() throws IOException {
         List<Table> tables = new ArrayList<>();
         for (File file : paths) {
                 /* from the spec: "SECURITY: / (absolute path) and ../ (relative parent path)