Commit 12f47ae1 authored by Robert Butora's avatar Robert Butora
Browse files

renames PubdidResponseWrapper to FormatResponseWrapper

parent f411e118

data-discovery/src/main/java/vlkb/webapi/AuthorizationResponseFilter.java

+2 −2
Original line number Diff line number Diff line
@@ -40,9 +40,9 @@ public class AuthorizationResponseFilter implements Filter 


      chain.doFilter(request, response);



      if(response instanceof PubdidResponseWrapper)

      if(response instanceof FormatResponseWrapper)

      {

         PubdidResponseWrapper pw = (PubdidResponseWrapper) response;

         FormatResponseWrapper pw = (FormatResponseWrapper) response;

         LOGGER.info("after doFilter : " + pw.getPubdidArr().length);



         //if (pubdidWrapper.getContentType().contains("text/plain"))

data-discovery/src/main/java/vlkb/webapi/FormatResponseFilter.java

+3 −16
Original line number Diff line number Diff line
@@ -14,11 +14,11 @@ import javax.servlet.http.*; 
import java.nio.charset.Charset;





class PubdidResponseWrapper extends HttpServletResponseWrapper

class FormatResponseWrapper extends HttpServletResponseWrapper

{

   private SearchDescription search;



   public PubdidResponseWrapper(HttpServletResponse response)

   public FormatResponseWrapper(HttpServletResponse response)

   {

      super(response);

      search = null;
@@ -56,19 +56,6 @@ public class FormatResponseFilter implements Filter 
   {

      LOGGER.info("trace");



//      DbPSearch.loadDriver();

/*

      FIXME DbPSearch is using Settings.DBConn from SearchServlet -> discovery.properties



      /* load Surveys table * /

      DbPSearch vlkbSql;

      synchronized(DbPSearch.class)

      {

         vlkbSql = new DbPSearch();

      }



      dbSubsurveyArr = vlkbSql.getSurveyTable();

*/

      String surveysAbsPathname = settings.serviceUrls.surveysAbsPathname();

      LOGGER.info("Loading metadata from: " + surveysAbsPathname);

      dbSubsurveyArr = Subsurvey.loadSubsurveys(surveysAbsPathname);
@@ -84,7 +71,7 @@ public class FormatResponseFilter implements Filter 
      LOGGER.info("trace");

      LOGGER.info("REQUEST START =============================================================================================");



      PubdidResponseWrapper pubdidWrapper = new PubdidResponseWrapper((HttpServletResponse) response);

      FormatResponseWrapper pubdidWrapper = new FormatResponseWrapper((HttpServletResponse) response);



      chain.doFilter(request, pubdidWrapper);

data-discovery/src/main/java/vlkb/webapi/SearchServlet.java

+3 −3
Original line number Diff line number Diff line
@@ -66,9 +66,9 @@ public class SearchServlet extends javax.servlet.http.HttpServlet 


         /* if filters installed response will be wrapped */



         if(response instanceof PubdidResponseWrapper)

         if(response instanceof FormatResponseWrapper)

         {

            LOGGER.info("response-type is PubdidResponseWrapper");

            LOGGER.info("response-type is FormatResponseWrapper");



            response.setContentType("text/plain");

            response.setCharacterEncoding(RESPONSE_ENCODING);
@@ -79,7 +79,7 @@ public class SearchServlet extends javax.servlet.http.HttpServlet 
            search.pubdidArr = pubdidArr;

            search.inputs = inputs;



            PubdidResponseWrapper pubdidWrapper = (PubdidResponseWrapper) response;

            FormatResponseWrapper pubdidWrapper = (FormatResponseWrapper) response;

            pubdidWrapper.set(search);

         }

         else