Author: gk
Date: Fri Mar 14 12:51:41 2014
New Revision: 1577505
URL: http://svn.apache.org/r1577505
Log:
Fixing FindBugs bugs and url link
Modified:
turbine/fulcrum/trunk/json/gson/pom.xml
turbine/fulcrum/trunk/json/gson/src/java/org/apache/fulcrum/json/gson/GSONBuilderService.java
turbine/fulcrum/trunk/json/jackson/pom.xml
turbine/fulcrum/trunk/json/jackson/src/java/org/apache/fulcrum/json/jackson/JacksonMapperService.java
turbine/fulcrum/trunk/json/jackson2/pom.xml
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/filters/CustomModuleWrapper.java
Modified: turbine/fulcrum/trunk/json/gson/pom.xml
URL:
http://svn.apache.org/viewvc/turbine/fulcrum/trunk/json/gson/pom.xml?rev=1577505&r1=1577504&r2=1577505&view=diff
==============================================================================
--- turbine/fulcrum/trunk/json/gson/pom.xml (original)
+++ turbine/fulcrum/trunk/json/gson/pom.xml Fri Mar 14 12:51:41 2014
@@ -28,7 +28,7 @@
<name>Fulcrum JSON GSON Impl</name>
<version>1.0.0-SNAPSHOT</version>
-
<url>http://turbine.apache.org/fulcrum/fulcrum-security/fulcrum-json-gson</url>
+ <url>http://turbine.apache.org/fulcrum/fulcrum-json/fulcrum-json-gson</url>
<scm>
<connection>scm:svn:http://svn.apache.org/repos/asf/turbine/fulcrum/trunk/json/gson/</connection>
<developerConnection>scm:svn:https://svn.apache.org/repos/asf/turbine/fulcrum/trunk/json/gson/</developerConnection>
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=1577505&r1=1577504&r2=1577505&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
Fri Mar 14 12:51:41 2014
@@ -66,7 +66,7 @@ public class GSONBuilderService extends
private String dateFormat;
- final String DEFAULTDATEFORMAT = "MM/dd/yyyy";
+ private static final String DEFAULTDATEFORMAT = "MM/dd/yyyy";
private Hashtable<String, String> adapters = null;
Modified: turbine/fulcrum/trunk/json/jackson/pom.xml
URL:
http://svn.apache.org/viewvc/turbine/fulcrum/trunk/json/jackson/pom.xml?rev=1577505&r1=1577504&r2=1577505&view=diff
==============================================================================
--- turbine/fulcrum/trunk/json/jackson/pom.xml (original)
+++ turbine/fulcrum/trunk/json/jackson/pom.xml Fri Mar 14 12:51:41 2014
@@ -28,7 +28,7 @@
<name>Fulcrum JSON Jackson Impl</name>
<version>1.0.0-SNAPSHOT</version>
-
<url>http://turbine.apache.org/fulcrum/fulcrum-security/fulcrum-json-jackson</url>
+
<url>http://turbine.apache.org/fulcrum/fulcrum-json/fulcrum-json-jackson</url>
<scm>
<connection>scm:svn:http://svn.apache.org/repos/asf/turbine/fulcrum/trunk/json/jackson/</connection>
<developerConnection>scm:svn:https://svn.apache.org/repos/asf/turbine/fulcrum/trunk/json/jackson/</developerConnection>
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=1577505&r1=1577504&r2=1577505&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
Fri Mar 14 12:51:41 2014
@@ -112,7 +112,7 @@ public class JacksonMapperService extend
@Override
public String ser(Object src, Boolean cleanCache) throws Exception {
- if (filters.containsKey(src.getClass().getName())) {
+ if (src.getClass() != null &&
filters.containsKey(src.getClass().getName())) {
getLogger().warn(
"Found registered filter - using instead of default view
filter for class:"
+ src.getClass().getName());
@@ -127,7 +127,7 @@ public class JacksonMapperService extend
public <T> String ser(Object src, Class<T> type, Boolean cleanCache)
throws Exception {
getLogger().debug("ser::" + src + " with type" + type);
- if (filters.containsKey(src.getClass().getName())) {
+ if (src.getClass() != null &&
filters.containsKey(src.getClass().getName())) {
getLogger()
.warn("Found registered filter - could not use custom view
and custom filter for class:"
+ src.getClass().getName());
@@ -197,7 +197,6 @@ public class JacksonMapperService extend
Boolean refreshFilter, String... filterAttr) throws Exception {
setCustomIntrospectorWithExternalFilterId(filterClass);
FilterProvider filter = null;
- getLogger().debug("filterClass::" + filterClass + " , filterAttr: " +
filterAttr);
if (filterClass == null && src != null && src.getClass() != null) {
filterClass =(Class<T>) src.getClass();
}
@@ -450,7 +449,7 @@ public class JacksonMapperService extend
this.mapper = mapper;
}
- public class MixinModule extends SimpleModule {
+ public static class MixinModule extends SimpleModule {
public final Class<?> clazz;
public final Class<?> mixin;
Modified: turbine/fulcrum/trunk/json/jackson2/pom.xml
URL:
http://svn.apache.org/viewvc/turbine/fulcrum/trunk/json/jackson2/pom.xml?rev=1577505&r1=1577504&r2=1577505&view=diff
==============================================================================
--- turbine/fulcrum/trunk/json/jackson2/pom.xml (original)
+++ turbine/fulcrum/trunk/json/jackson2/pom.xml Fri Mar 14 12:51:41 2014
@@ -28,7 +28,7 @@
<name>Fulcrum JSON Jackson 2.x Impl</name>
<version>1.0.0-SNAPSHOT</version>
-
<url>http://turbine.apache.org/fulcrum/fulcrum-security/fulcrum-json-jackson2</url>
+
<url>http://turbine.apache.org/fulcrum/fulcrum-json/fulcrum-json-jackson2</url>
<scm>
<connection>scm:svn:http://svn.apache.org/repos/asf/turbine/fulcrum/trunk/json/jackson2/</connection>
<developerConnection>scm:svn:https://svn.apache.org/repos/asf/turbine/fulcrum/trunk/json/jackson2/</developerConnection>
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=1577505&r1=1577504&r2=1577505&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 12:51:41 2014
@@ -125,11 +125,11 @@ public class Jackson2MapperService exten
public <T> String ser(Object src, FilterProvider filter, Boolean
cleanCache) throws Exception {
String serResult= null;
if (src == null) {
- getLogger().info("no serializable object:" + src);
+ getLogger().info("no serializable object.");
return serResult;
}
if (filter == null) {
- getLogger().debug("ser class::" + src.getClass() + " without
filter " +filter);
+ getLogger().debug("ser class::" + src.getClass() + " without
filter.");
return ser(src);
}
getLogger().debug("ser class::" + src.getClass() + " with filter " +
filter);
Modified:
turbine/fulcrum/trunk/json/jackson2/src/java/org/apache/fulcrum/json/jackson/filters/CustomModuleWrapper.java
URL:
http://svn.apache.org/viewvc/turbine/fulcrum/trunk/json/jackson2/src/java/org/apache/fulcrum/json/jackson/filters/CustomModuleWrapper.java?rev=1577505&r1=1577504&r2=1577505&view=diff
==============================================================================
---
turbine/fulcrum/trunk/json/jackson2/src/java/org/apache/fulcrum/json/jackson/filters/CustomModuleWrapper.java
(original)
+++
turbine/fulcrum/trunk/json/jackson2/src/java/org/apache/fulcrum/json/jackson/filters/CustomModuleWrapper.java
Fri Mar 14 12:51:41 2014
@@ -1,8 +1,18 @@
package org.apache.fulcrum.json.jackson.filters;
+import org.apache.fulcrum.json.jackson.Jackson2MapperService;
+import org.apache.fulcrum.json.jackson.Jackson2MapperService.CustomModule;
+
import com.fasterxml.jackson.databind.deser.std.StdDeserializer;
import com.fasterxml.jackson.databind.ser.std.StdSerializer;
+/**
+ * Used by {@link Jackson2MapperService#addAdapter(String, Class, Object)} to
provide a wrapper module as a helper class
+ * for the inner class {@link CustomModule}.
+ * @author gkallidis
+ *
+ * @param <T>
+ */
public class CustomModuleWrapper<T> {
StdSerializer<T> ser;
StdDeserializer<T> deSer;
