Reading from JSON Array data now works differently

JohannesJander · JohannesJander · commit 77621ce338b1 · 2025-04-04T12:16:58.000+02:00
diff --git a/src/main/java/io/frictionlessdata/tableschema/Table.java b/src/main/java/io/frictionlessdata/tableschema/Table.java
@@ -1,16 +1,16 @@
 package io.frictionlessdata.tableschema;
 
-import io.frictionlessdata.tableschema.schema.BeanSchema;
-import io.frictionlessdata.tableschema.tabledatasource.BeanTableDataSource;
-import io.frictionlessdata.tableschema.tabledatasource.CsvTableDataSource;
-import io.frictionlessdata.tableschema.tabledatasource.StringArrayTableDataSource;
-import io.frictionlessdata.tableschema.tabledatasource.TableDataSource;
 import io.frictionlessdata.tableschema.exception.*;
 import io.frictionlessdata.tableschema.field.Field;
 import io.frictionlessdata.tableschema.iterator.BeanIterator;
 import io.frictionlessdata.tableschema.iterator.SimpleTableIterator;
 import io.frictionlessdata.tableschema.iterator.TableIterator;
+import io.frictionlessdata.tableschema.schema.BeanSchema;
 import io.frictionlessdata.tableschema.schema.Schema;
+import io.frictionlessdata.tableschema.tabledatasource.BeanTableDataSource;
+import io.frictionlessdata.tableschema.tabledatasource.CsvTableDataSource;
+import io.frictionlessdata.tableschema.tabledatasource.StringArrayTableDataSource;
+import io.frictionlessdata.tableschema.tabledatasource.TableDataSource;
 import io.frictionlessdata.tableschema.util.JsonUtil;
 import io.frictionlessdata.tableschema.util.TableSchemaUtil;
 import org.apache.commons.csv.CSVFormat;
diff --git a/src/main/java/io/frictionlessdata/tableschema/exception/ValidationException.java b/src/main/java/io/frictionlessdata/tableschema/exception/ValidationException.java
@@ -1,11 +1,10 @@
 package io.frictionlessdata.tableschema.exception;
 
 import com.networknt.schema.ValidationMessage;
-import io.frictionlessdata.tableschema.schema.FormalSchemaValidator;
 
-import java.util.*;
-import java.util.function.Function;
-import java.util.stream.Collectors;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
 
 public class ValidationException extends TableSchemaException {
 	List<String> validationMessages = new ArrayList<>();
diff --git a/src/main/java/io/frictionlessdata/tableschema/field/ArrayField.java b/src/main/java/io/frictionlessdata/tableschema/field/ArrayField.java
@@ -4,11 +4,13 @@
 import io.frictionlessdata.tableschema.exception.InvalidCastException;
 import io.frictionlessdata.tableschema.exception.JsonParsingException;
 import io.frictionlessdata.tableschema.exception.TypeInferringException;
-import io.frictionlessdata.tableschema.schema.TypeInferrer;
 import io.frictionlessdata.tableschema.util.JsonUtil;
 
 import java.net.URI;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
+import java.util.Map;
 import java.util.stream.Collectors;
 
 
diff --git a/src/main/java/io/frictionlessdata/tableschema/field/BooleanField.java b/src/main/java/io/frictionlessdata/tableschema/field/BooleanField.java
@@ -7,7 +7,6 @@
 
 import java.net.URI;
 import java.util.*;
-import java.util.stream.Collectors;
 
 public class BooleanField extends Field<Boolean> {
     @JsonIgnore
diff --git a/src/main/java/io/frictionlessdata/tableschema/field/DateField.java b/src/main/java/io/frictionlessdata/tableschema/field/DateField.java
@@ -7,7 +7,6 @@
 import java.net.URI;
 import java.time.LocalDate;
 import java.time.format.DateTimeFormatter;
-import java.time.format.DateTimeParseException;
 import java.time.temporal.TemporalAccessor;
 import java.util.Map;
 import java.util.regex.Matcher;
diff --git a/src/main/java/io/frictionlessdata/tableschema/field/Field.java b/src/main/java/io/frictionlessdata/tableschema/field/Field.java
@@ -15,7 +15,6 @@
 import java.util.*;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
-import java.util.stream.Collectors;
 
 /**
  * Definition of a field in a data table. Doesn't hold values
diff --git a/src/main/java/io/frictionlessdata/tableschema/field/FieldInferrer.java b/src/main/java/io/frictionlessdata/tableschema/field/FieldInferrer.java
@@ -2,16 +2,13 @@
 
 import com.fasterxml.jackson.databind.JsonNode;
 import com.google.common.util.concurrent.AtomicDouble;
-import io.frictionlessdata.tableschema.util.JsonUtil;
 import org.locationtech.jts.geom.Coordinate;
 
 import java.lang.reflect.Array;
 import java.math.BigDecimal;
 import java.math.BigInteger;
 import java.time.LocalDate;
 import java.time.LocalTime;
-import java.util.Arrays;
-import java.util.Base64;
 import java.util.Collection;
 import java.util.UUID;
 import java.util.concurrent.atomic.AtomicInteger;
diff --git a/src/main/java/io/frictionlessdata/tableschema/field/IntegerField.java b/src/main/java/io/frictionlessdata/tableschema/field/IntegerField.java
@@ -4,7 +4,6 @@
 import io.frictionlessdata.tableschema.exception.InvalidCastException;
 import io.frictionlessdata.tableschema.exception.TypeInferringException;
 
-import java.math.BigDecimal;
 import java.math.BigInteger;
 import java.net.URI;
 import java.util.Map;
diff --git a/src/main/java/io/frictionlessdata/tableschema/fk/Reference.java b/src/main/java/io/frictionlessdata/tableschema/fk/Reference.java
@@ -2,14 +2,10 @@
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.databind.JsonNode;
-import com.fasterxml.jackson.databind.node.ArrayNode;
 import io.frictionlessdata.tableschema.exception.ForeignKeyException;
 import io.frictionlessdata.tableschema.exception.ValidationException;
 import io.frictionlessdata.tableschema.util.JsonUtil;
 
-import java.net.MalformedURLException;
-import java.net.URL;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Collections;
diff --git a/src/main/java/io/frictionlessdata/tableschema/iterator/BeanIterator.java b/src/main/java/io/frictionlessdata/tableschema/iterator/BeanIterator.java
@@ -19,7 +19,10 @@
 import java.math.BigInteger;
 import java.time.LocalDate;
 import java.time.LocalTime;
-import java.util.*;
+import java.util.Arrays;
+import java.util.Base64;
+import java.util.Collection;
+import java.util.UUID;
 import java.util.concurrent.atomic.AtomicInteger;
 import java.util.concurrent.atomic.AtomicLong;
 
diff --git a/src/main/java/io/frictionlessdata/tableschema/iterator/TableIterator.java b/src/main/java/io/frictionlessdata/tableschema/iterator/TableIterator.java
@@ -1,11 +1,13 @@
 package io.frictionlessdata.tableschema.iterator;
 
 import io.frictionlessdata.tableschema.Table;
-import io.frictionlessdata.tableschema.exception.TableValidationException;
 import io.frictionlessdata.tableschema.field.Field;
 import io.frictionlessdata.tableschema.schema.Schema;
 
-import java.util.*;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.LinkedHashMap;
+import java.util.Map;
 
 /**
  * Iterator that can read data from a Table in the various permutations
diff --git a/src/main/java/io/frictionlessdata/tableschema/schema/FormalSchemaValidator.java b/src/main/java/io/frictionlessdata/tableschema/schema/FormalSchemaValidator.java
@@ -1,16 +1,13 @@
 package io.frictionlessdata.tableschema.schema;
 
 import com.fasterxml.jackson.databind.JsonNode;
-import com.networknt.schema.*;
+import com.networknt.schema.JsonSchema;
+import com.networknt.schema.JsonSchemaFactory;
 import com.networknt.schema.SpecVersion.VersionFlag;
-import com.networknt.schema.serialization.JsonNodeReader;
-import io.frictionlessdata.tableschema.exception.ValidationException;
+import com.networknt.schema.ValidationMessage;
 import io.frictionlessdata.tableschema.util.JsonUtil;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 
 import java.io.InputStream;
-import java.util.LinkedHashSet;
 import java.util.Set;
 import java.util.function.Consumer;
 
diff --git a/src/main/java/io/frictionlessdata/tableschema/schema/Schema.java b/src/main/java/io/frictionlessdata/tableschema/schema/Schema.java
@@ -5,7 +5,10 @@
 import com.fasterxml.jackson.core.type.TypeReference;
 import com.networknt.schema.ValidationMessage;
 import io.frictionlessdata.tableschema.Table;
-import io.frictionlessdata.tableschema.exception.*;
+import io.frictionlessdata.tableschema.exception.PrimaryKeyException;
+import io.frictionlessdata.tableschema.exception.TableSchemaException;
+import io.frictionlessdata.tableschema.exception.TypeInferringException;
+import io.frictionlessdata.tableschema.exception.ValidationException;
 import io.frictionlessdata.tableschema.field.Field;
 import io.frictionlessdata.tableschema.fk.ForeignKey;
 import io.frictionlessdata.tableschema.io.FileReference;
diff --git a/src/main/java/io/frictionlessdata/tableschema/tabledatasource/AbstractTableDataSource.java b/src/main/java/io/frictionlessdata/tableschema/tabledatasource/AbstractTableDataSource.java
@@ -2,10 +2,7 @@
 
 import java.io.File;
 import java.io.IOException;
-import java.net.URL;
 import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collection;
 import java.util.List;
 
 /**
diff --git a/src/main/java/io/frictionlessdata/tableschema/tabledatasource/BeanTableDataSource.java b/src/main/java/io/frictionlessdata/tableschema/tabledatasource/BeanTableDataSource.java
@@ -1,26 +1,15 @@
 package io.frictionlessdata.tableschema.tabledatasource;
 
 import com.fasterxml.jackson.core.type.TypeReference;
-import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.introspect.AnnotatedField;
 import com.fasterxml.jackson.databind.node.ArrayNode;
-import com.fasterxml.jackson.databind.node.ObjectNode;
 import com.google.common.collect.Iterators;
 import io.frictionlessdata.tableschema.annotations.FieldFormat;
 import io.frictionlessdata.tableschema.field.Field;
 import io.frictionlessdata.tableschema.schema.BeanSchema;
 import io.frictionlessdata.tableschema.util.JsonUtil;
 
-import java.io.BufferedReader;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.ParameterizedType;
-import java.lang.reflect.Type;
-import java.nio.charset.StandardCharsets;
 import java.util.*;
-import java.util.stream.Collectors;
 
 /**
  * Implements a {@link TableDataSource} based on a Java Bean class.
diff --git a/src/main/java/io/frictionlessdata/tableschema/tabledatasource/CsvTableDataSource.java b/src/main/java/io/frictionlessdata/tableschema/tabledatasource/CsvTableDataSource.java
@@ -1,13 +1,11 @@
 package io.frictionlessdata.tableschema.tabledatasource;
 
-import com.fasterxml.jackson.databind.node.ArrayNode;
 import com.google.common.collect.Iterators;
 import io.frictionlessdata.tableschema.exception.TableSchemaException;
 import io.frictionlessdata.tableschema.util.JsonUtil;
 import org.apache.commons.csv.CSVFormat;
 import org.apache.commons.csv.CSVParser;
 import org.apache.commons.csv.CSVRecord;
-import org.apache.commons.lang3.StringUtils;
 
 import java.io.*;
 import java.net.URL;
diff --git a/src/main/java/io/frictionlessdata/tableschema/tabledatasource/JsonArrayTableDataSource.java b/src/main/java/io/frictionlessdata/tableschema/tabledatasource/JsonArrayTableDataSource.java
@@ -6,8 +6,10 @@
 import com.google.common.collect.Iterators;
 import io.frictionlessdata.tableschema.util.JsonUtil;
 
-import java.io.*;
-import java.net.URL;
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
 import java.nio.charset.StandardCharsets;
 import java.util.*;
 import java.util.stream.Collectors;
diff --git a/src/main/java/io/frictionlessdata/tableschema/util/JsonUtil.java b/src/main/java/io/frictionlessdata/tableschema/util/JsonUtil.java
@@ -1,8 +1,6 @@
 package io.frictionlessdata.tableschema.util;
 
 import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonSetter;
-import com.fasterxml.jackson.annotation.Nulls;
 import com.fasterxml.jackson.core.JsonParser;
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.core.json.JsonReadFeature;
diff --git a/src/main/java/io/frictionlessdata/tableschema/util/ReflectionUtil.java b/src/main/java/io/frictionlessdata/tableschema/util/ReflectionUtil.java
@@ -3,14 +3,12 @@
 import com.fasterxml.jackson.annotation.JsonAutoDetect;
 import com.fasterxml.jackson.databind.BeanDescription;
 import com.fasterxml.jackson.databind.JavaType;
-import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.introspect.AnnotatedField;
 import com.fasterxml.jackson.databind.introspect.BeanPropertyDefinition;
 import com.fasterxml.jackson.dataformat.csv.CsvMapper;
 
 import java.lang.reflect.Field;
 import java.util.HashMap;
-import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
 
diff --git a/src/test/java/io/frictionlessdata/tableschema/DocumentationCases.java b/src/test/java/io/frictionlessdata/tableschema/DocumentationCases.java
@@ -2,10 +2,10 @@
 
 import com.fasterxml.jackson.databind.ObjectMapper;
 import io.frictionlessdata.tableschema.beans.SimpleDataBean;
-import io.frictionlessdata.tableschema.tabledatasource.TableDataSource;
 import io.frictionlessdata.tableschema.field.*;
 import io.frictionlessdata.tableschema.iterator.BeanIterator;
 import io.frictionlessdata.tableschema.schema.Schema;
+import io.frictionlessdata.tableschema.tabledatasource.TableDataSource;
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;
 
diff --git a/src/test/java/io/frictionlessdata/tableschema/field/FieldCastTest.java b/src/test/java/io/frictionlessdata/tableschema/field/FieldCastTest.java
@@ -3,9 +3,9 @@
 import com.fasterxml.jackson.databind.JsonNode;
 import io.frictionlessdata.tableschema.Table;
 import io.frictionlessdata.tableschema.TestHelper;
-import io.frictionlessdata.tableschema.tabledatasource.TableDataSource;
 import io.frictionlessdata.tableschema.exception.InvalidCastException;
 import io.frictionlessdata.tableschema.schema.Schema;
+import io.frictionlessdata.tableschema.tabledatasource.TableDataSource;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;
diff --git a/src/test/java/io/frictionlessdata/tableschema/field/FieldOptionsTest.java b/src/test/java/io/frictionlessdata/tableschema/field/FieldOptionsTest.java
@@ -2,9 +2,9 @@
 
 import io.frictionlessdata.tableschema.Table;
 import io.frictionlessdata.tableschema.TestHelper;
-import io.frictionlessdata.tableschema.tabledatasource.TableDataSource;
 import io.frictionlessdata.tableschema.exception.InvalidCastException;
 import io.frictionlessdata.tableschema.schema.Schema;
+import io.frictionlessdata.tableschema.tabledatasource.TableDataSource;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;
diff --git a/src/test/java/io/frictionlessdata/tableschema/fk/ForeignKeyTest.java b/src/test/java/io/frictionlessdata/tableschema/fk/ForeignKeyTest.java
@@ -6,7 +6,6 @@
 import io.frictionlessdata.tableschema.exception.ForeignKeyException;
 import io.frictionlessdata.tableschema.exception.ValidationException;
 import io.frictionlessdata.tableschema.schema.Schema;
-import io.frictionlessdata.tableschema.util.JsonUtil;
 import org.apache.commons.csv.CSVFormat;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.DisplayName;
diff --git a/src/test/java/io/frictionlessdata/tableschema/fk/ReferenceTest.java b/src/test/java/io/frictionlessdata/tableschema/fk/ReferenceTest.java
@@ -1,7 +1,6 @@
 package io.frictionlessdata.tableschema.fk;
 
 import io.frictionlessdata.tableschema.exception.ForeignKeyException;
-import io.frictionlessdata.tableschema.util.JsonUtil;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;
diff --git a/src/test/java/io/frictionlessdata/tableschema/iterator/TableBeanIteratorTest.java b/src/test/java/io/frictionlessdata/tableschema/iterator/TableBeanIteratorTest.java
@@ -6,10 +6,9 @@
 import io.frictionlessdata.tableschema.beans.EmployeeBeanWithAnnotation;
 import io.frictionlessdata.tableschema.beans.GrossDomesticProductBean;
 import io.frictionlessdata.tableschema.beans.NumbersBean;
-import io.frictionlessdata.tableschema.tabledatasource.TableDataSource;
 import io.frictionlessdata.tableschema.field.DateField;
-import io.frictionlessdata.tableschema.schema.BeanSchema;
 import io.frictionlessdata.tableschema.schema.Schema;
+import io.frictionlessdata.tableschema.tabledatasource.TableDataSource;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.DisplayName;
diff --git a/src/test/java/io/frictionlessdata/tableschema/iterator/TableIteratorTest.java b/src/test/java/io/frictionlessdata/tableschema/iterator/TableIteratorTest.java
@@ -3,9 +3,9 @@
 import com.fasterxml.jackson.databind.ObjectMapper;
 import io.frictionlessdata.tableschema.Table;
 import io.frictionlessdata.tableschema.TestHelper;
-import io.frictionlessdata.tableschema.tabledatasource.TableDataSource;
 import io.frictionlessdata.tableschema.exception.InvalidCastException;
 import io.frictionlessdata.tableschema.schema.Schema;
+import io.frictionlessdata.tableschema.tabledatasource.TableDataSource;
 import org.apache.commons.csv.CSVFormat;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.BeforeEach;
diff --git a/src/test/java/io/frictionlessdata/tableschema/schema/SchemaInferralTests.java b/src/test/java/io/frictionlessdata/tableschema/schema/SchemaInferralTests.java
@@ -5,7 +5,6 @@
 import io.frictionlessdata.tableschema.TestHelper;
 import io.frictionlessdata.tableschema.beans.EmployeeBeanWithAnnotation;
 import io.frictionlessdata.tableschema.beans.ExplicitNamingBean;
-import io.frictionlessdata.tableschema.util.JsonUtil;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;
diff --git a/src/test/java/io/frictionlessdata/tableschema/schema/SchemaTest.java b/src/test/java/io/frictionlessdata/tableschema/schema/SchemaTest.java
@@ -2,15 +2,17 @@
 
 import com.fasterxml.jackson.core.type.TypeReference;
 import com.fasterxml.jackson.databind.ObjectMapper;
-import com.fasterxml.jackson.databind.node.ArrayNode;
 import io.frictionlessdata.tableschema.Table;
 import io.frictionlessdata.tableschema.TestHelper;
 import io.frictionlessdata.tableschema.beans.EmployeeBean;
 import io.frictionlessdata.tableschema.beans.ExplicitNamingBean;
 import io.frictionlessdata.tableschema.exception.ForeignKeyException;
 import io.frictionlessdata.tableschema.exception.PrimaryKeyException;
 import io.frictionlessdata.tableschema.exception.ValidationException;
-import io.frictionlessdata.tableschema.field.*;
+import io.frictionlessdata.tableschema.field.BooleanField;
+import io.frictionlessdata.tableschema.field.Field;
+import io.frictionlessdata.tableschema.field.IntegerField;
+import io.frictionlessdata.tableschema.field.StringField;
 import io.frictionlessdata.tableschema.fk.ForeignKey;
 import io.frictionlessdata.tableschema.fk.Reference;
 import io.frictionlessdata.tableschema.util.JsonUtil;
@@ -22,11 +24,8 @@
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.IOException;
-import java.net.URISyntaxException;
 import java.net.URL;
 import java.nio.file.Files;
-import java.nio.file.Path;
-import java.nio.file.Paths;
 import java.util.*;
 
 import static io.frictionlessdata.tableschema.TestHelper.getResourceFile;
diff --git a/src/test/java/io/frictionlessdata/tableschema/table_tests/TableBOMTests.java b/src/test/java/io/frictionlessdata/tableschema/table_tests/TableBOMTests.java
@@ -13,7 +13,6 @@
 import java.io.*;
 import java.nio.charset.Charset;
 import java.nio.charset.StandardCharsets;
-import java.nio.file.Files;
 import java.util.stream.Collectors;
 
 import static io.frictionlessdata.tableschema.TestHelper.getTestDataDirectory;
diff --git a/src/test/java/io/frictionlessdata/tableschema/table_tests/TableConstructorTest.java b/src/test/java/io/frictionlessdata/tableschema/table_tests/TableConstructorTest.java
@@ -1,8 +1,8 @@
 package io.frictionlessdata.tableschema.table_tests;
 
 import io.frictionlessdata.tableschema.Table;
-import io.frictionlessdata.tableschema.tabledatasource.JsonArrayTableDataSource;
 import io.frictionlessdata.tableschema.schema.Schema;
+import io.frictionlessdata.tableschema.tabledatasource.JsonArrayTableDataSource;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;
diff --git a/src/test/java/io/frictionlessdata/tableschema/table_tests/TableCreationTest.java b/src/test/java/io/frictionlessdata/tableschema/table_tests/TableCreationTest.java
diff --git a/src/test/java/io/frictionlessdata/tableschema/table_tests/TableIterationTest.java b/src/test/java/io/frictionlessdata/tableschema/table_tests/TableIterationTest.java
diff --git a/src/test/java/io/frictionlessdata/tableschema/table_tests/TableOtherTest.java b/src/test/java/io/frictionlessdata/tableschema/table_tests/TableOtherTest.java
diff --git a/src/test/java/io/frictionlessdata/tableschema/tabledatasource/BeanTableDataSourceTest.java b/src/test/java/io/frictionlessdata/tableschema/tabledatasource/BeanTableDataSourceTest.java
