diff --git a/source/java/org/alfresco/repo/jscript/SlingshotDocLibCustomResponse.java b/source/java/org/alfresco/repo/jscript/SlingshotDocLibCustomResponse.java index 592ec63a39..59ba980b34 100644 --- a/source/java/org/alfresco/repo/jscript/SlingshotDocLibCustomResponse.java +++ b/source/java/org/alfresco/repo/jscript/SlingshotDocLibCustomResponse.java @@ -21,7 +21,6 @@ package org.alfresco.repo.jscript; import org.alfresco.repo.jscript.app.CustomResponse; import org.json.JSONException; import org.json.JSONObject; -import org.springframework.extensions.webscripts.DefaultURLModel; import java.io.Serializable; import java.util.Map; @@ -50,9 +49,9 @@ public final class SlingshotDocLibCustomResponse extends BaseScopableProcessorEx * * @return The JSON string */ - public String getJSON(DefaultURLModel url) + public String getJSON() { - return this.getJSONObj(url).toString(); + return this.getJSONObj().toString(); } /** @@ -60,7 +59,7 @@ public final class SlingshotDocLibCustomResponse extends BaseScopableProcessorEx * * @return The JSON object */ - protected Object getJSONObj(DefaultURLModel url) + protected Object getJSONObj() { JSONObject json = new JSONObject(); @@ -69,7 +68,7 @@ public final class SlingshotDocLibCustomResponse extends BaseScopableProcessorEx { try { - Serializable response = ((CustomResponse) entry.getValue()).populate(url); + Serializable response = ((CustomResponse) entry.getValue()).populate(); json.put(entry.getKey(), response == null ? JSONObject.NULL: response); } catch (JSONException error) diff --git a/source/java/org/alfresco/repo/jscript/app/CustomResponse.java b/source/java/org/alfresco/repo/jscript/app/CustomResponse.java index e99e10afed..3317530991 100644 --- a/source/java/org/alfresco/repo/jscript/app/CustomResponse.java +++ b/source/java/org/alfresco/repo/jscript/app/CustomResponse.java @@ -21,8 +21,6 @@ package org.alfresco.repo.jscript.app; import java.io.Serializable; -import org.springframework.extensions.webscripts.DefaultURLModel; - /** * Interface for custom properties used by SlingshotDocLibCustomResponse * @@ -32,8 +30,6 @@ public interface CustomResponse { /** * Populates the DocLib webscript response with custom metadata - * - * @param url the URL that initiated the webscript request */ - Serializable populate(DefaultURLModel url); + Serializable populate(); } diff --git a/source/java/org/alfresco/repo/jscript/app/VtiServerCustomResponse.java b/source/java/org/alfresco/repo/jscript/app/VtiServerCustomResponse.java index ae2d3be167..79f07aa823 100644 --- a/source/java/org/alfresco/repo/jscript/app/VtiServerCustomResponse.java +++ b/source/java/org/alfresco/repo/jscript/app/VtiServerCustomResponse.java @@ -23,7 +23,6 @@ import org.alfresco.repo.jscript.ScriptUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.springframework.beans.BeansException; -import org.springframework.extensions.webscripts.DefaultURLModel; import java.io.Serializable; import java.util.LinkedHashMap; @@ -112,7 +111,7 @@ public class VtiServerCustomResponse implements CustomResponse * * @return JSONObject or null */ - public Serializable populate(DefaultURLModel url) + public Serializable populate() { try {