You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@turbine.apache.org by gk...@apache.org on 2014/03/14 14:21:40 UTC
svn commit: r1577518 - in /turbine/fulcrum/trunk/json:
api/src/java/org/apache/fulcrum/json/
gson/src/java/org/apache/fulcrum/json/gson/ gson/src/test/
gson/src/test/org/apache/fulcrum/json/gson/
jackson/src/java/org/apache/fulcrum/json/jackson/ jackso...
Author: gk
Date: Fri Mar 14 13:21:39 2014
New Revision: 1577518
URL: http://svn.apache.org/r1577518
Log:
Added svn kexyword Id filtering for src folders; javadoc fixes.
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 (props changed)
turbine/fulcrum/trunk/json/gson/src/test/TestComponentConfig.xml (props changed)
turbine/fulcrum/trunk/json/gson/src/test/TestRoleConfig.xml (props changed)
turbine/fulcrum/trunk/json/gson/src/test/org/apache/fulcrum/json/gson/DefaultServiceTest.java (props changed)
turbine/fulcrum/trunk/json/gson/src/test/org/apache/fulcrum/json/gson/TestJsonSerializer.java (props changed)
turbine/fulcrum/trunk/json/gson/src/test/org/apache/fulcrum/json/gson/TypeAdapterForCollection.java (props changed)
turbine/fulcrum/trunk/json/gson/src/test/org/apache/fulcrum/json/gson/TypeAdapterForRectangle.java (props changed)
turbine/fulcrum/trunk/json/jackson/src/java/org/apache/fulcrum/json/jackson/CustomIntrospector.java (props changed)
turbine/fulcrum/trunk/json/jackson/src/java/org/apache/fulcrum/json/jackson/JacksonMapperService.java (props changed)
turbine/fulcrum/trunk/json/jackson/src/site/site.xml (props changed)
turbine/fulcrum/trunk/json/jackson/src/test/TestComponentConfig.xml (props changed)
turbine/fulcrum/trunk/json/jackson/src/test/TestRoleConfig.xml (props changed)
turbine/fulcrum/trunk/json/jackson/src/test/org/apache/fulcrum/json/jackson/Bean.java (props changed)
turbine/fulcrum/trunk/json/jackson/src/test/org/apache/fulcrum/json/jackson/BeanMixin.java (props changed)
turbine/fulcrum/trunk/json/jackson/src/test/org/apache/fulcrum/json/jackson/DefaultServiceTest.java (props changed)
turbine/fulcrum/trunk/json/jackson/src/test/org/apache/fulcrum/json/jackson/JacksonMapperTest.java (props changed)
turbine/fulcrum/trunk/json/jackson/src/test/org/apache/fulcrum/json/jackson/Mixin.java (props changed)
turbine/fulcrum/trunk/json/jackson/src/test/org/apache/fulcrum/json/jackson/Rectangle.java (props changed)
turbine/fulcrum/trunk/json/jackson2/src/java/org/apache/fulcrum/json/jackson/Jackson2MapperService.java (contents, props changed)
turbine/fulcrum/trunk/json/jackson2/src/java/org/apache/fulcrum/json/jackson/SimpleNameIntrospector.java (props changed)
turbine/fulcrum/trunk/json/jackson2/src/java/org/apache/fulcrum/json/jackson/filters/CustomModuleWrapper.java (props changed)
turbine/fulcrum/trunk/json/jackson2/src/java/org/apache/fulcrum/json/jackson/filters/FilterContext.java (props changed)
turbine/fulcrum/trunk/json/jackson2/src/site/site.xml (props changed)
turbine/fulcrum/trunk/json/jackson2/src/test/TestComponentConfig.xml (props changed)
turbine/fulcrum/trunk/json/jackson2/src/test/TestRoleConfig.xml (props changed)
turbine/fulcrum/trunk/json/jackson2/src/test/org/apache/fulcrum/json/jackson/Bean.java (props changed)
turbine/fulcrum/trunk/json/jackson2/src/test/org/apache/fulcrum/json/jackson/BeanMixin.java (props changed)
turbine/fulcrum/trunk/json/jackson2/src/test/org/apache/fulcrum/json/jackson/DefaultServiceTest.java (props changed)
turbine/fulcrum/trunk/json/jackson2/src/test/org/apache/fulcrum/json/jackson/JacksonMapperEnabledDefaultTypingTest.java (props changed)
turbine/fulcrum/trunk/json/jackson2/src/test/org/apache/fulcrum/json/jackson/JacksonMapperTest.java (props changed)
turbine/fulcrum/trunk/json/jackson2/src/test/org/apache/fulcrum/json/jackson/Mixin.java (props changed)
turbine/fulcrum/trunk/json/jackson2/src/test/org/apache/fulcrum/json/jackson/TestDeserializer.java (props changed)
turbine/fulcrum/trunk/json/jackson2/src/test/org/apache/fulcrum/json/jackson/TestJsonSerializer.java (props changed)
turbine/fulcrum/trunk/json/jackson2/src/test/org/apache/fulcrum/json/jackson/TestSerializer.java (props changed)
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=1577518&r1=1577517&r2=1577518&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 Fri Mar 14 13:21:39 2014
@@ -59,8 +59,6 @@ public interface JsonService {
* @param refreshCache
* If <code>true</code>, try to refresh cache after serialization
*
- * For other attributes @see {@link #ser(Object)}
-
*/
String ser(Object src, Boolean cleanCache) throws Exception;
@@ -70,7 +68,7 @@ public interface JsonService {
* @param src
* The java object to be serialized
* @param type
- * Type, which should be used for the provided object .
+ * Java Type, which should be used for the provided object .
*
* @return JSON string
*
@@ -96,7 +94,7 @@ public interface JsonService {
* @param src
* Tthe JSON string to be deserialized
* @param type
- * The java type to be used as a class
+ * The Java Type to be used as a class
*
* @return an object
*
@@ -162,7 +160,7 @@ public interface JsonService {
* same class, just the filterAttributes get applied. If not the
* class is filtered out, if found as a property type.
* @param cleanFilter
- * refresh filter (clean cache for this filterClass) after serialization.
+ * clean filter (clean cache for this filterClass) after serialization.
*
* @param filterAttr
* The bean attributes which should not be serialized
Propchange: turbine/fulcrum/trunk/json/gson/src/java/org/apache/fulcrum/json/gson/GSONBuilderService.java
------------------------------------------------------------------------------
svn:keywords = Id
Propchange: turbine/fulcrum/trunk/json/gson/src/test/TestComponentConfig.xml
------------------------------------------------------------------------------
svn:keywords = Id
Propchange: turbine/fulcrum/trunk/json/gson/src/test/TestRoleConfig.xml
------------------------------------------------------------------------------
svn:keywords = Id
Propchange: turbine/fulcrum/trunk/json/gson/src/test/org/apache/fulcrum/json/gson/DefaultServiceTest.java
------------------------------------------------------------------------------
svn:keywords = Id
Propchange: turbine/fulcrum/trunk/json/gson/src/test/org/apache/fulcrum/json/gson/TestJsonSerializer.java
------------------------------------------------------------------------------
svn:keywords = Id
Propchange: turbine/fulcrum/trunk/json/gson/src/test/org/apache/fulcrum/json/gson/TypeAdapterForCollection.java
------------------------------------------------------------------------------
svn:keywords = Id
Propchange: turbine/fulcrum/trunk/json/gson/src/test/org/apache/fulcrum/json/gson/TypeAdapterForRectangle.java
------------------------------------------------------------------------------
svn:keywords = Id
Propchange: turbine/fulcrum/trunk/json/jackson/src/java/org/apache/fulcrum/json/jackson/CustomIntrospector.java
------------------------------------------------------------------------------
svn:keywords = Id
Propchange: turbine/fulcrum/trunk/json/jackson/src/java/org/apache/fulcrum/json/jackson/JacksonMapperService.java
------------------------------------------------------------------------------
svn:keywords = Id
Propchange: turbine/fulcrum/trunk/json/jackson/src/site/site.xml
------------------------------------------------------------------------------
svn:keywords = Id
Propchange: turbine/fulcrum/trunk/json/jackson/src/test/TestComponentConfig.xml
------------------------------------------------------------------------------
svn:keywords = Id
Propchange: turbine/fulcrum/trunk/json/jackson/src/test/TestRoleConfig.xml
------------------------------------------------------------------------------
svn:keywords = Id
Propchange: turbine/fulcrum/trunk/json/jackson/src/test/org/apache/fulcrum/json/jackson/Bean.java
------------------------------------------------------------------------------
svn:keywords = Id
Propchange: turbine/fulcrum/trunk/json/jackson/src/test/org/apache/fulcrum/json/jackson/BeanMixin.java
------------------------------------------------------------------------------
svn:keywords = Id
Propchange: turbine/fulcrum/trunk/json/jackson/src/test/org/apache/fulcrum/json/jackson/DefaultServiceTest.java
------------------------------------------------------------------------------
svn:keywords = Id
Propchange: turbine/fulcrum/trunk/json/jackson/src/test/org/apache/fulcrum/json/jackson/JacksonMapperTest.java
------------------------------------------------------------------------------
svn:keywords = Id
Propchange: turbine/fulcrum/trunk/json/jackson/src/test/org/apache/fulcrum/json/jackson/Mixin.java
------------------------------------------------------------------------------
svn:keywords = Id
Propchange: turbine/fulcrum/trunk/json/jackson/src/test/org/apache/fulcrum/json/jackson/Rectangle.java
------------------------------------------------------------------------------
svn:keywords = Id
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=1577518&r1=1577517&r2=1577518&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 Fri Mar 14 13:21:39 2014
@@ -66,17 +66,17 @@ import com.fasterxml.jackson.databind.se
import com.fasterxml.jackson.databind.ser.std.StdSerializer;
/**
- * Jackson 2 Impl of @link {@link JsonService}.
+ * Jackson 2 Impl of {@link JsonService}.
*
*
* By default multiple serialization of the same object in a single thread is
- * not support (e.g filter + mixin or default + filter for the same bean /
+ * not supported (e.g filter + mixin or default + filter for the same bean /
* object).
*
* Note: If using {@link SimpleNameIntrospector}, filters are set by class id, which are cached by default.
* By setting {@link #cacheFilters} to <code>false</code> each filter will be unregistered and the cache cleaned.
- * By setting the refresh parameter {@link #filter(Object, Class, FilterContext, boolean, String...)} on per-filter method call
- * you could filter a class providing different properties.
+ * By setting the Boolean parameter clean {@link #filter(Object, Class, FilterContext, Boolean, String...)}
+ * you could filter a class differently for each call.
*
* @author <a href="mailto:gk@apache.org">Georg Kallidis</a>
* @version $Id$
@@ -295,7 +295,7 @@ public class Jackson2MapperService exten
}
private <T> String filter(Object src, Class<T> filterClass,
- FilterContext fc, boolean clean, String... filterAttr) throws Exception {
+ FilterContext fc, Boolean clean, String... filterAttr) throws Exception {
FilterProvider filter = null;
if (src != null) {
filter = checkFilter(fc, src.getClass(), filterClass,
Propchange: turbine/fulcrum/trunk/json/jackson2/src/java/org/apache/fulcrum/json/jackson/Jackson2MapperService.java
------------------------------------------------------------------------------
svn:keywords = Id
Propchange: turbine/fulcrum/trunk/json/jackson2/src/java/org/apache/fulcrum/json/jackson/SimpleNameIntrospector.java
------------------------------------------------------------------------------
svn:keywords = Id
Propchange: turbine/fulcrum/trunk/json/jackson2/src/java/org/apache/fulcrum/json/jackson/filters/CustomModuleWrapper.java
------------------------------------------------------------------------------
svn:keywords = Id
Propchange: turbine/fulcrum/trunk/json/jackson2/src/java/org/apache/fulcrum/json/jackson/filters/FilterContext.java
------------------------------------------------------------------------------
svn:keywords = Id
Propchange: turbine/fulcrum/trunk/json/jackson2/src/site/site.xml
------------------------------------------------------------------------------
svn:keywords = Id
Propchange: turbine/fulcrum/trunk/json/jackson2/src/test/TestComponentConfig.xml
------------------------------------------------------------------------------
svn:keywords = Id
Propchange: turbine/fulcrum/trunk/json/jackson2/src/test/TestRoleConfig.xml
------------------------------------------------------------------------------
svn:keywords = Id
Propchange: turbine/fulcrum/trunk/json/jackson2/src/test/org/apache/fulcrum/json/jackson/Bean.java
------------------------------------------------------------------------------
svn:keywords = Id
Propchange: turbine/fulcrum/trunk/json/jackson2/src/test/org/apache/fulcrum/json/jackson/BeanMixin.java
------------------------------------------------------------------------------
svn:keywords = Id
Propchange: turbine/fulcrum/trunk/json/jackson2/src/test/org/apache/fulcrum/json/jackson/DefaultServiceTest.java
------------------------------------------------------------------------------
svn:keywords = Id
Propchange: turbine/fulcrum/trunk/json/jackson2/src/test/org/apache/fulcrum/json/jackson/JacksonMapperEnabledDefaultTypingTest.java
------------------------------------------------------------------------------
svn:keywords = Id
Propchange: turbine/fulcrum/trunk/json/jackson2/src/test/org/apache/fulcrum/json/jackson/JacksonMapperTest.java
------------------------------------------------------------------------------
svn:keywords = Id
Propchange: turbine/fulcrum/trunk/json/jackson2/src/test/org/apache/fulcrum/json/jackson/Mixin.java
------------------------------------------------------------------------------
svn:keywords = Id
Propchange: turbine/fulcrum/trunk/json/jackson2/src/test/org/apache/fulcrum/json/jackson/TestDeserializer.java
------------------------------------------------------------------------------
svn:keywords = Id
Propchange: turbine/fulcrum/trunk/json/jackson2/src/test/org/apache/fulcrum/json/jackson/TestJsonSerializer.java
------------------------------------------------------------------------------
svn:keywords = Id
Propchange: turbine/fulcrum/trunk/json/jackson2/src/test/org/apache/fulcrum/json/jackson/TestSerializer.java
------------------------------------------------------------------------------
svn:keywords = Id