Read from InputStreams with BOM + tests

Author: JohannesJander

pom.xml

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

src/main/java/io/frictionlessdata/tableschema/Table.java

@@ -232,8 +232,9 @@ public static Table fromSource(URL dataSource, Schema schema, CSVFormat format)
     public BeanIterator<?> iterator(Class<?> beanType, boolean relations){
         return new BeanIterator(this,  beanType, relations);
     }
+
     /**
-     * This is the simplest case to read data from a Table referencing a file or URL.
+     * This is the simplest case to read Object data from a Table referencing a file or URL.
      *
      * If a Schema is set on a table, each row will be returned as an Object array. Values in each column
      * are parsed and converted ("cast") to Java objects based on the Field definitions of the Schema. If no Schema is

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

@@ -50,7 +50,7 @@ public boolean hasReliableHeaders() {
 	public Iterator<String[]> iterator() {
 		String[] headers = getHeaders();
 
-		return Iterators.transform(((ArrayNode)dataSource).iterator(), (JsonNode input) -> {
+		return Iterators.transform(dataSource.iterator(), (JsonNode input) -> {
 			List<String> values = new ArrayList<>();
 			for (String header : headers) {
 				JsonNode val = input.get(header);

src/test/java/io/frictionlessdata/tableschema/iterator/TableBeanIteratorTest.java

@@ -28,8 +28,6 @@
 import static io.frictionlessdata.tableschema.TestHelper.getTestDataDirectory;
 
 class TableBeanIteratorTest {
-    private static Schema employeeSchema = null;
-    private static Schema employeeSchemaAlternateDateForma = null;
     private static Schema gdpSchema = null;
     private static Table employeeTable = null;
     private static Table employeeTableAlternateDateFormat = null;
@@ -39,35 +37,17 @@ class TableBeanIteratorTest {
     @BeforeEach
     void setUp() throws Exception {
         testDataDir = getTestDataDirectory();
-        File f = new File(getTestDataDirectory(), "schema/population_schema.json");
-        Schema validPopulationSchema = null;
-        try (FileInputStream fis = new FileInputStream(f)) {
-            validPopulationSchema = Schema.fromJson (fis, false);
-        }
-
-
-        File file = new File("data/employee_data.csv");
-        employeeSchema = BeanSchema.infer(EmployeeBean.class);
-        employeeTable = Table.fromSource(file, testDataDir, employeeSchema, TableDataSource.getDefaultCsvFormat());
-
-        file = new File("data/employee_alternate_date_format.csv");
-        employeeSchemaAlternateDateForma = BeanSchema.infer(EmployeeBeanWithAnnotation.class);
-        employeeTableAlternateDateFormat = Table.fromSource(
-                file,
-                testDataDir,
-                employeeSchemaAlternateDateForma,
-                TableDataSource.getDefaultCsvFormat());
-
-        file = new File("data/gdp.csv");
-        gdpSchema = BeanSchema.infer(GrossDomesticProductBean.class);
-        gdpTable = Table.fromSource(file, testDataDir, gdpSchema, TableDataSource.getDefaultCsvFormat());
 
     }
 
 
     @Test
     @DisplayName("Test deserialization of EmployeeBean")
     void testBeanDeserialization() throws Exception {
+
+        File file = new File("data/employee_data.csv");
+        employeeTable = Table.fromSource(file, testDataDir, null, TableDataSource.getDefaultCsvFormat());
+
         List<EmployeeBean> employees = new ArrayList<>();
         BeanIterator<EmployeeBean> bit = new BeanIterator<>(employeeTable, EmployeeBean.class, false);
         while (bit.hasNext()) {
@@ -91,11 +71,10 @@ void testBeanDeserialization() throws Exception {
     @DisplayName("Test deserialization of EmployeeBean with Annotation")
     void testBeanDeserialization2() throws Exception {
         File inFile = new File("data/employee_full.csv");
-        employeeSchemaAlternateDateForma = BeanSchema.infer(EmployeeBeanWithAnnotation.class);
-        employeeTableAlternateDateFormat = Table.fromSource(
+        Table employeeTableAlternateDateFormat = Table.fromSource(
                 inFile,
                 testDataDir,
-                employeeSchemaAlternateDateForma,
+                null,
                 TableDataSource.getDefaultCsvFormat());
         List<EmployeeBeanWithAnnotation> employees = new ArrayList<>();
         BeanIterator<EmployeeBeanWithAnnotation> bit = new BeanIterator<>(employeeTableAlternateDateFormat, EmployeeBeanWithAnnotation.class, false);
@@ -119,11 +98,14 @@ void testBeanDeserialization2() throws Exception {
         /*Assertions.assertEquals(45, info.get("pin"));
         Assertions.assertEquals(83.23, info.get("rate"));
         Assertions.assertEquals(90, info.get("ssn"));*/
+        System.out.println(info);
     }
 
     @Test
     @DisplayName("Test deserialization of big floats (GrossDomesticProductBean)")
     void testBeanDeserialization3() throws Exception {
+        File file = new File("data/gdp.csv");
+        gdpTable = Table.fromSource(file, testDataDir, null, TableDataSource.getDefaultCsvFormat());
         List<GrossDomesticProductBean> records = new ArrayList<>();
         BeanIterator<GrossDomesticProductBean> bit
                 = new BeanIterator<>(gdpTable, GrossDomesticProductBean.class, false);

src/test/java/io/frictionlessdata/tableschema/schema/SchemaTest.java

@@ -577,7 +577,8 @@ public void test2Issue20() throws Exception {
         Assertions.assertTrue(newSchema.isValid());
     }
 
-
+    // Test for https://github.com/frictionlessdata/tableschema-java/issues/14
+    // "schema_valid_full.json" from the Python version is named "employee_full_schema.json" here
     @Test
     public void testIssue14() throws Exception {
         Schema schema = Schema.fromJson(new File(getTestDataDirectory()

src/test/java/io/frictionlessdata/tableschema/tabledatasource/BeanTableDataSourceTest.java

@@ -61,11 +61,10 @@ void testBeanTableCreation() throws Exception {
     private static Collection<EmployeeBeanWithAnnotation> getEmployees() throws Exception {
         File testDataDir = getTestDataDirectory();
         File inFile = new File("data/employee_full.csv");
-        Schema schema = BeanSchema.infer(EmployeeBeanWithAnnotation.class);
         Table inTable = Table.fromSource(
                 inFile,
                 testDataDir,
-                schema,
+                null,
                 TableDataSource.getDefaultCsvFormat());
 
         List<EmployeeBeanWithAnnotation> employees = new ArrayList<>();