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

Merge branch 'feature/WebScriptUtilsCapitalisation' into 'master'

Browse Source 
Feature/web script utils capitalisation

Fix capitalisation in a few method names in WebScriptUtils.

This also provides an opportunity to test whether the mirroring script works, as this includes changes to community files.

See merge request !218
This commit is contained in:
Tom Page
2016-06-08 17:16:57 +01:00
parent 2f08a32d53 fbc9c79ca2
commit 1ea82ae380
6 changed files with 16 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/script/CustomRefPost.java
View File

@@ -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);

4
rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/script/CustomReferenceDefinitionPost.java
View File

@@ -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<String, Object> executeImpl(WebScriptRequest req, Status status, Cache cache)
{
JSONObject requestContent = getRequestContentAsJsonObject(req);
JSONObject requestContent = getRequestContentAsJSONObject(req);
RelationshipDisplayName displayName = createDisplayName(requestContent);
RelationshipDefinition relationshipDefinition = getRelationshipService().createRelationshipDefinition(displayName);

4
rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/script/CustomReferenceDefinitionPut.java
View File

@@ -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<String, Object> 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);

4
rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/script/RelationshipsGet.java
View File

@@ -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());
}

4
rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/script/slingshot/RecordedVersionConfigPost.java
View File

@@ -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);
}
}

12
rm-community/rm-community-repo/source/java/org/alfresco/util/WebScriptUtils.java
View File

@@ -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<String> paramNames)
public static void checkMandatoryJSONParams(JSONObject jsonObject, List<String> 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);