Fixes in FilebasedResource to better support nontabular data.

Fix for a bug in FilebasedResource returning the format.

Author: JohannesJander

pom.xml

@@ -4,7 +4,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>io.frictionlessdata</groupId>
     <artifactId>datapackage-java</artifactId>
-    <version>0.9.6-SNAPSHOT</version>
+    <version>0.9.7-SNAPSHOT</version>
     <packaging>jar</packaging>
     <issueManagement>
         <url>https://github.com/frictionlessdata/datapackage-java/issues</url>

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

@@ -765,13 +765,15 @@ public void writeData(Writer out) throws Exception {
     @Override
     public void writeData(Path outputDir) throws Exception {
         Dialect lDialect = (null != dialect) ? dialect : Dialect.DEFAULT;
-        List<Table> tables = getTables();
+        boolean isNonTabular = ((profile != null) && (profile.equals(Profile.PROFILE_DATA_RESOURCE_DEFAULT)));
+        isNonTabular = (isNonTabular | (null == serializationFormat));
+        List<Table> tables = isNonTabular ? null : getTables();
+
         Set<String> paths = getDatafileNamesForWriting();
 
         int cnt = 0;
         for (String fName : paths) {
             String fileName = fName+"."+getSerializationFormat();
-            Table t  = tables.get(cnt++);
             Path p;
             FileSystem fileSystem = outputDir.getFileSystem();
             if (outputDir.toString().isEmpty()) {
@@ -784,27 +786,21 @@ public void writeData(Path outputDir) throws Exception {
             }
             Files.deleteIfExists(p);
 
-            // if the serializationFormat is set, serialize the data to JSON/CSV file
-            if (null != serializationFormat) {
+
+            if (isNonTabular) {
+                byte [] data = (byte[])this.getRawData();
+                try (OutputStream out = Files.newOutputStream(p)) {
+                    out.write(data);
+                }
+            } else {
+                Table t  = tables.get(cnt++);
                 try (Writer wr = Files.newBufferedWriter(p, StandardCharsets.UTF_8)) {
                     if (serializationFormat.equals(TableDataSource.Format.FORMAT_CSV.getLabel())) {
                         t.writeCsv(wr, lDialect.toCsvFormat());
                     } else if (serializationFormat.equals(TableDataSource.Format.FORMAT_JSON.getLabel())) {
                         wr.write(t.asJson());
                     }
                 }
-            } else {
-                // if serializationFormat is not set (probably non-tabular data), serialize the data to a binary file
-                byte [] data = (byte[])this.getRawData();
-                try (OutputStream out = Files.newOutputStream(p)) {
-                    out.write(data);
-                }
-                /*} else {
-                    try (FileOutputStream fos = new FileOutputStream(p.toFile())){
-                        fos.write(data);
-                    }
-                }*/
-
             }
         }
     }

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

@@ -74,7 +74,7 @@ public FilebasedResource(String name, Collection<File> paths, File basePath) {
     public String getSerializationFormat() {
         if (null != serializationFormat)
             return serializationFormat;
-        if (null == format) {
+        if (null != format) {
             return format;
         }
         return sniffFormat(paths);

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

@@ -351,6 +351,70 @@ public void testUnCompressedDatapackageWithPdfResource() throws Exception {
         Assertions.assertEquals("application/pdf", readResource.getMediaType());
     }
 
+    @Test
+    @DisplayName("Test creating ZIP-compressed datapackage with JSON ObjectNode as FilebasedResource")
+    public void testCreateAndReadZippedPackageWithJsonObject() throws Exception {
+        // Create temporary directories for source and output
+        Path tempDirPath = Files.createTempDirectory("datapackage-source-");
+        Path locPath = tempDirPath.resolve("data");
+        Files.createDirectories(locPath);
+        //Path tempOutputPath = Files.createTempDirectory("datapackage-output-");
+        Path tempOutputPath = tempDirPath;
+
+                // Create an ObjectNode and write it to a temporary file
+        ObjectMapper mapper = new ObjectMapper();
+        ObjectNode jsonData = mapper.createObjectNode();
+        jsonData.put("key", "value");
+        jsonData.put("number", 123);
+        byte[] jsonBytes = mapper.writeValueAsBytes(jsonData);
+
+        File jsonFile = new File(locPath.toFile(), "data.json");
+        Files.write(jsonFile.toPath(), jsonBytes);
+
+        // Create a FilebasedResource for the JSON file
+        FilebasedResource jsonResource = new FilebasedResource(
+                "json-data",
+                List.of(new File("data/data.json")),
+                tempDirPath.toFile()
+        );
+
+        // Set resource properties
+        jsonResource.setProfile(Profile.PROFILE_DATA_RESOURCE_DEFAULT);
+        jsonResource.setFormat("json");
+        jsonResource.setMediaType("application/json");
+        jsonResource.setEncoding("UTF-8");
+
+        // Create a package with the resource
+        List<Resource> resources = new ArrayList<>();
+        resources.add(jsonResource);
+        Package pkg = new Package(resources);
+        pkg.setName("json-package");
+
+        // Write the package to a compressed ZIP file
+        File zipFile = new File(tempOutputPath.toFile(), "datapackage.zip");
+        pkg.write(zipFile, true);
+
+        // Verify the ZIP file was created
+        Assertions.assertTrue(zipFile.exists());
+        Assertions.assertTrue(zipFile.length() > 0);
+
+        // Read the package back from the ZIP file
+        Package readPackage = new Package(zipFile.toPath(), true);
+
+        // Verify package properties
+        Assertions.assertEquals("json-package", readPackage.getName());
+        Assertions.assertEquals(1, readPackage.getResources().size());
+
+        // Verify the JSON resource
+        Resource<?> readResource = readPackage.getResource("json-data");
+        Assertions.assertNotNull(readResource);
+        Assertions.assertEquals("application/json", readResource.getMediaType());
+
+        // Verify the content of the resource
+        byte[] readData = (byte[]) readResource.getRawData();
+        Assertions.assertArrayEquals(jsonBytes, readData);
+    }
+
 
     /**
      * A non-tabular resource

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

@@ -100,7 +100,6 @@ void validateCreateResourceDescriptorRoundtrip() throws Exception {
         Path tempDirPath = Files.createTempDirectory("datapackage-");
         File createdFile = new File(tempDirPath.toFile(), "test_save_datapackage.zip");
         pkg.write(createdFile, true);
-        System.out.println(tempDirPath);
 
         // create new Package from the serialized form and check they are equal
         Package testPkg = new Package(createdFile.toPath(), true);