Author: gk
Date: Wed Oct 17 10:25:18 2018
New Revision: 1844082
URL: http://svn.apache.org/viewvc?rev=1844082&view=rev
Log:
- Fix overrides due to interface changes (removed no used type
Modified:
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
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=1844082&r1=1844081&r2=1844082&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
Wed Oct 17 10:25:18 2018
@@ -108,7 +108,7 @@ public class GSONBuilderService extends
}
@Override
- public <T> String serializeOnlyFilter(Object src, String... filterAttr)
+ public String serializeOnlyFilter(Object src, String... filterAttr)
throws Exception {
return gson
.addSerializationExclusionStrategy(
@@ -116,7 +116,7 @@ public class GSONBuilderService extends
}
@Override
- public <T> String serializeOnlyFilter(Object src, Boolean notused,
+ public String serializeOnlyFilter(Object src, Boolean notused,
String... filterAttr) throws Exception {
return gson
.addSerializationExclusionStrategy(
@@ -177,7 +177,7 @@ public class GSONBuilderService extends
}
@Override
- public <T> String serializeAllExceptFilter(Object src, String...
filterAttr)
+ public String serializeAllExceptFilter(Object src, String... filterAttr)
throws Exception {
return gson
.addSerializationExclusionStrategy(
@@ -185,7 +185,7 @@ public class GSONBuilderService extends
}
@Override
- public <T> String serializeAllExceptFilter(Object src, Boolean notused,
+ public String serializeAllExceptFilter(Object src, Boolean notused,
String... filterAttr) throws Exception {
return gson
.addSerializationExclusionStrategy(
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=1844082&r1=1844081&r2=1844082&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
Wed Oct 17 10:25:18 2018
@@ -165,13 +165,13 @@ public class JacksonMapperService extend
}
@Override
- public <T> String serializeAllExceptFilter(Object src, String...
filterAttr)
+ public String serializeAllExceptFilter(Object src, String... filterAttr)
throws Exception {
return serializeAllExceptFilter(src, src.getClass(), true, filterAttr);
}
@Override
- public <T> String serializeAllExceptFilter(Object src, Boolean refresh,
+ public String serializeAllExceptFilter(Object src, Boolean refresh,
String... filterAttr) throws Exception {
return serializeAllExceptFilter(src, src.getClass(), refresh,
filterAttr);
}
@@ -209,13 +209,13 @@ public class JacksonMapperService extend
@Override
- public <T> String serializeOnlyFilter(Object src, String... filterAttr)
+ public String serializeOnlyFilter(Object src, String... filterAttr)
throws Exception {
return serializeOnlyFilter(src, src.getClass(), true, filterAttr);
}
@Override
- public <T> String serializeOnlyFilter(Object src, Boolean refresh,
+ public String serializeOnlyFilter(Object src, Boolean refresh,
String... filterAttr) throws Exception {
return serializeOnlyFilter(src, src.getClass(), refresh, filterAttr);
}