Bumped tableschema version

frictionlessdata · Mar 5, 2021 · 88c9d05 · 88c9d05
1 parent 0fccb8e
commit 88c9d05
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 7 deletions.
diff --git a/pom.xml b/pom.xml
@@ -19,7 +19,7 @@
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <maven.compiler.source>1.8</maven.compiler.source>
         <maven.compiler.target>1.8</maven.compiler.target>
-        <tableschema-java-version>6e87b0dbdf</tableschema-java-version>
+        <tableschema-java-version>07041c56da</tableschema-java-version>
         <hamcrest.version>1.3</hamcrest.version>
         <junit.version>5.7.1</junit.version>
         <apache-commons-collections.version>4.4</apache-commons-collections.version>

diff --git a/src/main/java/io/frictionlessdata/datapackage/Package.java b/src/main/java/io/frictionlessdata/datapackage/Package.java
@@ -438,22 +438,39 @@ public Object getProperty(String key) {
         }
         JsonNode jNode = jsonObject.get(key);
         if (jNode.isArray()) {
-            return JsonUtil.getInstance().deserialize(jNode, new TypeReference<ArrayList<?>>() {});
+            return getProperty(key, new TypeReference<ArrayList<?>>() {});
         } else if (jNode.isTextual()) {
-            return JsonUtil.getInstance().deserialize(jNode, new TypeReference<String>() {});
+            return getProperty(key, new TypeReference<String>() {});
         } else if (jNode.isBoolean()) {
-            return JsonUtil.getInstance().deserialize(jNode, new TypeReference<Boolean>() {});
+            return getProperty(key, new TypeReference<Boolean>() {});
         } else if (jNode.isFloatingPointNumber()) {
-            return JsonUtil.getInstance().deserialize(jNode, new TypeReference<BigDecimal>() {});
+            return getProperty(key, new TypeReference<BigDecimal>() {});
         } else if (jNode.isIntegralNumber()) {
-            return JsonUtil.getInstance().deserialize(jNode, new TypeReference<BigInteger>() {});
+            return getProperty(key, new TypeReference<BigInteger>() {});
         } else if (jNode.isObject()) {
-            return JsonUtil.getInstance().deserialize(jNode, new TypeReference<Object>() {});
+            return getProperty(key, new TypeReference<Object>() {});
         } else if (jNode.isNull() || jNode.isEmpty() || jNode.isMissingNode()) {
             return null;
         }
         return null;
     }
+
+    public Object getProperty(String key, TypeReference<?> typeRef) {
+        if (!this.jsonObject.has(key)) {
+            return null;
+        }
+        JsonNode jNode = jsonObject.get(key);
+        return JsonUtil.getInstance().deserialize(jNode, typeRef);
+    }
+
+    public Object getProperty(String key, Class<?> clazz) {
+        if (!this.jsonObject.has(key)) {
+            return null;
+        }
+        JsonNode jNode = jsonObject.get(key);
+        return JsonUtil.getInstance().deserialize(jNode, clazz);
+    }
+
     /**
      * Set a property and value on the Package.  The value will be converted to a JsonObject and added to the
      * datapackage.json on serialization