Author: gk
Date: Mon Dec 9 08:54:31 2013
New Revision: 1549516
URL: http://svn.apache.org/r1549516
Log:
Bugfix due to java error: no instance(s) of type variable(s) T exist so that
argument type boolean conforms to formal parameter type java.lang.String.
Changing from boolean to Boolean avoids this error and Java is loading the
correct method, else it tries first to build a String from boolean.
Modified:
turbine/fulcrum/trunk/json/api/src/java/org/apache/fulcrum/json/JsonService.java
turbine/fulcrum/trunk/json/gson/src/java/org/apache/fulcrum/json/gson/GSONBuilderService.java
turbine/fulcrum/trunk/json/jackson/src/java/org/apache/fulcrum/json/jackson/JacksonMapperService.java
turbine/fulcrum/trunk/json/jackson2/src/java/org/apache/fulcrum/json/jackson/Jackson2MapperService.java
Modified:
turbine/fulcrum/trunk/json/api/src/java/org/apache/fulcrum/json/JsonService.java
URL:
http://svn.apache.org/viewvc/turbine/fulcrum/trunk/json/api/src/java/org/apache/fulcrum/json/JsonService.java?rev=1549516&r1=1549515&r2=1549516&view=diff
==============================================================================
---
turbine/fulcrum/trunk/json/api/src/java/org/apache/fulcrum/json/JsonService.java
(original)
+++
turbine/fulcrum/trunk/json/api/src/java/org/apache/fulcrum/json/JsonService.java
Mon Dec 9 08:54:31 2013
@@ -128,7 +128,7 @@ public interface JsonService {
* @throws Exception
* if JSON serialization or filter registration fails
*/
- public <T> String serializeOnlyFilter(Object src, Class<T> filterClass,
boolean refreshFilter,
+ public <T> String serializeOnlyFilter(Object src, Class<T> filterClass,
Boolean refreshFilter,
String... filterAttr) throws Exception;
/**
@@ -152,7 +152,7 @@ public interface JsonService {
* if JSON serialization or filter registration fails
*/
public <T> String serializeAllExceptFilter(Object src,
- Class<T> filterClass, boolean refreshFilter, String... filterAttr)
throws Exception;
+ Class<T> filterClass, Boolean refreshFilter, String... filterAttr)
throws Exception;
/**
* @see #serializeAllExceptFilter(Object, Class, boolean, String...)
Modified:
turbine/fulcrum/trunk/json/gson/src/java/org/apache/fulcrum/json/gson/GSONBuilderService.java
URL:
http://svn.apache.org/viewvc/turbine/fulcrum/trunk/json/gson/src/java/org/apache/fulcrum/json/gson/GSONBuilderService.java?rev=1549516&r1=1549515&r2=1549516&view=diff
==============================================================================
---
turbine/fulcrum/trunk/json/gson/src/java/org/apache/fulcrum/json/gson/GSONBuilderService.java
(original)
+++
turbine/fulcrum/trunk/json/gson/src/java/org/apache/fulcrum/json/gson/GSONBuilderService.java
Mon Dec 9 08:54:31 2013
@@ -109,7 +109,7 @@ public class GSONBuilderService extends
@Override
public <T> String serializeOnlyFilter(Object arg0, Class<T> arg1,
- boolean arg2, String... arg3) throws Exception {
+ Boolean arg2, String... arg3) throws Exception {
throw new Exception("Not yet implemented!");
}
@@ -135,7 +135,7 @@ public class GSONBuilderService extends
@Override
public <T> String serializeAllExceptFilter(Object src, Class<T>
filterClass,
- boolean arg2, String... filterAttr) throws Exception {
+ Boolean arg2, String... filterAttr) throws Exception {
return gson
.addSerializationExclusionStrategy(
exclude(filterClass, filterAttr)).create().toJson(src);
Modified:
turbine/fulcrum/trunk/json/jackson/src/java/org/apache/fulcrum/json/jackson/JacksonMapperService.java
URL:
http://svn.apache.org/viewvc/turbine/fulcrum/trunk/json/jackson/src/java/org/apache/fulcrum/json/jackson/JacksonMapperService.java?rev=1549516&r1=1549515&r2=1549516&view=diff
==============================================================================
---
turbine/fulcrum/trunk/json/jackson/src/java/org/apache/fulcrum/json/jackson/JacksonMapperService.java
(original)
+++
turbine/fulcrum/trunk/json/jackson/src/java/org/apache/fulcrum/json/jackson/JacksonMapperService.java
Mon Dec 9 08:54:31 2013
@@ -150,7 +150,7 @@ public class JacksonMapperService extend
@Override
public <T> String serializeAllExceptFilter(Object src,
- Class<T> filterClass, boolean refreshFilter, String... filterAttr)
+ Class<T> filterClass, Boolean refreshFilter, String... filterAttr)
throws Exception {
setCustomIntrospectorWithExternalFilterId(filterClass);
FilterProvider filter;
@@ -176,7 +176,7 @@ public class JacksonMapperService extend
@Override
public <T> String serializeOnlyFilter(Object src, Class<T> filterClass,
- boolean refreshFilter, String... filterAttr) throws Exception {
+ Boolean refreshFilter, String... filterAttr) throws Exception {
setCustomIntrospectorWithExternalFilterId(filterClass);
FilterProvider filter;
if (!this.filters.containsKey(filterClass.getName())) {
@@ -437,4 +437,5 @@ public class JacksonMapperService extend
}
}
+
}
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=1549516&r1=1549515&r2=1549516&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
Mon Dec 9 08:54:31 2013
@@ -233,7 +233,7 @@ public class Jackson2MapperService exten
}
public synchronized <T> String serializeAllExceptFilter(Object src,
- Class<T> filterClass, boolean refresh, String... filterAttr)
throws Exception {
+ Class<T> filterClass, Boolean refresh, String... filterAttr)
throws Exception {
FilterContext fc = new FilterContext();
if (filterAttr != null)
fc.setFilter(SimpleBeanPropertyFilter
@@ -249,7 +249,7 @@ public class Jackson2MapperService exten
@Override
public synchronized <T> String serializeOnlyFilter(Object src,
- Class<T> filterClass, boolean refresh, String... filterAttr)
throws Exception {
+ Class<T> filterClass, Boolean refresh, String... filterAttr)
throws Exception {
FilterContext fc = new FilterContext();
if (filterAttr != null && filterAttr.length > 0)
fc.setFilter(SimpleBeanPropertyFilter.filterOutAllExcept(filterAttr));
