Apply latest bnd code
git-svn-id: https://svn.apache.org/repos/asf/felix/trunk@1349301 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/bundleplugin/src/main/java/aQute/lib/json/JSONCodec.java b/bundleplugin/src/main/java/aQute/lib/json/JSONCodec.java
index a45b5b4..fa5c751 100644
--- a/bundleplugin/src/main/java/aQute/lib/json/JSONCodec.java
+++ b/bundleplugin/src/main/java/aQute/lib/json/JSONCodec.java
@@ -53,6 +53,9 @@
private static FileHandler fh = new FileHandler();
private static ByteArrayHandler byteh = new ByteArrayHandler();
+ boolean ignorenull;
+
+
/**
* Create a new Encoder with the state and appropriate API.
*
@@ -147,7 +150,7 @@
if (Enum.class.isAssignableFrom(clazz))
h = new EnumHandler(clazz);
- else if (Collection.class.isAssignableFrom(clazz)) // A Non Generic
+ else if (Iterable.class.isAssignableFrom(clazz)) // A Non Generic
// collection
h = dch;
@@ -188,7 +191,7 @@
Type rawType = pt.getRawType();
if (rawType instanceof Class) {
Class<?> rawClass = (Class<?>) rawType;
- if (Collection.class.isAssignableFrom(rawClass))
+ if (Iterable.class.isAssignableFrom(rawClass))
h = new CollectionHandler(rawClass, pt.getActualTypeArguments()[0]);
else if (Map.class.isAssignableFrom(rawClass))
h = new MapHandler(rawClass, pt.getActualTypeArguments()[0],
@@ -478,4 +481,18 @@
+ type);
}
+ /**
+ * Ignore null values in output and input
+ * @param ignorenull
+ * @return
+ */
+ public JSONCodec setIgnorenull(boolean ignorenull) {
+ this.ignorenull = ignorenull;
+ return this;
+ }
+
+ public boolean isIgnorenull() {
+ return ignorenull;
+ }
+
}
\ No newline at end of file