inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-07-31 17:39:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed critical issues reported by sonar (Simplify Conditional)

Browse Source 
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/HEAD@63806 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Tuna Aksoy
2014-03-09 22:03:24 +00:00
parent b64f1467b4
commit 0ed42e691c
8 changed files with 54 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/audit/extractor/AuthenticatedUserRolesDataExtractor.java
View File

@@ -74,7 +74,7 @@ public final class AuthenticatedUserRolesDataExtractor extends AbstractDataExtra
*/ */
public boolean isSupported(Serializable data) public boolean isSupported(Serializable data)
{ {
if (data == null || !(data instanceof NodeRef)) if (!(data instanceof NodeRef))
{ {
return false; return false;
} }

2
rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/audit/extractor/FilePlanIdentifierDataExtractor.java
View File

@@ -51,7 +51,7 @@ public final class FilePlanIdentifierDataExtractor extends AbstractDataExtractor
*/ */
public boolean isSupported(Serializable data) public boolean isSupported(Serializable data)
{ {
if (data == null || !(data instanceof NodeRef)) if (!(data instanceof NodeRef))
{ {
return false; return false;
} }

2
rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/audit/extractor/FilePlanNamePathDataExtractor.java
View File

@@ -65,7 +65,7 @@ public final class FilePlanNamePathDataExtractor extends AbstractDataExtractor
*/ */
public boolean isSupported(Serializable data) public boolean isSupported(Serializable data)
{ {
if (data == null || !(data instanceof NodeRef)) if (!(data instanceof NodeRef))
{ {
return false; return false;
} }

2
rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/audit/extractor/FilePlanNodeRefPathDataExtractor.java
View File

@@ -61,7 +61,7 @@ public final class FilePlanNodeRefPathDataExtractor extends AbstractDataExtracto
*/ */
public boolean isSupported(Serializable data) public boolean isSupported(Serializable data)
{ {
if (data == null || !(data instanceof NodeRef)) if (!(data instanceof NodeRef))
{ {
return false; return false;
} }

2
rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/disposition/DispositionActionImpl.java
View File

@@ -210,7 +210,7 @@ public class DispositionActionImpl implements DispositionAction,
private boolean getBooleanValue(Object value, boolean defaultValue) private boolean getBooleanValue(Object value, boolean defaultValue)
{ {
boolean result = defaultValue; boolean result = defaultValue;
if (value != null && value instanceof Boolean) if (value instanceof Boolean)
{ {
result = ((Boolean)value).booleanValue(); result = ((Boolean)value).booleanValue();
} }

3
rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/record/RecordServiceImpl.java
View File

@@ -554,8 +554,7 @@ public class RecordServiceImpl extends BaseBehaviourBean
} }
boolean propertyUnchanged = false; boolean propertyUnchanged = false;
if (beforeValue != null && afterValue != null && if (beforeValue instanceof Date && afterValue instanceof Date)
beforeValue instanceof Date && afterValue instanceof Date)
{ {
// deal with date values // deal with date values
propertyUnchanged = (((Date)beforeValue).compareTo((Date)afterValue) == 0); propertyUnchanged = (((Date)beforeValue).compareTo((Date)afterValue) == 0);

2
rm-server/source/java/org/alfresco/repo/action/ExtendedActionServiceImpl.java
View File

@@ -71,7 +71,7 @@ public class ExtendedActionServiceImpl extends ActionServiceImpl implements Appl
// get direct access to action condition definition (i.e. ignoring public flag of executer) // get direct access to action condition definition (i.e. ignoring public flag of executer)
ActionConditionDefinition definition = null; ActionConditionDefinition definition = null;
Object bean = extendedApplicationContext.getBean(name); Object bean = extendedApplicationContext.getBean(name);
if (bean != null && bean instanceof ActionConditionEvaluator) if (bean instanceof ActionConditionEvaluator)
{ {
ActionConditionEvaluator evaluator = (ActionConditionEvaluator) bean; ActionConditionEvaluator evaluator = (ActionConditionEvaluator) bean;
definition = evaluator.getActionConditionDefintion(); definition = evaluator.getActionConditionDefintion();

2
rm-server/source/java/org/alfresco/repo/action/parameter/ParameterProcessorComponent.java
View File

@@ -75,7 +75,7 @@ public class ParameterProcessorComponent implements ParameterSubstitutionSuggest
Object parameterValue = entry.getValue(); Object parameterValue = entry.getValue();
// only sub string property values // only sub string property values
if (parameterValue != null && parameterValue instanceof String) if (parameterValue instanceof String)
{ {
// set the updated parameter value // set the updated parameter value
ruleItem.setParameterValue(parameterName, process((String)parameterValue, actionedUponNodeRef)); ruleItem.setParameterValue(parameterName, process((String)parameterValue, actionedUponNodeRef));