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/04/07 12:32:33 UTC

svn commit: r1585447 - in /turbine/fulcrum/trunk/json: README api/src/java/org/apache/fulcrum/json/JsonService.java jackson/src/java/org/apache/fulcrum/json/jackson/JacksonMapperService.java xdocs/index.xml

Author: gk
Date: Mon Apr  7 10:32:33 2014
New Revision: 1585447

URL: http://svn.apache.org/r1585447
Log:
Fix some Javadoc warnings, update site description, add Id versioning to class JacksonMapperService.java.

Modified:
    turbine/fulcrum/trunk/json/README
    turbine/fulcrum/trunk/json/api/src/java/org/apache/fulcrum/json/JsonService.java   (contents, props changed)
    turbine/fulcrum/trunk/json/jackson/src/java/org/apache/fulcrum/json/jackson/JacksonMapperService.java
    turbine/fulcrum/trunk/json/xdocs/index.xml

Modified: turbine/fulcrum/trunk/json/README
URL: http://svn.apache.org/viewvc/turbine/fulcrum/trunk/json/README?rev=1585447&r1=1585446&r2=1585447&view=diff
==============================================================================
--- turbine/fulcrum/trunk/json/README (original)
+++ turbine/fulcrum/trunk/json/README Mon Apr  7 10:32:33 2014
@@ -72,6 +72,7 @@ Steps
   
 4) Release Preparing
   // performs an upload to repository.apache.org/service/local/staging/deploy/maven2/
+  // Hint: Add -Dgpg.useagent=false helps, if running from a windows machine to avoid hanging while gpg plugin signing process ..
   mvn release:perform 
   
 More Information 

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=1585447&r1=1585446&r2=1585447&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 Apr  7 10:32:33 2014
@@ -56,7 +56,7 @@ public interface JsonService {
     /**
      * @param src
      *              the java object to be serialized, not null.
-     * @param refreshCache a boolean value, not null.
+     * @param cleanCache a boolean value, not null.
      *              If <code>true</code>, try to refresh cache after serialization
      * 
      */
@@ -193,7 +193,7 @@ public interface JsonService {
      * @param mixin
      *            the adapter/mixin for the target class
      * 
-     * @return JsonService
+     * @return the JsonService instance
      * 
      * @throws Exception
      *             if adapter registration fails
@@ -215,7 +215,7 @@ public interface JsonService {
      *            the adapter/mixin for the target object
      *            (module/serializer/deserializer)
      * 
-     * @return JsonService
+     * @return a JsonService instance
      * 
      * @throws Exception
      *             if adapter registration fails

Propchange: turbine/fulcrum/trunk/json/api/src/java/org/apache/fulcrum/json/JsonService.java
------------------------------------------------------------------------------
    svn:keywords = Id

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=1585447&r1=1585446&r2=1585447&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 Apr  7 10:32:33 2014
@@ -62,7 +62,7 @@ import org.codehaus.jackson.map.ser.impl
  * 
  * 
  * @author gk
- * @version
+ * @version $Id$
  * 
  */
 public class JacksonMapperService extends AbstractLogEnabled implements

Modified: turbine/fulcrum/trunk/json/xdocs/index.xml
URL: http://svn.apache.org/viewvc/turbine/fulcrum/trunk/json/xdocs/index.xml?rev=1585447&r1=1585446&r2=1585447&view=diff
==============================================================================
--- turbine/fulcrum/trunk/json/xdocs/index.xml (original)
+++ turbine/fulcrum/trunk/json/xdocs/index.xml Mon Apr  7 10:32:33 2014
@@ -115,15 +115,19 @@
       </table>
     </subsection>
     <subsection name="Component Configuration Example">
+      <p>Jackson Version 2.x</p>
       <source><![CDATA[
 <json>
   <annotationInspectors>
-      	<primary>org.apache.fulcrum.json.jackson.CustomIntrospector</primary>
+      	<primary>org.apache.fulcrum.json.jackson.SimpleNameIntrospector</primary>
         <secondary>com.fasterxml.jackson.databind.introspect.JacksonAnnotationIntrospector</secondary>
         <features>
           <feature value="false" type="com.fasterxml.jackson.databind.SerializationFeature">FAIL_ON_EMPTY_BEANS</feature>
           <feature value="false" type="com.fasterxml.jackson.databind.DeserializationFeature">EAGER_DESERIALIZER_FETCH</feature>
+          <!--  do not fail of only getter is provided -->
+          <feature value="false" type="com.fasterxml.jackson.databind.DeserializationFeature">FAIL_ON_UNKNOWN_PROPERTIES</feature>          
           <feature value="false" type="com.fasterxml.jackson.databind.MapperFeature">ALLOW_FINAL_FIELDS_AS_MUTATORS</feature>
+          <feature value="true"  type="com.fasterxml.jackson.core.JsonParser">ALLOW_UNQUOTED_FIELD_NAMES</feature>
 
           <!-- feature value="true">com.fasterxml.jackson.databind.SerializationFeature.INDENT_OUTPUT</feature-->
         </features>
@@ -133,6 +137,23 @@
    <!-- cacheFilters>false</cacheFilters>
   </json>
 ]]></source>
+<p>Jackson Version 1.9.x</p>
+      <source><![CDATA[
+<json>
+  <annotationInspectors>
+      	<primary>org.apache.fulcrum.json.jackson.CustomIntrospector</primary>
+        <secondary>org.codehaus.jackson.xc.JaxbAnnotationIntrospector</secondary>
+        <features>
+        <!--  support up to now only serializing features -->
+          <feature value="false">org.codehaus.jackson.map.SerializationConfig.Feature.FAIL_ON_EMPTY_BEANS</feature> 
+          <!-- feature value="true">org.codehaus.jackson.map.SerializationConfig.Feature.INDENT_OUTPUT</feature-->
+        </features>
+  </annotationInspectors>
+          <dateFormat>MM/dd/yyyy</dateFormat>
+        <!-- defaultTyping type="OBJECT_AND_NON_CONCRETE" key="type"/-->
+        <!-- cacheFilters>false</cacheFilters-->
+  </json>
+]]></source>
     </subsection>
     <subsection name="Usage">
     <p>
@@ -211,6 +232,18 @@ JsonService jsonService = (JsonService)T
   </section>
 
   <section name="JSON Service Component with GSON API">
+    <section name="Overview">
+    <p>
+    This Service serves as a JSON serializer or deserializer using <a href="https://code.google.com/p/google-gson/">GSON</a> Version 2.
+      The GSON sub module provides some include/exclude filtering strategies.
+    </p>
+
+    <p>
+      It is written for use in Turbine but it can be used in any container compatible
+      with Avalon's ECM container.
+    </p>
+  </section>
+    
     <subsection name="Role Configuration">
       <source><![CDATA[
     <role