Author: gk
Date: Wed May 20 14:40:52 2015
New Revision: 1680582
URL: http://svn.apache.org/r1680582
Log:
- rename methods
- include child class filtering if filter Class is parent class.
- set version to 1.1.0 instead of 1.0.1 as API has changes and major changes
in jackson 2 module.
Added:
turbine/fulcrum/trunk/json/jackson2/src/test/org/apache/fulcrum/json/jackson/BeanChild.java
(with props)
Modified:
turbine/fulcrum/trunk/json/api/pom.xml
turbine/fulcrum/trunk/json/dist/ (props changed)
turbine/fulcrum/trunk/json/dist/pom.xml
turbine/fulcrum/trunk/json/gson/pom.xml
turbine/fulcrum/trunk/json/jackson/pom.xml
turbine/fulcrum/trunk/json/jackson2/ (props changed)
turbine/fulcrum/trunk/json/jackson2/pom.xml
turbine/fulcrum/trunk/json/jackson2/src/java/org/apache/fulcrum/json/jackson/CacheService.java
turbine/fulcrum/trunk/json/jackson2/src/java/org/apache/fulcrum/json/jackson/Jackson2MapperService.java
turbine/fulcrum/trunk/json/jackson2/src/java/org/apache/fulcrum/json/jackson/SimpleNameIntrospector.java
turbine/fulcrum/trunk/json/jackson2/src/test/org/apache/fulcrum/json/jackson/DefaultServiceTest.java
turbine/fulcrum/trunk/json/pom.xml
turbine/fulcrum/trunk/json/src/changes/changes.xml
Modified: turbine/fulcrum/trunk/json/api/pom.xml
URL:
http://svn.apache.org/viewvc/turbine/fulcrum/trunk/json/api/pom.xml?rev=1680582&r1=1680581&r2=1680582&view=diff
==============================================================================
--- turbine/fulcrum/trunk/json/api/pom.xml (original)
+++ turbine/fulcrum/trunk/json/api/pom.xml Wed May 20 14:40:52 2015
@@ -19,14 +19,14 @@
<parent>
<artifactId>fulcrum-json-parent</artifactId>
<groupId>org.apache.fulcrum</groupId>
- <version>1.0.1-SNAPSHOT</version>
+ <version>1.1.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.fulcrum</groupId>
<artifactId>fulcrum-json-api</artifactId>
<name>Fulcrum JSON API</name>
- <version>1.0.1-SNAPSHOT</version>
+ <version>1.1.0-SNAPSHOT</version>
<description>Fulcrum JSON Basic API</description>
<url>http://turbine.apache.org/fulcrum/fulcrum-json/fulcrum-json-api</url>
Propchange: turbine/fulcrum/trunk/json/dist/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Wed May 20 14:40:52 2015
@@ -1,3 +1,3 @@
-.settings
-
.project
+.settings
+target
Modified: turbine/fulcrum/trunk/json/dist/pom.xml
URL:
http://svn.apache.org/viewvc/turbine/fulcrum/trunk/json/dist/pom.xml?rev=1680582&r1=1680581&r2=1680582&view=diff
==============================================================================
--- turbine/fulcrum/trunk/json/dist/pom.xml (original)
+++ turbine/fulcrum/trunk/json/dist/pom.xml Wed May 20 14:40:52 2015
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.fulcrum</groupId>
<artifactId>fulcrum-json-parent</artifactId>
- <version>1.0.1-SNAPSHOT</version>
+ <version>1.1.0-SNAPSHOT</version>
</parent>
<groupId>org.apache.fulcrum</groupId>
<artifactId>fulcrum-json-dist</artifactId>
Modified: turbine/fulcrum/trunk/json/gson/pom.xml
URL:
http://svn.apache.org/viewvc/turbine/fulcrum/trunk/json/gson/pom.xml?rev=1680582&r1=1680581&r2=1680582&view=diff
==============================================================================
--- turbine/fulcrum/trunk/json/gson/pom.xml (original)
+++ turbine/fulcrum/trunk/json/gson/pom.xml Wed May 20 14:40:52 2015
@@ -19,14 +19,14 @@
<parent>
<artifactId>fulcrum-json-parent</artifactId>
<groupId>org.apache.fulcrum</groupId>
- <version>1.0.1-SNAPSHOT</version>
+ <version>1.1.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.fulcrum</groupId>
<artifactId>fulcrum-json-gson</artifactId>
<name>Fulcrum JSON GSON Impl</name>
- <version>1.0.1-SNAPSHOT</version>
+ <version>1.1.0-SNAPSHOT</version>
<url>http://turbine.apache.org/fulcrum/fulcrum-json/fulcrum-json-gson</url>
<scm>
Modified: turbine/fulcrum/trunk/json/jackson/pom.xml
URL:
http://svn.apache.org/viewvc/turbine/fulcrum/trunk/json/jackson/pom.xml?rev=1680582&r1=1680581&r2=1680582&view=diff
==============================================================================
--- turbine/fulcrum/trunk/json/jackson/pom.xml (original)
+++ turbine/fulcrum/trunk/json/jackson/pom.xml Wed May 20 14:40:52 2015
@@ -19,14 +19,14 @@
<parent>
<artifactId>fulcrum-json-parent</artifactId>
<groupId>org.apache.fulcrum</groupId>
- <version>1.0.1-SNAPSHOT</version>
+ <version>1.1.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.fulcrum</groupId>
<artifactId>fulcrum-json-jackson</artifactId>
<name>Fulcrum JSON Jackson Impl</name>
- <version>1.0.1-SNAPSHOT</version>
+ <version>1.1.0-SNAPSHOT</version>
<url>http://turbine.apache.org/fulcrum/fulcrum-json/fulcrum-json-jackson</url>
<scm>
Propchange: turbine/fulcrum/trunk/json/jackson2/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Wed May 20 14:40:52 2015
@@ -1,7 +1,5 @@
-target
-
.classpath
-
+.idea
.project
-
.settings
+target
Modified: turbine/fulcrum/trunk/json/jackson2/pom.xml
URL:
http://svn.apache.org/viewvc/turbine/fulcrum/trunk/json/jackson2/pom.xml?rev=1680582&r1=1680581&r2=1680582&view=diff
==============================================================================
--- turbine/fulcrum/trunk/json/jackson2/pom.xml (original)
+++ turbine/fulcrum/trunk/json/jackson2/pom.xml Wed May 20 14:40:52 2015
@@ -19,14 +19,14 @@
<parent>
<artifactId>fulcrum-json-parent</artifactId>
<groupId>org.apache.fulcrum</groupId>
- <version>1.0.1-SNAPSHOT</version>
+ <version>1.1.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.fulcrum</groupId>
<artifactId>fulcrum-json-jackson2</artifactId>
<name>Fulcrum JSON Jackson 2.x Impl</name>
- <version>1.0.1-SNAPSHOT</version>
+ <version>1.1.0-SNAPSHOT</version>
<url>http://turbine.apache.org/fulcrum/fulcrum-json/fulcrum-json-jackson2</url>
<scm>
Modified:
turbine/fulcrum/trunk/json/jackson2/src/java/org/apache/fulcrum/json/jackson/CacheService.java
URL:
http://svn.apache.org/viewvc/turbine/fulcrum/trunk/json/jackson2/src/java/org/apache/fulcrum/json/jackson/CacheService.java?rev=1680582&r1=1680581&r2=1680582&view=diff
==============================================================================
---
turbine/fulcrum/trunk/json/jackson2/src/java/org/apache/fulcrum/json/jackson/CacheService.java
(original)
+++
turbine/fulcrum/trunk/json/jackson2/src/java/org/apache/fulcrum/json/jackson/CacheService.java
Wed May 20 14:40:52 2015
@@ -35,7 +35,7 @@ public class CacheService {
if (primary instanceof SimpleNameIntrospector) {
if (externalFilterId != null) {
((SimpleNameIntrospector) primary)
- .removeExternalFilterClass(externalFilterId);
+ .removeFilteredClass(externalFilterId);
if (excludeType) {
((SimpleNameIntrospector) primary)
.removeExternalFilterExcludeClass(externalFilterId);
Modified:
turbine/fulcrum/trunk/json/jackson2/src/java/org/apache/fulcrum/json/jackson/Jackson2MapperService.java
URL:
http://svn.apache.org/viewvc/turbine/fulcrum/trunk/json/jackson2/src/java/org/apache/fulcrum/json/jackson/Jackson2MapperService.java?rev=1680582&r1=1680581&r2=1680582&view=diff
==============================================================================
---
turbine/fulcrum/trunk/json/jackson2/src/java/org/apache/fulcrum/json/jackson/Jackson2MapperService.java
(original)
+++
turbine/fulcrum/trunk/json/jackson2/src/java/org/apache/fulcrum/json/jackson/Jackson2MapperService.java
Wed May 20 14:40:52 2015
@@ -430,29 +430,29 @@ public class Jackson2MapperService exten
return retrieveFilter(pf, filterClasses[0], filterClasses,
excludeType );
}
+ /**
+ * <li>Adding the classes in externalFilterIs to {@link
SimpleNameIntrospector#setFilteredClass(Class)} enables the filtering process.
+ * <li>If <code>excludeType</code> is <code>true</code>, externalFilterIs
are added to {@link
SimpleNameIntrospector#setExternalFilterExcludeClasses(Class...)}.
+ *
+ * @param externalFilterIds
+ * @param excludeType
+ */
private <T> void setCustomIntrospectorWithExternalFilterId(
Class<T>[] externalFilterIds, boolean excludeType) {
if (primary instanceof SimpleNameIntrospector) {
if (externalFilterIds != null) {
((SimpleNameIntrospector)
primary).setIsExludeType(excludeType);
- if (excludeType) {
- // first one is required that we get to the PropertyFilter
- ((SimpleNameIntrospector) primary)
- .setExternalFilterClasses(externalFilterIds);
- getLogger()
- .debug("added class for filters "
- + externalFilterIds);
- ((SimpleNameIntrospector) primary)
- .setExternalFilterExcludeClasses(externalFilterIds);
- getLogger()
- .debug("added exclude class for filters "
- + externalFilterIds);
+ // first one is required that we get to the PropertyFilter
+ ((SimpleNameIntrospector) primary)
+ .setFilteredClasses(externalFilterIds);
+ for (Class<T> filterClazz : externalFilterIds) {
+ getLogger().debug("added class for filters "
+ + filterClazz);
+ }
+ if (excludeType) {
+ ((SimpleNameIntrospector)
primary).setExternalFilterExcludeClasses(externalFilterIds);
+ getLogger().debug("added exclude class for filters " +
externalFilterIds);
} else {
- ((SimpleNameIntrospector) primary)
- .setExternalFilterClasses(externalFilterIds);
- getLogger()
- .debug("added class for filters "
- + externalFilterIds);
// too cumbersome
// ((SimpleNameIntrospector) primary)
// .setExternalFilterIncludeClasses(externalFilterId);
@@ -480,7 +480,7 @@ public class Jackson2MapperService exten
}
/**
- * Defalut Dateformt: {@link #DEFAULTDATEFORMAT}
+ * Default Dateformat: {@link #DEFAULTDATEFORMAT}
*/
@Override
public void setDateFormat(final DateFormat df) {
Modified:
turbine/fulcrum/trunk/json/jackson2/src/java/org/apache/fulcrum/json/jackson/SimpleNameIntrospector.java
URL:
http://svn.apache.org/viewvc/turbine/fulcrum/trunk/json/jackson2/src/java/org/apache/fulcrum/json/jackson/SimpleNameIntrospector.java?rev=1680582&r1=1680581&r2=1680582&view=diff
==============================================================================
---
turbine/fulcrum/trunk/json/jackson2/src/java/org/apache/fulcrum/json/jackson/SimpleNameIntrospector.java
(original)
+++
turbine/fulcrum/trunk/json/jackson2/src/java/org/apache/fulcrum/json/jackson/SimpleNameIntrospector.java
Wed May 20 14:40:52 2015
@@ -44,7 +44,8 @@ public class SimpleNameIntrospector exte
*
*/
private static final long serialVersionUID = 1L;
- private List<String> externalFilterClasses = new
CopyOnWriteArrayList<String>();
+
+ private List<Class<?>> filteredClasses = new
CopyOnWriteArrayList<Class<?>>();
private List<String> externalFilterExcludeClasses = new
CopyOnWriteArrayList<String>();
private List<String> externalFilterIncludeClasses = new
CopyOnWriteArrayList<String>();
private AtomicBoolean isExludeType = new AtomicBoolean(false);
@@ -79,7 +80,7 @@ public class SimpleNameIntrospector exte
}
/**
* @return Object Filtering on properties returns an object, if
- * {@link #externalFilterClasses} contains the class provided. The
+ * {@link #filteredClasses} contains the class provided. The
* filter itself currently is {@link SimpleFilterProvider}.
*/
@Override
@@ -90,41 +91,58 @@ public class SimpleNameIntrospector exte
// but use simple class name if not
if (id == null) {
String name = ac.getName();
- if (!externalFilterClasses.isEmpty()
- && externalFilterClasses.contains(name)) {
+ Class<?> targetClazz = ac.getRawType();
+ if (!filteredClasses.isEmpty()
+ && filteredClasses.contains(targetClazz)
+ ) {
id = name;
+ } else {
+ // check if target class is a child from filter class -> apply
filter
+ for (Class<?> filterClazz : filteredClasses) {
+ // the currently checked class /targetClazz could be child
to the filter class /filterClazz -> positive filter
+ if (filterClazz.isAssignableFrom(targetClazz)) {
+ id = name;
+ break;
+ }
+ // the current clazz could be parent to the filter
+ }
}
}
return id;
}
- public List<String> getExternalFilterClasses() {
- return externalFilterClasses;
+ public List<Class<?>> getFilteredClasses() {
+ return filteredClasses;
}
- public void setExternalFilterClass(Class externalFilterClass) {
- if (!externalFilterClasses.contains(externalFilterClass.getName())) {
- externalFilterClasses.add(externalFilterClass.getName());
+ public void setFilteredClass(Class<?> filteredClass) {
+ if (!filteredClasses.contains(filteredClass)) {
+ filteredClasses.add(filteredClass);
}
}
- public void setExternalFilterClasses(Class... classes) {
+ public void setFilteredClasses(Class<?>... classes) {
for (int i = 0; i < classes.length; i++) {
- if (!externalFilterClasses.contains(classes[i].getName())) {
-
- externalFilterClasses.add(classes[i].getName());
+ if (!filteredClasses.contains(classes[i])) {
+ filteredClasses.add(classes[i]);
}
+// if (classes[i].getSuperclass() != null) {
+// Class superClazz = classes[i].getSuperclass();
+// if (!externalFilterClasses.contains(superClazz)) {
+// externalFilterClasses.add(superClazz);
+// }
+// }
}
}
- public void removeExternalFilterClass(Class externalFilterClass) {
- if (externalFilterClasses.contains(externalFilterClass.getName()))
{
- externalFilterClasses.remove(externalFilterClass.getName());
+ public void removeFilteredClass(Class<?> filteredClass) {
+ if (filteredClasses.contains(filteredClass)) {
+ filteredClasses.remove(filteredClass);
}
}
- public void setExternalFilterExcludeClasses(Class... classes) {
+ public void setExternalFilterExcludeClasses(Class<?>... classes) {
for (int i = 0; i < classes.length; i++) {
if (!externalFilterExcludeClasses.contains(classes[i].getName())) {
@@ -134,13 +152,13 @@ public class SimpleNameIntrospector exte
}
}
- public void removeExternalFilterExcludeClass(Class externalFilterClass) {
+ public void removeExternalFilterExcludeClass(Class<?> externalFilterClass)
{
if
(externalFilterExcludeClasses.contains(externalFilterClass.getName())) {
externalFilterExcludeClasses.remove(externalFilterClass.getName());
}
}
- public void setExternalFilterIncludeClasses(Class... classes) {
+ public void setExternalFilterIncludeClasses(Class<?>... classes) {
for (int i = 0; i < classes.length; i++) {
if (!externalFilterIncludeClasses.contains(classes[i].getName())) {
@@ -150,7 +168,7 @@ public class SimpleNameIntrospector exte
}
}
- public void removeExternalFilterIncludeClasses(Class externalFilterClass) {
+ public void removeExternalFilterIncludeClasses(Class<?>
externalFilterClass) {
if
(externalFilterIncludeClasses.contains(externalFilterClass.getName())) {
externalFilterIncludeClasses.remove(externalFilterClass.getName());
}
Added:
turbine/fulcrum/trunk/json/jackson2/src/test/org/apache/fulcrum/json/jackson/BeanChild.java
URL:
http://svn.apache.org/viewvc/turbine/fulcrum/trunk/json/jackson2/src/test/org/apache/fulcrum/json/jackson/BeanChild.java?rev=1680582&view=auto
==============================================================================
---
turbine/fulcrum/trunk/json/jackson2/src/test/org/apache/fulcrum/json/jackson/BeanChild.java
(added)
+++
turbine/fulcrum/trunk/json/jackson2/src/test/org/apache/fulcrum/json/jackson/BeanChild.java
Wed May 20 14:40:52 2015
@@ -0,0 +1,18 @@
+package org.apache.fulcrum.json.jackson;
+
+public class BeanChild extends Bean {
+ private String name;
+ private int height;
+ public String type;
+
+ public BeanChild() {
+ }
+
+ public String getName() {
+ return name;
+ }
+
+ public void setName(String name) {
+ this.name = name;
+ }
+}
Propchange:
turbine/fulcrum/trunk/json/jackson2/src/test/org/apache/fulcrum/json/jackson/BeanChild.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified:
turbine/fulcrum/trunk/json/jackson2/src/test/org/apache/fulcrum/json/jackson/DefaultServiceTest.java
URL:
http://svn.apache.org/viewvc/turbine/fulcrum/trunk/json/jackson2/src/test/org/apache/fulcrum/json/jackson/DefaultServiceTest.java?rev=1680582&r1=1680581&r2=1680582&view=diff
==============================================================================
---
turbine/fulcrum/trunk/json/jackson2/src/test/org/apache/fulcrum/json/jackson/DefaultServiceTest.java
(original)
+++
turbine/fulcrum/trunk/json/jackson2/src/test/org/apache/fulcrum/json/jackson/DefaultServiceTest.java
Wed May 20 14:40:52 2015
@@ -95,7 +95,7 @@ public class DefaultServiceTest extends
new Class[] { Map.class, String.class} , "configurationName",
"name");
assertEquals("Serialization failed ", "{}", serJson);
serJson = ((Jackson2MapperService)sc).serializeAllExceptFilter(new
TestClass("mytest"),
- (Class)null , "configurationName", "name");
+ "configurationName", "name");
assertEquals("Serialization failed ", "{}", serJson);
}
@@ -141,7 +141,7 @@ public class DefaultServiceTest extends
Integer integer = new Integer(i*i);
intList.add(integer);
}
- String result = sc.serializeOnlyFilter(intList, Integer.class, null);
+ String result = sc.serializeOnlyFilter(intList, Integer.class);
assertEquals(
"Serialization of beans failed ",
"[0,1,4,9,16,25,36,49,64,81]",
@@ -244,7 +244,11 @@ public class DefaultServiceTest extends
"Ser filtered Rectangle failed ",
"{\"w\":5}",
rectangle);
-
+ rectangle = sc.serializeOnlyFilter(filteredRectangle, true, "w");
+ assertEquals(
+ "Ser filtered Rectangle failed ",
+ "{\"w\":5}",
+ rectangle);
}
public void testSerializeAllExceptaANDWithOnlyFilter2() throws Exception {
@@ -266,9 +270,33 @@ public class DefaultServiceTest extends
"Ser filtered Rectangle failed ",
"{\"w\":5}",
rectangle);
-
}
+ public void testSerializeCollectionWithOnlyFilterAndParentClass() throws
Exception {
+
+ List<Bean> beanList = new ArrayList<Bean>();
+ for (int i = 0; i < 3; i++) {
+ Bean bean = new BeanChild();
+ bean.setAge(i);bean.setName("bean"+i);
+ beanList.add(bean);
+ }
+
assertEquals("[{\"name\":\"bean0\"},{\"name\":\"bean1\"},{\"name\":\"bean2\"}]",sc.serializeOnlyFilter(beanList,
Bean.class, true,"name"));
+
//assertEquals("[{\"type\":\"\"},{\"type\":\"\"},{\"type\":\"\"}]",sc.serializeOnlyFilter(beanList,
BeanChild.class, true,"type"));
+ }
+
+ public void testSerializeCollectionWithOnlyFilterAndExactClass() throws
Exception {
+
+ List<Bean> beanList = new ArrayList<Bean>();
+ for (int i = 0; i < 3; i++) {
+ Bean bean = new BeanChild();
+ bean.setAge(i);bean.setName("bean"+i);
+ beanList.add(bean);
+ }
+
assertEquals("[{\"name\":\"bean0\"},{\"name\":\"bean1\"},{\"name\":\"bean2\"}]",sc.serializeOnlyFilter(beanList,
BeanChild.class, true,"name"));
+
//assertEquals("[{\"type\":\"\"},{\"type\":\"\"},{\"type\":\"\"}]",sc.serializeOnlyFilter(beanList,
BeanChild.class, true,"type"));
+ }
+
+
public void testSerializeCollectionWithOnlyFilterAndType() throws
Exception {
List<TypedRectangle> rectList = new ArrayList<TypedRectangle>();
@@ -276,10 +304,19 @@ public class DefaultServiceTest extends
TypedRectangle filteredRect = new TypedRectangle(i, i, "rect" + i);
rectList.add(filteredRect);
}
- Class clazz =
Class.forName("org.apache.fulcrum.json.jackson.TypedRectangle");
+ Class<?> clazz =
Class.forName("org.apache.fulcrum.json.jackson.TypedRectangle");
// no type cft.
https://github.com/FasterXML/jackson-databind/issues/303 !!
assertEquals("[{\"w\":0},{\"w\":1}]",sc.serializeOnlyFilter(rectList,
clazz, true,"w"));
- // need mixin in object class!
+ }
+
+ public void testSerializeCollectionWithOnlyFilterAndMixin() throws
Exception {
+
+ List<TypedRectangle> rectList = new ArrayList<TypedRectangle>();
+ for (int i = 0; i < 2; i++) {
+ TypedRectangle filteredRect = new TypedRectangle(i, i, "rect" + i);
+ rectList.add(filteredRect);
+ }
+ Class<?> clazz =
Class.forName("org.apache.fulcrum.json.jackson.TypedRectangle");
sc.addAdapter("Collection Adapter", Object.class,
TypedRectangle.Mixins.class);
assertEquals("[\"java.util.ArrayList\",[{\"type\":\"org.apache.fulcrum.json.jackson.TypedRectangle\",\"w\":0},{\"type\":\"org.apache.fulcrum.json.jackson.TypedRectangle\",\"w\":1}]]",
sc.serializeOnlyFilter(rectList, clazz, true, "w"));
Modified: turbine/fulcrum/trunk/json/pom.xml
URL:
http://svn.apache.org/viewvc/turbine/fulcrum/trunk/json/pom.xml?rev=1680582&r1=1680581&r2=1680582&view=diff
==============================================================================
--- turbine/fulcrum/trunk/json/pom.xml (original)
+++ turbine/fulcrum/trunk/json/pom.xml Wed May 20 14:40:52 2015
@@ -26,7 +26,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.fulcrum</groupId>
<artifactId>fulcrum-json-parent</artifactId>
- <version>1.0.1-SNAPSHOT</version>
+ <version>1.1.0-SNAPSHOT</version>
<packaging>pom</packaging>
<name>Fulcrum JSON Master Build</name>
<url>http://turbine.apache.org/fulcrum/fulcrum-json/</url>
Modified: turbine/fulcrum/trunk/json/src/changes/changes.xml
URL:
http://svn.apache.org/viewvc/turbine/fulcrum/trunk/json/src/changes/changes.xml?rev=1680582&r1=1680581&r2=1680582&view=diff
==============================================================================
--- turbine/fulcrum/trunk/json/src/changes/changes.xml (original)
+++ turbine/fulcrum/trunk/json/src/changes/changes.xml Wed May 20 14:40:52 2015
@@ -24,6 +24,16 @@
</properties>
<body>
+ <release version="1.1.0" date="in Subversion">
+ <action type="update" dev="gk">
+ Jackson 2: Allow parent class to match filter. Update version from not
released version 1.0.1 to 1.1.0.
+ </action>
+ <action type="update" dev="gk">
+ Adding custom methods to interface to avoid null argument method
calls. Cleaned up Jackson 2 Service.
+ </action>
+ <action type="update" dev="gk">
+ Jackson 2: Serialization of Exclude Filter Queries was fixed, which
could before interfere with other filters.
+ </action>
<action type="update" dev="gk">
Update to versions : GSON: 2.3.1, Jackson 2: 2.4.5. Jackson 1 remains
with stable build 1.9.13.
</action>
