From fbc9c79ca203ada802b2e7117f5ceeeefed00f03 Mon Sep 17 00:00:00 2001 From: Tom Page Date: Mon, 6 Jun 2016 14:55:56 +0100 Subject: [PATCH] Refactor WebScriptUtils to have consistent capitalisation of JSON. Also fix capitalisation in putValuetoJSONObject (so that it's now putValueToJSONObject). --- .../org_alfresco_module_rm/script/CustomRefPost.java | 4 ++-- .../script/CustomReferenceDefinitionPost.java | 4 ++-- .../script/CustomReferenceDefinitionPut.java | 4 ++-- .../script/RelationshipsGet.java | 4 ++-- .../script/slingshot/RecordedVersionConfigPost.java | 4 ++-- .../java/org/alfresco/util/WebScriptUtils.java | 12 ++++++------ 6 files changed, 16 insertions(+), 16 deletions(-) diff --git a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/script/CustomRefPost.java b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/script/CustomRefPost.java index 0ff44e1b46..c514870f4d 100644 --- a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/script/CustomRefPost.java +++ b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/script/CustomRefPost.java @@ -27,7 +27,7 @@ package org.alfresco.module.org_alfresco_module_rm.script; -import static org.alfresco.util.WebScriptUtils.getRequestContentAsJsonObject; +import static org.alfresco.util.WebScriptUtils.getRequestContentAsJSONObject; import static org.alfresco.util.WebScriptUtils.getStringValueFromJSONObject; import java.util.HashMap; @@ -130,7 +130,7 @@ public class CustomRefPost extends AbstractRmWebScript */ protected void addCustomRelationship(WebScriptRequest req) { - JSONObject json = getRequestContentAsJsonObject(req); + JSONObject json = getRequestContentAsJSONObject(req); String uniqueName = getStringValueFromJSONObject(json, REF_ID); NodeRef target = getTargetNode(json); NodeRef source = parseRequestForNodeRef(req); diff --git a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/script/CustomReferenceDefinitionPost.java b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/script/CustomReferenceDefinitionPost.java index 656001652b..84755cf312 100644 --- a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/script/CustomReferenceDefinitionPost.java +++ b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/script/CustomReferenceDefinitionPost.java @@ -27,7 +27,7 @@ package org.alfresco.module.org_alfresco_module_rm.script; -import static org.alfresco.util.WebScriptUtils.getRequestContentAsJsonObject; +import static org.alfresco.util.WebScriptUtils.getRequestContentAsJSONObject; import java.util.HashMap; import java.util.Map; @@ -56,7 +56,7 @@ public class CustomReferenceDefinitionPost extends CustomReferenceDefinitionBase @Override protected Map executeImpl(WebScriptRequest req, Status status, Cache cache) { - JSONObject requestContent = getRequestContentAsJsonObject(req); + JSONObject requestContent = getRequestContentAsJSONObject(req); RelationshipDisplayName displayName = createDisplayName(requestContent); RelationshipDefinition relationshipDefinition = getRelationshipService().createRelationshipDefinition(displayName); diff --git a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/script/CustomReferenceDefinitionPut.java b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/script/CustomReferenceDefinitionPut.java index 5a771eab6e..f154010b5f 100644 --- a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/script/CustomReferenceDefinitionPut.java +++ b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/script/CustomReferenceDefinitionPut.java @@ -27,7 +27,7 @@ package org.alfresco.module.org_alfresco_module_rm.script; -import static org.alfresco.util.WebScriptUtils.getRequestContentAsJsonObject; +import static org.alfresco.util.WebScriptUtils.getRequestContentAsJSONObject; import static org.alfresco.util.WebScriptUtils.getRequestParameterValue; import java.util.HashMap; @@ -58,7 +58,7 @@ public class CustomReferenceDefinitionPut extends CustomReferenceDefinitionBase protected Map executeImpl(WebScriptRequest req, Status status, Cache cache) { String uniqueName = getRequestParameterValue(req, REF_ID); - JSONObject requestContent = getRequestContentAsJsonObject(req); + JSONObject requestContent = getRequestContentAsJSONObject(req); RelationshipDisplayName displayName = createDisplayName(requestContent); getRelationshipService().updateRelationshipDefinition(uniqueName, displayName); diff --git a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/script/RelationshipsGet.java b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/script/RelationshipsGet.java index 58f3b17314..3260848356 100644 --- a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/script/RelationshipsGet.java +++ b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/script/RelationshipsGet.java @@ -181,8 +181,8 @@ public class RelationshipsGet extends AbstractRmWebScript String nodeDetails = getJsonConversionComponent().toJSON(node, true); JSONObject jsonObject = WebScriptUtils.createJSONObject(nodeDetails); - WebScriptUtils.putValuetoJSONObject(jsonObject, RELATIONSHIP_LABEL, label); - WebScriptUtils.putValuetoJSONObject(jsonObject, RELATIONSHIP_UNIQUE_NAME, relationshipDefinition.getUniqueName()); + WebScriptUtils.putValueToJSONObject(jsonObject, RELATIONSHIP_LABEL, label); + WebScriptUtils.putValueToJSONObject(jsonObject, RELATIONSHIP_UNIQUE_NAME, relationshipDefinition.getUniqueName()); result.add(jsonObject.toString()); } diff --git a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/script/slingshot/RecordedVersionConfigPost.java b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/script/slingshot/RecordedVersionConfigPost.java index d313ed909a..947440d8c5 100644 --- a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/script/slingshot/RecordedVersionConfigPost.java +++ b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/script/slingshot/RecordedVersionConfigPost.java @@ -27,7 +27,7 @@ package org.alfresco.module.org_alfresco_module_rm.script.slingshot; -import static org.alfresco.util.WebScriptUtils.getRequestContentAsJsonObject; +import static org.alfresco.util.WebScriptUtils.getRequestContentAsJSONObject; import static org.alfresco.util.WebScriptUtils.getStringValueFromJSONObject; import java.util.HashMap; @@ -95,7 +95,7 @@ public class RecordedVersionConfigPost extends AbstractRmWebScript */ private String getRecordableVersionPolicy(WebScriptRequest req) { - JSONObject requestContent = getRequestContentAsJsonObject(req); + JSONObject requestContent = getRequestContentAsJSONObject(req); return getStringValueFromJSONObject(requestContent, RECORDED_VERSION); } } diff --git a/rm-community/rm-community-repo/source/java/org/alfresco/util/WebScriptUtils.java b/rm-community/rm-community-repo/source/java/org/alfresco/util/WebScriptUtils.java index f11a9016a4..28c1fe279f 100644 --- a/rm-community/rm-community-repo/source/java/org/alfresco/util/WebScriptUtils.java +++ b/rm-community/rm-community-repo/source/java/org/alfresco/util/WebScriptUtils.java @@ -126,7 +126,7 @@ public final class WebScriptUtils * @param req The webscript request * @return The request content as JSON object */ - public static JSONObject getRequestContentAsJsonObject(WebScriptRequest req) + public static JSONObject getRequestContentAsJSONObject(WebScriptRequest req) { mandatory("req", req); @@ -172,7 +172,7 @@ public final class WebScriptUtils * @param jsonObject The json object * @param paramName The parameter name to check for */ - public static void checkMandatoryJsonParam(JSONObject jsonObject, String paramName) + public static void checkMandatoryJSONParam(JSONObject jsonObject, String paramName) { mandatory("jsonObject", jsonObject); mandatoryString("paramName", paramName); @@ -189,14 +189,14 @@ public final class WebScriptUtils * @param jsonObject The json object. * @param paramNames The parameter names to check for */ - public static void checkMandatoryJsonParams(JSONObject jsonObject, List paramNames) + public static void checkMandatoryJSONParams(JSONObject jsonObject, List paramNames) { mandatory("jsonObject", jsonObject); mandatory("paramNames", paramNames); for (String name : paramNames) { - checkMandatoryJsonParam(jsonObject, name); + checkMandatoryJSONParam(jsonObject, name); } } @@ -231,7 +231,7 @@ public final class WebScriptUtils if (checkKey) { - checkMandatoryJsonParam(jsonObject, key); + checkMandatoryJSONParam(jsonObject, key); } String value = null; @@ -262,7 +262,7 @@ public final class WebScriptUtils * @param key The key * @param value The value */ - public static void putValuetoJSONObject(JSONObject jsonObject, String key, Object value) + public static void putValueToJSONObject(JSONObject jsonObject, String key, Object value) { mandatory("jsonObject", jsonObject); mandatoryString("key", key);