From b0e9e21a6bfa0b010cf01abffb74144da68a6667 Mon Sep 17 00:00:00 2001 From: Antonin Delpeuch Date: Tue, 20 Nov 2018 16:27:19 +0000 Subject: [PATCH] Remove spurious references to org.json --- .../com/google/refine/commands/Command.java | 77 ++++++------------- .../GetAllProjectMetadataCommand.java | 10 +-- .../workspace/GetAllProjectTagsCommand.java | 12 +-- .../refine/tests/commands/CommandStub.java | 9 +-- .../refine/tests/commands/CommandTests.java | 55 ------------- 5 files changed, 31 insertions(+), 132 deletions(-) diff --git a/main/src/com/google/refine/commands/Command.java b/main/src/com/google/refine/commands/Command.java index 8108d207a..5c605f7e5 100644 --- a/main/src/com/google/refine/commands/Command.java +++ b/main/src/com/google/refine/commands/Command.java @@ -44,8 +44,6 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import org.apache.velocity.VelocityContext; -import org.json.JSONException; -import org.json.JSONObject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -116,20 +114,14 @@ public abstract class Command { * @return * @throws JSONException */ - static protected EngineConfig getEngineConfig(HttpServletRequest request) - throws JSONException { + static protected EngineConfig getEngineConfig(HttpServletRequest request) { if (request == null) { throw new IllegalArgumentException("parameter 'request' should not be null"); } String json = request.getParameter("engine"); - try{ - return (json == null) ? null : + return (json == null) ? null : EngineConfig.reconstruct(json); - } catch (JSONException e){ - logger.debug( json + " could not be parsed to JSON"); - return null; - } } /** @@ -222,21 +214,6 @@ public abstract class Command { } return def; } - - static protected JSONObject getJsonParameter(HttpServletRequest request, String name) { - if (request == null) { - throw new IllegalArgumentException("parameter 'request' should not be null"); - } - String value = request.getParameter(name); - if (value != null) { - try { - return ParsingUtilities.evaluateJsonStringToObject(value); - } catch (JSONException e) { - logger.warn("error getting json parameter",e); - } - } - return null; - } protected static class HistoryEntryResponse { @JsonProperty("code") @@ -286,7 +263,7 @@ public abstract class Command { } static protected void respond(HttpServletResponse response, String status, String message) - throws IOException, JSONException { + throws IOException { Writer w = response.getWriter(); JsonGenerator writer = ParsingUtilities.mapper.getFactory().createGenerator(w); @@ -301,14 +278,14 @@ public abstract class Command { } static protected void respondJSON(HttpServletResponse response, Object o) - throws IOException, JSONException { + throws IOException { respondJSON(response, o, new Properties()); } static protected void respondJSON( HttpServletResponse response, Object o, Properties options) - throws IOException, JSONException { + throws IOException { response.setCharacterEncoding("UTF-8"); response.setHeader("Content-Type", "application/json"); @@ -330,30 +307,26 @@ public abstract class Command { throw new ServletException("Response object can't be null"); } - try { - response.setCharacterEncoding("UTF-8"); - response.setHeader("Content-Type", "application/json"); - - StringWriter sw = new StringWriter(); - PrintWriter pw = new PrintWriter(sw); - e.printStackTrace(pw); - pw.flush(); - sw.flush(); - - Writer w = response.getWriter(); - JsonGenerator writer = ParsingUtilities.mapper.getFactory().createGenerator(w); - writer.writeStartObject(); - writer.writeStringField("code", "error"); - writer.writeStringField("message", e.getMessage()); - writer.writeStringField("stack", sw.toString()); - writer.writeEndObject(); - writer.flush(); - writer.close(); - w.flush(); - w.close(); - } catch (JSONException e1) { - e.printStackTrace(response.getWriter()); - } + response.setCharacterEncoding("UTF-8"); + response.setHeader("Content-Type", "application/json"); + + StringWriter sw = new StringWriter(); + PrintWriter pw = new PrintWriter(sw); + e.printStackTrace(pw); + pw.flush(); + sw.flush(); + + Writer w = response.getWriter(); + JsonGenerator writer = ParsingUtilities.mapper.getFactory().createGenerator(w); + writer.writeStartObject(); + writer.writeStringField("code", "error"); + writer.writeStringField("message", e.getMessage()); + writer.writeStringField("stack", sw.toString()); + writer.writeEndObject(); + writer.flush(); + writer.close(); + w.flush(); + w.close(); } protected void respondWithErrorPage( diff --git a/main/src/com/google/refine/commands/workspace/GetAllProjectMetadataCommand.java b/main/src/com/google/refine/commands/workspace/GetAllProjectMetadataCommand.java index 3388df788..f52b5c3e5 100644 --- a/main/src/com/google/refine/commands/workspace/GetAllProjectMetadataCommand.java +++ b/main/src/com/google/refine/commands/workspace/GetAllProjectMetadataCommand.java @@ -40,8 +40,6 @@ import javax.servlet.ServletException; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import org.json.JSONException; - import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonInclude.Include; import com.fasterxml.jackson.annotation.JsonProperty; @@ -69,11 +67,7 @@ public class GetAllProjectMetadataCommand extends Command { public void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException { - try { - String userMeta = (String)ProjectManager.singleton.getPreferenceStore().get("userMetadata"); - respondJSON(response, new AllProjectMetadata(ProjectManager.singleton.getAllProjectMetadata(), userMeta)); - } catch (JSONException e) { - respondException(response, e); - } + String userMeta = (String)ProjectManager.singleton.getPreferenceStore().get("userMetadata"); + respondJSON(response, new AllProjectMetadata(ProjectManager.singleton.getAllProjectMetadata(), userMeta)); } } \ No newline at end of file diff --git a/main/src/com/google/refine/commands/workspace/GetAllProjectTagsCommand.java b/main/src/com/google/refine/commands/workspace/GetAllProjectTagsCommand.java index 10920810e..ad6e5378a 100644 --- a/main/src/com/google/refine/commands/workspace/GetAllProjectTagsCommand.java +++ b/main/src/com/google/refine/commands/workspace/GetAllProjectTagsCommand.java @@ -34,8 +34,6 @@ import javax.servlet.ServletException; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import org.json.JSONException; - import com.fasterxml.jackson.annotation.JsonProperty; import com.google.refine.ProjectManager; import com.google.refine.commands.Command; @@ -56,12 +54,8 @@ public class GetAllProjectTagsCommand extends Command { public void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException { - try { - Map tagMap = ProjectManager.singleton.getAllProjectTags(); - Set tags = tagMap == null ? Collections.emptySet() : tagMap.keySet(); - respondJSON(response, new AllProjectsTags(tags)); - } catch (JSONException e) { - respondException(response, e); - } + Map tagMap = ProjectManager.singleton.getAllProjectTags(); + Set tags = tagMap == null ? Collections.emptySet() : tagMap.keySet(); + respondJSON(response, new AllProjectsTags(tags)); } } \ No newline at end of file diff --git a/main/tests/server/src/com/google/refine/tests/commands/CommandStub.java b/main/tests/server/src/com/google/refine/tests/commands/CommandStub.java index e0831550e..f30531ddd 100644 --- a/main/tests/server/src/com/google/refine/tests/commands/CommandStub.java +++ b/main/tests/server/src/com/google/refine/tests/commands/CommandStub.java @@ -36,9 +36,6 @@ package com.google.refine.tests.commands; import javax.servlet.ServletException; import javax.servlet.http.HttpServletRequest; -import org.json.JSONException; -import org.json.JSONObject; - import com.google.refine.browsing.Engine; import com.google.refine.browsing.EngineConfig; import com.google.refine.commands.Command; @@ -55,7 +52,7 @@ public class CommandStub extends Command { } public EngineConfig wrapGetEngineConfig(HttpServletRequest request) - throws JSONException { + { return getEngineConfig(request); } @@ -67,8 +64,4 @@ public class CommandStub extends Command { public int wrapGetIntegerParameter(HttpServletRequest request, String name,int def) { return getIntegerParameter(request, name, def); } - - public JSONObject wrapGetJsonParameter(HttpServletRequest request,String name) { - return getJsonParameter(request, name); - } } diff --git a/main/tests/server/src/com/google/refine/tests/commands/CommandTests.java b/main/tests/server/src/com/google/refine/tests/commands/CommandTests.java index 68b4a942e..2497cc1b6 100644 --- a/main/tests/server/src/com/google/refine/tests/commands/CommandTests.java +++ b/main/tests/server/src/com/google/refine/tests/commands/CommandTests.java @@ -296,59 +296,4 @@ public class CommandTests extends RefineTest { verify(request, times(1)).getParameter("zeronumber"); verify(request, times(1)).getParameter("negativenumber"); } - - // ---------------------getJsonParameter tests---------------- - @Test - public void getJsonParameterWithNullParameters() { - when(request.getParameter(null)).thenReturn(null); - when(request.getParameter("")).thenReturn(null); - - try { - SUT.wrapGetJsonParameter(null, null); - Assert.fail(); - } catch (IllegalArgumentException e) { - // expected - } - - Assert.assertNull(SUT.wrapGetJsonParameter(request, null)); - - try { - SUT.wrapGetJsonParameter(null, "test"); - } catch (IllegalArgumentException e) { - // expected - } - - Assert.assertNull(SUT.wrapGetJsonParameter(request, "")); - - verify(request, times(1)).getParameter(null); - verify(request, times(1)).getParameter(""); - } - - @Test - public void getJsonParameterRegressionTest() { - when(request.getParameter("test")).thenReturn("{\"foo\":\"bar\"}"); - - JSONObject o = SUT.wrapGetJsonParameter(request, "test"); - Assert.assertNotNull(o); - try { - Assert.assertEquals("bar", o.getString("foo")); - } catch (JSONException e) { - Assert.fail(); - } - - verify(request, times(1)).getParameter("test"); - } - - @Test - public void getJsonParameterWithMalformedJson() { - when(request.getParameter("test")).thenReturn("brokenJSON"); - - try { - Assert.assertNull(SUT.wrapGetJsonParameter(request, "test")); - } catch (Exception e) { - Assert.fail(); - } - - verify(request, times(1)).getParameter("test"); - } }