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 2017/07/03 06:36:53 UTC
svn commit: r1800593 - in /turbine/fulcrum/trunk/json:
gson/src/java/org/apache/fulcrum/json/gson/
jackson/src/java/org/apache/fulcrum/json/jackson/
jackson2/src/java/org/apache/fulcrum/json/jackson/
jackson2/src/java/org/apache/fulcrum/json/jackson/js...
Author: gk
Date: Mon Jul 3 06:36:53 2017
New Revision: 1800593
URL: http://svn.apache.org/viewvc?rev=1800593&view=rev
Log:
- cleanup some pmd violations
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
turbine/fulcrum/trunk/json/jackson2/src/java/org/apache/fulcrum/json/jackson/CacheService.java
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/jsonpath/JsonPathDefault.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=1800593&r1=1800592&r2=1800593&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 Jul 3 06:36:53 2017
@@ -71,8 +71,6 @@ public class GSONBuilderService extends
private String dateFormat;
- private static final String DEFAULTDATEFORMAT = "MM/dd/yyyy";
-
private Hashtable<String, String> adapters = null;
private boolean useJsonPath = false;
@@ -372,7 +370,7 @@ public class GSONBuilderService extends
// return paramFieldAttributes.getDeclaringClass() ==
// excludedThisClass &&
// excludesAttributes.contains(paramFieldAttributes.getName());
- return (!excludedAttributes.isEmpty()) ? this.excludedAttributes
+ return !excludedAttributes.isEmpty() ? this.excludedAttributes
.contains(paramFieldAttributes.getName()) : false;
}
}.init(clazz, filterAttrs);
@@ -407,7 +405,7 @@ public class GSONBuilderService extends
@Override
public boolean shouldSkipClass(Class<?> clazz) {
getLogger().debug(includeThisClass+ ": comparing include class:" + clazz);
- return (includeThisClass != null) ? !includeThisClass
+ return includeThisClass != null ? !includeThisClass
.equals(clazz) : false;
}
@@ -416,7 +414,7 @@ public class GSONBuilderService extends
*/
@Override
public boolean shouldSkipField(FieldAttributes paramFieldAttributes) {
- return (!includedAttributes.isEmpty()) ? !this.includedAttributes
+ return !includedAttributes.isEmpty() ? !this.includedAttributes
.contains(paramFieldAttributes.getName()) : true;
}
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=1800593&r1=1800592&r2=1800593&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 Jul 3 06:36:53 2017
@@ -286,27 +286,23 @@ public class JacksonMapperService extend
private <T> void setCustomIntrospectorWithExternalFilterId(
Class<T> externalFilterId) {
- if (primary instanceof CustomIntrospector) {
- if (externalFilterId != null) {
+ if (primary instanceof CustomIntrospector && externalFilterId != null) {
((CustomIntrospector) primary)
.setExternalFilterClasses(externalFilterId);
getLogger().debug(
"added class from filters "
+ externalFilterId.getName());
- }
}
}
private <T> void removeCustomIntrospectorWithExternalFilterId(
Class<T> externalFilterId) {
- if (primary instanceof CustomIntrospector) {
- if (externalFilterId != null) {
+ if (primary instanceof CustomIntrospector && externalFilterId != null) {
((CustomIntrospector) primary)
.removeExternalFilterClass(externalFilterId);
getLogger().debug(
"removed from introspector filter id "
+ externalFilterId.getName());
- }
}
}
Modified: turbine/fulcrum/trunk/json/jackson2/src/java/org/apache/fulcrum/json/jackson/CacheService.java
URL: http://svn.apache.org/viewvc/turbine/fulcrum/trunk/json/jackson2/src/java/org/apache/fulcrum/json/jackson/CacheService.java?rev=1800593&r1=1800592&r2=1800593&view=diff
==============================================================================
--- turbine/fulcrum/trunk/json/jackson2/src/java/org/apache/fulcrum/json/jackson/CacheService.java (original)
+++ turbine/fulcrum/trunk/json/jackson2/src/java/org/apache/fulcrum/json/jackson/CacheService.java Mon Jul 3 06:36:53 2017
@@ -57,15 +57,13 @@ public class CacheService implements Log
<T> void removeCustomIntrospectorWithExternalFilterId(
Class<T> externalFilterId, Boolean excludeType) {
- if (primary instanceof SimpleNameIntrospector) {
- if (externalFilterId != null) {
+ if (primary instanceof SimpleNameIntrospector && externalFilterId != null) {
((SimpleNameIntrospector) primary)
.removeFilteredClass(externalFilterId);
if (excludeType) {
((SimpleNameIntrospector) primary)
.removeExternalFilterExcludeClass(externalFilterId);
}
- }
}
}
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=1800593&r1=1800592&r2=1800593&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 Jul 3 06:36:53 2017
@@ -369,8 +369,6 @@ public class Jackson2MapperService exten
SimpleFilterProvider filter = (SimpleFilterProvider) cacheService.getFilters().get(src.getClass()
.getName());
return ser(src, filter, cleanCache);//mapper.writerWithView(src.getClass()).writeValueAsString(src);
- } else {
-
}
String res = mapper.writerWithView(Object.class).writeValueAsString(src);
if (cleanCache != null && cleanCache) {
Modified: turbine/fulcrum/trunk/json/jackson2/src/java/org/apache/fulcrum/json/jackson/jsonpath/JsonPathDefault.java
URL: http://svn.apache.org/viewvc/turbine/fulcrum/trunk/json/jackson2/src/java/org/apache/fulcrum/json/jackson/jsonpath/JsonPathDefault.java?rev=1800593&r1=1800592&r2=1800593&view=diff
==============================================================================
--- turbine/fulcrum/trunk/json/jackson2/src/java/org/apache/fulcrum/json/jackson/jsonpath/JsonPathDefault.java (original)
+++ turbine/fulcrum/trunk/json/jackson2/src/java/org/apache/fulcrum/json/jackson/jsonpath/JsonPathDefault.java Mon Jul 3 06:36:53 2017
@@ -40,7 +40,7 @@ import com.jayway.jsonpath.spi.mapper.Ma
*
*/
public class JsonPathDefault implements
- com.jayway.jsonpath.Configuration.Defaults {
+ Defaults {
private final JsonProvider jsonProvider;
private final MappingProvider mappingProvider;