Version bump of Tableschema lib.

Allow Packages to hold images

Author: JohannesJander

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

@@ -8,6 +8,7 @@
 import com.fasterxml.jackson.databind.node.TextNode;
 import io.frictionlessdata.datapackage.exceptions.DataPackageException;
 import io.frictionlessdata.datapackage.exceptions.DataPackageFileOrUrlNotFoundException;
+import io.frictionlessdata.datapackage.exceptions.DataPackageValidationException;
 import io.frictionlessdata.datapackage.resource.Resource;
 import io.frictionlessdata.tableschema.exception.JsonParsingException;
 import io.frictionlessdata.tableschema.io.FileReference;
@@ -291,6 +292,8 @@ static String getFileContentAsString(URL url) {
         try {
             return getFileContentAsString(url.openStream());
         } catch (Exception ex) {
+            if (ex instanceof FileNotFoundException)
+                throw new DataPackageValidationException(ex.getMessage(), ex);
             throw new DataPackageException(ex);
         }
     }

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

@@ -13,6 +13,7 @@
 import io.frictionlessdata.datapackage.resource.AbstractDataResource;
 import io.frictionlessdata.datapackage.resource.AbstractReferencebasedResource;
 import io.frictionlessdata.datapackage.resource.Resource;
+import io.frictionlessdata.tableschema.exception.JsonParsingException;
 import io.frictionlessdata.tableschema.exception.ValidationException;
 import io.frictionlessdata.tableschema.io.LocalFileReference;
 import io.frictionlessdata.tableschema.schema.Schema;
@@ -111,7 +112,12 @@ public Package(String jsonStringSource, Path basePath, boolean strict) throws Ex
         this.basePath = basePath;
 
     	// Create and set the JsonNode for the String representation of descriptor JSON object.
-        this.setJson((ObjectNode) JsonUtil.getInstance().createNode(jsonStringSource));
+        try {
+            this.setJson((ObjectNode) JsonUtil.getInstance().createNode(jsonStringSource));
+        } catch(JsonParsingException ex) {
+            throw new DataPackageException(ex.getMessage(), ex);
+        }
+
     }
 
     /**
@@ -796,7 +802,7 @@ private void addResource(Resource resource, boolean validate)
             throws IOException, ValidationException, DataPackageException{
         DataPackageException dpe = null;
         if (resource.getName() == null){
-            dpe = new DataPackageException("Invalid Resource, it does not have a name property.");
+            dpe = new DataPackageValidationException("Invalid Resource, it does not have a name property.");
         }
         if (resource instanceof AbstractDataResource)
             addResource((AbstractDataResource) resource, validate);
@@ -811,7 +817,7 @@ private void addResource(AbstractDataResource resource, boolean validate)
         DataPackageException dpe = null;
         // If a name property isn't given...
         if ((resource.getDataProperty() == null) || (resource).getFormat() == null) {
-            dpe = new DataPackageException("Invalid Resource. The data and format properties cannot be null.");
+            dpe = new DataPackageValidationException("Invalid Resource. The data and format properties cannot be null.");
         } else {
             dpe = checkDuplicates(resource);
         }
@@ -825,7 +831,7 @@ private void addResource(AbstractReferencebasedResource resource, boolean valida
             throws IOException, ValidationException, DataPackageException{
         DataPackageException dpe = null;
         if (resource.getPaths() == null) {
-            dpe = new DataPackageException("Invalid Resource. The path property cannot be null.");
+            dpe = new DataPackageValidationException("Invalid Resource. The path property cannot be null.");
         } else {
             dpe = checkDuplicates(resource);
         }

src/main/java/io/frictionlessdata/datapackage/exceptions/DataPackageValidationException.java

@@ -31,4 +31,12 @@ public DataPackageValidationException(String msg) {
     public DataPackageValidationException(Throwable t) {
         super(t.getMessage(), t);
     }
+    /**
+     * Constructs an instance of <code>DataPackageException</code> by wrapping a Throwable
+     *
+     * @param t the wrapped exception.
+     */
+    public DataPackageValidationException(String msg, Throwable t) {
+        super(msg, t);
+    }
 }

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

@@ -4,6 +4,7 @@
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonInclude.Include;
 import io.frictionlessdata.datapackage.exceptions.DataPackageException;
+import io.frictionlessdata.datapackage.exceptions.DataPackageValidationException;
 import io.frictionlessdata.tableschema.Table;
 import io.frictionlessdata.tableschema.tabledatasource.TableDataSource;
 
@@ -39,7 +40,7 @@ public FilebasedResource(String name, Collection<File> paths, File basePath, Cha
         super(name, paths);
         this.encoding = encoding.name();
         if (null == paths) {
-            throw new DataPackageException("Invalid Resource. " +
+            throw new DataPackageValidationException("Invalid Resource. " +
                     "The path property cannot be null for file-based Resources.");
         }
         this.setSerializationFormat(sniffFormat(paths));
@@ -52,7 +53,7 @@ public FilebasedResource(String name, Collection<File> paths, File basePath, Cha
                https://frictionlessdata.io/specs/data-resource/index.html#url-or-path
              */
             if (path.isAbsolute()) {
-                throw new DataPackageException("Path entries for file-based Resources cannot be absolute");
+                throw new DataPackageValidationException("Path entries for file-based Resources cannot be absolute");
             }
         }
         serializeToFile = true;

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

@@ -8,6 +8,7 @@
 import io.frictionlessdata.datapackage.Dialect;
 import io.frictionlessdata.datapackage.JSONBase;
 import io.frictionlessdata.datapackage.exceptions.DataPackageException;
+import io.frictionlessdata.datapackage.exceptions.DataPackageValidationException;
 import io.frictionlessdata.tableschema.Table;
 import io.frictionlessdata.tableschema.iterator.TableIterator;
 import io.frictionlessdata.tableschema.schema.Schema;
@@ -417,7 +418,7 @@ static AbstractResource build(ObjectNode resourceJson, Object basePath, boolean
                     // from the spec: " a JSON string - in this case the format or
                     // mediatype properties MUST be provided
                     // https://specs.frictionlessdata.io/data-resource/#data-inline-data
-                    throw new DataPackageException(
+                    throw new DataPackageValidationException(
                             "Invalid Resource. The format property cannot be null for inlined CSV data.");
                 }
                 resource = new JSONDataResource(name, data.toString());
@@ -426,7 +427,7 @@ static AbstractResource build(ObjectNode resourceJson, Object basePath, boolean
             else if (format.equals(Resource.FORMAT_CSV))
                 resource = new CSVDataResource(name, data.toString());
         } else {
-            throw new DataPackageException(
+            throw new DataPackageValidationException(
                     "Invalid Resource. The path property or the data and format properties cannot be null.");
         }
         resource.setDialect(dialect);