From d19b5687bc2abf2405d672e0e2b32e27ccd7b5c2 Mon Sep 17 00:00:00 2001 From: j2blake Date: Thu, 26 Apr 2012 16:47:19 +0000 Subject: [PATCH] Minor code cleanup. --- .../vitro/webapp/controller/JsonServlet.java | 114 ++++++------------ 1 file changed, 38 insertions(+), 76 deletions(-) diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/JsonServlet.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/JsonServlet.java index 08fe49481..e4ba97682 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/JsonServlet.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/JsonServlet.java @@ -2,12 +2,15 @@ package edu.cornell.mannlib.vitro.webapp.controller; +import static edu.cornell.mannlib.vitro.webapp.dao.DisplayVocabulary.DISPLAY_ONT_MODEL; + import java.io.IOException; import java.io.PrintWriter; import java.io.Writer; import java.util.ArrayList; import java.util.Arrays; import java.util.Collection; +import java.util.Collections; import java.util.Iterator; import java.util.List; import java.util.ListIterator; @@ -27,7 +30,6 @@ import org.json.JSONException; import org.json.JSONObject; import com.hp.hpl.jena.ontology.OntModel; -import com.hp.hpl.jena.rdf.model.Literal; import edu.cornell.mannlib.vitro.webapp.beans.DataProperty; import edu.cornell.mannlib.vitro.webapp.beans.Individual; @@ -43,8 +45,6 @@ import edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.SelectListG import edu.cornell.mannlib.vitro.webapp.search.beans.ProhibitedFromSearch; import edu.cornell.mannlib.vitro.webapp.utils.pageDataGetter.PageDataGetterUtils; -import static edu.cornell.mannlib.vitro.webapp.dao.DisplayVocabulary.DISPLAY_ONT_MODEL; - /** * This servlet is for servicing requests for JSON objects/data. * It could be generalized to get other types of data ex. XML, HTML etc @@ -162,40 +162,17 @@ public class JsonServlet extends VitroHttpServlet { log.error(ex,ex); } - if( rObj == null ) - rObj = new JSONObject(); - - try{ - resp.setCharacterEncoding("UTF-8"); - resp.setContentType("application/json;charset=UTF-8"); - - if( errorMessage != null ){ - rObj.put("errorMessage", errorMessage); - resp.setStatus(500 /*HttpURLConnection.HTTP_SERVER_ERROR*/); - }else{ - rObj.put("errorMessage", ""); - } - Writer writer = resp.getWriter(); - writer.write(rObj.toString()); - }catch(JSONException jse){ - log.error(jse,jse); - } catch (IOException e) { - log.error(e,e); - } + writeJsonResponse(rObj, errorMessage, resp); } - + public static JSONObject getSolrIndividualsByVClass(String vclassURI, HttpServletRequest req, ServletContext context) throws Exception { - List vclassURIs = new ArrayList(); - vclassURIs.add(vclassURI); + List vclassURIs = Collections.singletonList(vclassURI); VitroRequest vreq = new VitroRequest(req); - VClass vclass=null; - JSONObject rObj = new JSONObject(); Map map = getSolrVClassIntersectionResults(vclassURIs, vreq, context); //last parameter indicates single vclass instead of multiple vclasses - rObj = processVClassResults(map, vreq, context, false); - return rObj; + return processVClassResults(map, vreq, context, false); } @@ -230,26 +207,7 @@ public class JsonServlet extends VitroHttpServlet { log.error(ex,ex); } - if( rObj == null ) - rObj = new JSONObject(); - - try{ - resp.setCharacterEncoding("UTF-8"); - resp.setContentType("application/json;charset=UTF-8"); - - if( errorMessage != null ){ - rObj.put("errorMessage", errorMessage); - resp.setStatus(500 /*HttpURLConnection.HTTP_SERVER_ERROR*/); - }else{ - rObj.put("errorMessage", ""); - } - Writer writer = resp.getWriter(); - writer.write(rObj.toString()); - }catch(JSONException jse){ - log.error(jse,jse); - } catch (IOException e) { - log.error(e,e); - } + writeJsonResponse(rObj, errorMessage, resp); } public static JSONObject getSolrIndividualsByVClasses(List vclassURIs, HttpServletRequest req, ServletContext context) throws Exception { @@ -543,45 +501,49 @@ public class JsonServlet extends VitroHttpServlet { } } - if( rObj == null ) - rObj = new JSONObject(); - //Send object - try{ - resp.setCharacterEncoding("UTF-8"); - resp.setContentType("application/json;charset=UTF-8"); - - if( errorMessage != null ){ - rObj.put("errorMessage", errorMessage); - resp.setStatus(500 /*HttpURLConnection.HTTP_SERVER_ERROR*/); - }else{ - rObj.put("errorMessage", ""); - } - Writer writer = resp.getWriter(); - writer.write(rObj.toString()); - }catch(JSONException jse){ - log.error(jse,jse); - } catch (IOException e) { - log.error(e,e); - } + writeJsonResponse(rObj, errorMessage, resp); } private JSONArray individualsToJson(List individuals) throws ServletException { - JSONArray ja = new JSONArray(); - Iterator it = individuals.iterator(); try{ - while(it.hasNext()){ - Individual ent = (Individual) it.next(); + JSONArray ja = new JSONArray(); + for (Individual ent: individuals) { JSONObject entJ = new JSONObject(); entJ.put("name", ent.getName()); entJ.put("URI", ent.getURI()); ja.put( entJ ); } + return ja; }catch(JSONException ex){ throw new ServletException("could not convert list of Individuals into JSON: " + ex); } - - return ja; } + private void writeJsonResponse(JSONObject rObj, String errorMessage, + HttpServletResponse resp) { + if( rObj == null ) { + rObj = new JSONObject(); + } + + try{ + resp.setCharacterEncoding("UTF-8"); + resp.setContentType("application/json;charset=UTF-8"); + + if( errorMessage != null ){ + rObj.put("errorMessage", errorMessage); + resp.setStatus(500 /*HttpURLConnection.HTTP_SERVER_ERROR*/); + }else{ + rObj.put("errorMessage", ""); + } + Writer writer = resp.getWriter(); + writer.write(rObj.toString()); + }catch(JSONException jse){ + log.error(jse,jse); + } catch (IOException e) { + log.error(e,e); + } + } + + }