Fixes in FilebasedResource to better support nontabular data.

Fix for a bug in FilebasedResource returning the format.

Author: JohannesJander

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

@@ -400,6 +400,7 @@ static AbstractResource fromJSON(
         if (path != null){
             Collection paths = fromJSON(path, basePath);
             resource = build(name, paths, basePath, charset);
+            resource.setFormat(format);
             if (resource instanceof FilebasedResource) {
                 ((FilebasedResource)resource).setIsInArchive(isArchivePackage);
             }

src/test/java/io/frictionlessdata/datapackage/resource/NonTabularResourceTest.java

@@ -413,6 +413,7 @@ public void testCreateAndReadZippedPackageWithJsonObject() throws Exception {
         // Verify the content of the resource
         byte[] readData = (byte[]) readResource.getRawData();
         Assertions.assertArrayEquals(jsonBytes, readData);
+        Assertions.assertEquals("json", readResource.getFormat());
     }
 
 

src/test/java/io/frictionlessdata/datapackage/resource/RoundtripTest.java

@@ -183,6 +183,7 @@ private static String createCSV(String[] headers, List<Object[]> data) {
             "    \"name\" : \"test3\",\n" +
             "    \"profile\" : \"tabular-data-resource\",\n" +
             "    \"encoding\" : \"utf-8\",\n" +
+            "    \"format\" : \"csv\",\n"+
             "    \"dialect\" : \"dialect/test3.json\",\n" +
             "    \"schema\" : \"schema/population_schema.json\",\n" +
             "    \"path\" : \"data/test3.csv\"\n" +