Fixes in Bean-handling in BeanSchema and BeanIterator

Author: JohannesJander

pom.xml

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

src/main/java/io/frictionlessdata/tableschema/field/ReflectionUtils.java

@@ -13,19 +13,22 @@
 
 public class ReflectionUtils {
 
-    public static Map<String, String> getFieldNameMapping(ObjectMapper mapper, Class type) {
+    public static Map<String, String> getFieldNameMapping(ObjectMapper mapper, Class<?> type) {
         Map<String, String> fieldNames = new HashMap<>();
         JavaType jType = mapper.constructType(type);
         BeanDescription desc = mapper.getSerializationConfig()
                 .introspect(jType);
         List<BeanPropertyDefinition> properties = desc.findProperties();
         for (BeanPropertyDefinition def : properties) {
             AnnotatedField field = def.getField();
-            Field annotated = field.getAnnotated();
-            String fieldName = annotated.getName();
-            //String fieldName = def.getInternalName();
-            String declaredName = def.getName();
-            fieldNames.put(declaredName, fieldName);
+            // fields with names where the JsonProperty name differs from the field name create zombie
+            // entries here which we do not need.
+            if (null != field) {
+                Field annotated = field.getAnnotated();
+                String fieldName = annotated.getName();
+                String declaredName = def.getName();
+                fieldNames.put(declaredName, fieldName);
+            }
         }
         return fieldNames;
     }

src/main/java/io/frictionlessdata/tableschema/inputstream/ByteOrderMarkStrippingInputStream.java

@@ -231,13 +231,13 @@ public int read() throws IOException {
     }
 
     @Override
-    public int read(final byte b[]) throws IOException,
+    public int read(final byte[] b) throws IOException,
             NullPointerException {
         return in.read(b, 0, b.length);
     }
 
     @Override
-    public int read(final byte b[],
+    public int read(final byte[] b,
                     final int off,
                     final int len) throws IOException,
             NullPointerException {

src/main/java/io/frictionlessdata/tableschema/schema/BeanSchema.java

@@ -54,6 +54,9 @@ public static BeanSchema infer(Class<?> beanClass) throws NoSuchFieldException {
             Field<?> field;
             Class<?> declaredClass;
             String fieldMethodName = fieldNames.get(name);
+            if (null == fieldMethodName) {
+                continue;
+            }
             try {
                 java.lang.reflect.Field declaredField = beanClass.getDeclaredField(fieldMethodName);
                 declaredClass = declaredField.getType();

src/test/java/io/frictionlessdata/tableschema/beans/ExplicitNamingBean.java

@@ -21,11 +21,22 @@ public class ExplicitNamingBean {
     @JsonProperty("black")
     boolean isBlack;
 
+    @JsonProperty("visible")
+    boolean isVisibleColor;
+
     public boolean isBlack() {
         return isBlack;
     }
 
     public void setBlack(boolean black) {
         isBlack = black;
     }
+
+    public boolean isVisibleColor() {
+        return isVisibleColor;
+    }
+
+    public void setVisibleColor(boolean visibleColor) {
+        isVisibleColor = visibleColor;
+    }
 }

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

@@ -39,14 +39,6 @@ void inferASchema() throws Exception{
     @Test
     @DisplayName("Infer a Bean Schema")
     void inferExplicitNamingBeanSchema() throws Exception{
-        ObjectMapper objectMapper = new ObjectMapper();
-        Map<String, String> fieldNameMapping = new TreeMap<>(ReflectionUtils.getFieldNameMapping(objectMapper, ExplicitNamingBean.class));
-        String expectedString = TestHelper.getResourceFileContent(
-                "/fixtures/beans/explicitnamingbean.json");
-        Map<String, String> expectedFieldMap
-                = new TreeMap<>(objectMapper.readValue(expectedString, new TypeReference<Map<String, String>>() {}));
-        Assertions.assertEquals(expectedFieldMap, fieldNameMapping);
-
         Schema schema = BeanSchema.infer(ExplicitNamingBean.class);
         String expectedSchemaString = TestHelper.getResourceFileContent(
                 "/fixtures/beans/explicitnamingbean-schema.json");

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

@@ -18,6 +18,7 @@
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 import java.io.File;
 import java.io.FileInputStream;
@@ -34,8 +35,6 @@
 
 import static io.frictionlessdata.tableschema.TestHelper.getTestDataDirectory;
 import static org.hamcrest.CoreMatchers.instanceOf;
-import static org.junit.Assert.assertThat;
-import static org.junit.jupiter.api.Assertions.assertTrue;
 
 
 public class SchemaTest {
@@ -746,24 +745,15 @@ private static File getResourceFile(String fileName) throws URISyntaxException {
     }
 
 
-    @org.junit.jupiter.api.Test
-    @DisplayName("Infer a Bean Schema")
-    void inferExplicitNamingBeanSchema() throws Exception{
+    @Test
+    @DisplayName("Validate creating Field mapping from Bean")
+    void testCreateFieldMapping() throws Exception{
         ObjectMapper objectMapper = new ObjectMapper();
         Map<String, String> fieldNameMapping = new TreeMap<>(ReflectionUtils.getFieldNameMapping(objectMapper, ExplicitNamingBean.class));
         String expectedString = TestHelper.getResourceFileContent(
                 "/fixtures/beans/explicitnamingbean.json");
         Map<String, String> expectedFieldMap
                 = new TreeMap<>(objectMapper.readValue(expectedString, new TypeReference<Map<String, String>>() {}));
         Assertions.assertEquals(expectedFieldMap, fieldNameMapping);
-
-        Schema schema = BeanSchema.infer(ExplicitNamingBean.class);
-        String expectedSchemaString = TestHelper.getResourceFileContent(
-                "/fixtures/beans/explicitnamingbean-schema.json");
-        Schema expectedSchema = Schema.fromJson(expectedSchemaString, true);
-
-        Assertions.assertEquals(expectedSchema, schema);
-        // validate equals() method implementation on Schema and BeanSchema
-        Assertions.assertEquals(schema, expectedSchema);
     }
 }

src/test/resources/fixtures/beans/explicitnamingbean-schema.json

@@ -19,5 +19,9 @@
     "name" : "black",
     "type" : "boolean",
     "format" : "default"
+  }, {
+    "name" : "visible",
+    "type" : "boolean",
+    "format" : "default"
   }]
 }

src/test/resources/fixtures/beans/explicitnamingbean.json

@@ -3,5 +3,6 @@
   "blue" : "isBlue",
   "is_white" : "isWhite",
   "pink_field" : "isPink",
-  "black" : "isBlack"
+  "black" : "isBlack",
+  "visible" : "isVisibleColor"
 }