From 12f47ae12b398212258b0003336fc31e0745d97f Mon Sep 17 00:00:00 2001
From: Robert Butora <robert.butora@gmail.com>
Date: Tue, 26 Mar 2024 11:59:16 -0400
Subject: [PATCH] renames PubdidResponseWrapper to FormatResponseWrapper
---
.../webapi/AuthorizationResponseFilter.java | 4 ++--
.../vlkb/webapi/FormatResponseFilter.java | 19 +++----------------
.../main/java/vlkb/webapi/SearchServlet.java | 6 +++---
3 files changed, 8 insertions(+), 21 deletions(-)
diff --git a/data-discovery/src/main/java/vlkb/webapi/AuthorizationResponseFilter.java b/data-discovery/src/main/java/vlkb/webapi/AuthorizationResponseFilter.java
index 78f4851..cd75f32 100644
--- a/data-discovery/src/main/java/vlkb/webapi/AuthorizationResponseFilter.java
+++ b/data-discovery/src/main/java/vlkb/webapi/AuthorizationResponseFilter.java
@@ -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"))
diff --git a/data-discovery/src/main/java/vlkb/webapi/FormatResponseFilter.java b/data-discovery/src/main/java/vlkb/webapi/FormatResponseFilter.java
index 2bc2e9c..5679289 100644
--- a/data-discovery/src/main/java/vlkb/webapi/FormatResponseFilter.java
+++ b/data-discovery/src/main/java/vlkb/webapi/FormatResponseFilter.java
@@ -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);
diff --git a/data-discovery/src/main/java/vlkb/webapi/SearchServlet.java b/data-discovery/src/main/java/vlkb/webapi/SearchServlet.java
index b880972..e7f56a6 100644
--- a/data-discovery/src/main/java/vlkb/webapi/SearchServlet.java
+++ b/data-discovery/src/main/java/vlkb/webapi/SearchServlet.java
@@ -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
--
GitLab