inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-10-08 14:51:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed minor issues reported by sonar (Useless String Value Of)

Browse Source 
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/HEAD@63802 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Tuna Aksoy
2014-03-09 21:39:32 +00:00
parent f4ada629de
commit 173abadbfa
1 changed files with 34 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

69
rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/script/CustomReferenceDefinitionsGet.java
View File

@@ -46,7 +46,7 @@ import org.springframework.extensions.webscripts.WebScriptRequest;
*/ */
public class CustomReferenceDefinitionsGet extends DeclarativeWebScript public class CustomReferenceDefinitionsGet extends DeclarativeWebScript
{ {
private static final String REFERENCE_TYPE = "referenceType"; private static final String REFERENCE_TYPE = "referenceType";
private static final String REF_ID = "refId"; private static final String REF_ID = "refId";
private static final String LABEL = "label"; private static final String LABEL = "label";
private static final String SOURCE = "source"; private static final String SOURCE = "source";
@@ -75,52 +75,51 @@ public class CustomReferenceDefinitionsGet extends DeclarativeWebScript
Map<String, String> templateVars = req.getServiceMatch().getTemplateVars(); Map<String, String> templateVars = req.getServiceMatch().getTemplateVars();
String refId = templateVars.get(REF_ID); String refId = templateVars.get(REF_ID);
if (logger.isDebugEnabled())
{
logger.debug("Getting custom reference definitions with refId: " + refId);
}
if (logger.isDebugEnabled()) Map<QName, AssociationDefinition> currentCustomRefs = rmAdminService.getCustomReferenceDefinitions();
{
logger.debug("Getting custom reference definitions with refId: " + String.valueOf(refId));
}
Map<QName, AssociationDefinition> currentCustomRefs = rmAdminService.getCustomReferenceDefinitions(); // If refId has been provided then this is a request for a single custom-ref-defn.
// If refId has been provided then this is a request for a single custom-ref-defn.
// else it is a request for them all. // else it is a request for them all.
if (refId != null) if (refId != null)
{ {
QName qn = rmAdminService.getQNameForClientId(refId); QName qn = rmAdminService.getQNameForClientId(refId);
AssociationDefinition assDef = currentCustomRefs.get(qn); AssociationDefinition assDef = currentCustomRefs.get(qn);
if (assDef == null) if (assDef == null)
{ {
StringBuilder msg = new StringBuilder(); StringBuilder msg = new StringBuilder();
msg.append("Unable to find reference: ").append(refId); msg.append("Unable to find reference: ").append(refId);
if (logger.isDebugEnabled()) if (logger.isDebugEnabled())
{ {
logger.debug(msg.toString()); logger.debug(msg.toString());
} }
throw new WebScriptException(HttpServletResponse.SC_NOT_FOUND, throw new WebScriptException(HttpServletResponse.SC_NOT_FOUND,
msg.toString()); msg.toString());
} }
currentCustomRefs = new HashMap<QName, AssociationDefinition>(1); currentCustomRefs = new HashMap<QName, AssociationDefinition>(1);
currentCustomRefs.put(qn, assDef); currentCustomRefs.put(qn, assDef);
} }
List<Map<String, String>> listOfReferenceData = new ArrayList<Map<String, String>>(); List<Map<String, String>> listOfReferenceData = new ArrayList<Map<String, String>>();
for (Entry<QName, AssociationDefinition> entry : currentCustomRefs.entrySet()) for (Entry<QName, AssociationDefinition> entry : currentCustomRefs.entrySet())
{ {
Map<String, String> data = new HashMap<String, String>(); Map<String, String> data = new HashMap<String, String>();
AssociationDefinition nextValue = entry.getValue(); AssociationDefinition nextValue = entry.getValue();
CustomReferenceType referenceType = nextValue instanceof ChildAssociationDefinition ? CustomReferenceType referenceType = nextValue instanceof ChildAssociationDefinition ?
CustomReferenceType.PARENT_CHILD : CustomReferenceType.BIDIRECTIONAL; CustomReferenceType.PARENT_CHILD : CustomReferenceType.BIDIRECTIONAL;
data.put(REFERENCE_TYPE, referenceType.toString()); data.put(REFERENCE_TYPE, referenceType.toString());
// It is the title which stores either the label, or the source and target. // It is the title which stores either the label, or the source and target.
String nextTitle = nextValue.getTitle(dictionaryService); String nextTitle = nextValue.getTitle(dictionaryService);
if (CustomReferenceType.PARENT_CHILD.equals(referenceType)) if (CustomReferenceType.PARENT_CHILD.equals(referenceType))
{ {
if (nextTitle != null) if (nextTitle != null)
@@ -144,15 +143,15 @@ public class CustomReferenceDefinitionsGet extends DeclarativeWebScript
throw new WebScriptException("Unsupported custom reference type: " + referenceType); throw new WebScriptException("Unsupported custom reference type: " + referenceType);
} }
listOfReferenceData.add(data); listOfReferenceData.add(data);
} }
if (logger.isDebugEnabled()) if (logger.isDebugEnabled())
{ {
logger.debug("Retrieved custom reference definitions: " + listOfReferenceData.size()); logger.debug("Retrieved custom reference definitions: " + listOfReferenceData.size());
} }
model.put(CUSTOM_REFS, listOfReferenceData); model.put(CUSTOM_REFS, listOfReferenceData);
return model; return model;
} }