Merge remote-tracking branch 'origin/main'

Author: iSnow

pom.xml

@@ -3,7 +3,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>io.frictionlessdata</groupId>
     <artifactId>tableschema-java</artifactId>
-    <version>0.6.11-SNAPSHOT</version>
+    <version>0.6.12-SNAPSHOT</version>
     <packaging>jar</packaging>
     <issueManagement>
         <url>https://github.com/frictionlessdata/tableschema-java/issues</url>

src/main/java/io/frictionlessdata/tableschema/tabledatasource/TableDataSource.java

@@ -98,16 +98,7 @@ static TableDataSource fromSource(File input, File workDir) {
      * @return DataSource created from input String
      */
     static TableDataSource fromSource(InputStream input) {
-        String content;
-
-        try (Reader fr = new InputStreamReader(input)) {
-            try (BufferedReader rdr = new BufferedReader(fr)) {
-                content = rdr.lines().collect(Collectors.joining("\n"));
-            }
-        } catch (IOException ex) {
-            throw new TableIOException(ex);
-        }
-
+        String content = readSkippingBOM(input);
         return fromSource(content);
     }
 

src/test/java/io/frictionlessdata/tableschema/table_tests/TableBOMTests.java

@@ -44,6 +44,19 @@ public void testReadFileWithBOMAndSchema() throws Exception{
         table.setSchema(schema);
     }
 
+    @Test
+    @DisplayName("Create a Table from CSV File with BOM with Schema from Stream and with default CSVFormat")
+    public void testReadFileWithBOMAndSchemafromInputStream() throws Exception{
+        File testDataDir = getTestDataDirectory();
+        // get path of test CSV file
+        InputStream inputStream = TableBOMTests.class.getClassLoader().getResourceAsStream("fixtures/data/simple_data_bom2.tsv");
+        File f = new File(getTestDataDirectory(), "schema/simple_data_schema.json");
+        FileInputStream schemaIs = new FileInputStream(f);
+
+        Table table = Table.fromSource(inputStream, schemaIs, csvFormat);
+        table.validate();
+    }
+
     @Test
     @DisplayName("Create a Table from CSV File with BOM without a Schema from Stream " +
             "and with custom CSVFormat")