moves error handling classes to volib

data-discovery/mvn-install-own-deps.sh

@@ -19,12 +19,4 @@ mvn install:install-file \
    -Dpackaging=jar \
    -DgeneratePom=true
 
-mvn install:install-file \
-   -Dfile=../java-libs/lib/vlkb-volib-0.9.1.jar \
-   -DgroupId=vo \
-   -DartifactId=vlkb-volib \
-   -Dversion=0.9.1 \
-   -Dpackaging=jar \
-   -DgeneratePom=true
-
 

data-discovery/pom.xml

@@ -39,7 +39,7 @@
           <dependency>
                   <groupId>vo</groupId>
                   <artifactId>vlkb-volib</artifactId>
-                  <version>0.9.1</version>
+                  <version>0.9.2</version>
           </dependency>
 
           <dependency>

data-discovery/src/main/java/webapi/MultiValuedParamNotSupported.java

-
-
-
-public class MultiValuedParamNotSupported  extends IllegalArgumentException {
-    public MultiValuedParamNotSupported(String errorMessage){//, Throwable err) {
-        super(errorMessage);//, err);
-    }
-}

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

@@ -38,22 +38,6 @@ public class SearchServlet extends javax.servlet.http.HttpServlet
       LOGGER.config("DB: " + settings.dbConn.toString());
    }
 
-   protected void doMultiValuedParamNotSupported(String message, PrintWriter printWriter)
-   {
-      printWriter.println("MultiValuedParamNotSupported : " + message);
-   }
-
-   protected void doUsageError(String message, PrintWriter printWriter)
-   {
-      printWriter.println("UsageError : " + message);
-   }
-
-   protected void doError(String message, PrintWriter printWriter)
-   {
-      printWriter.println("Error : " + message);
-   }
-
-
    protected void doGet(HttpServletRequest request, HttpServletResponse response)
       throws ServletException, IOException, UnsupportedEncodingException
    {
@@ -146,7 +130,7 @@ public class SearchServlet extends javax.servlet.http.HttpServlet
          response.setContentType("text/plain");
 
          PrintWriter writer = response.getWriter();
-         doMultiValuedParamNotSupported(ex.getMessage(), writer);
+         Response.doMultiValuedParamNotSupported(ex.getMessage(), writer);
          writer.close();
       }
       catch(IllegalArgumentException ex)
@@ -157,7 +141,7 @@ public class SearchServlet extends javax.servlet.http.HttpServlet
          response.setContentType("text/plain");
 
          PrintWriter writer = response.getWriter();
-         doUsageError(ex.getMessage(), writer);
+         Response.doUsageError(ex.getMessage(), writer);
          writer.close();
       }
       catch(Exception ex)
@@ -169,7 +153,7 @@ public class SearchServlet extends javax.servlet.http.HttpServlet
          response.setContentType("text/plain");
 
          PrintWriter writer = response.getWriter();
-         doError(ex.toString(), writer);
+         Response.doError(ex.toString(), writer);
          writer.close();
       }
 

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

@@ -28,38 +28,17 @@ public class FormatResponseFilter implements Filter
    private static final FormatResponseSettings settings = FormatResponseSettings.getInstance(
          "formatresponsefilter.properties");
 
-   //@Override
    public void init(FilterConfig filterConfig) throws ServletException
    {
       LOGGER.config("Default charset: " + Charset.defaultCharset());
       LOGGER.config("DB: " + settings.dbConn.toString());
    }
 
-   // FIXME move error handling funcs to VOlib
-
-   private void doMultiValuedParamNotSupported(String message, PrintWriter printWriter)
-   {
-      printWriter.println("MultiValuedParamNotSupported : " + message);
-   }
-
-   private void doUsageError(String message, PrintWriter printWriter)
-   {
-      printWriter.println("UsageError : " + message);
-   }
-
-   private void doError(String message, PrintWriter printWriter)
-   {
-      printWriter.println("Error : " + message);
-   }
-
-
-
-   //@Override
    public void doFilter(ServletRequest request, ServletResponse response, FilterChain chain)
       throws IOException, ServletException
    {
       LOGGER.fine("trace");
-      LOGGER.fine("REQUEST START =============================================================================================");
+      LOGGER.fine("REQUEST START");
 
       final String RESPONSE_ENCODING = "UTF-8";
       final String DEFAULT_RESPONSEFORMAT = settings.defaults.responseFormat;
@@ -119,7 +98,7 @@ public class FormatResponseFilter implements Filter
                final String errMsg = "Illegal response format request: " + respFormat;
                LOGGER.warning(errMsg);
                response.setContentType("text/plain");
-               doUsageError(errMsg, responseWriter);
+               Response.doUsageError(errMsg, responseWriter);
                // FIXME set http err code 
             }
 
@@ -138,7 +117,7 @@ public class FormatResponseFilter implements Filter
          responseWrapper.setContentType("text/plain");
 
          PrintWriter writer = responseWrapper.getWriter();
-         doMultiValuedParamNotSupported(ex.getMessage(), writer);
+         Response.doMultiValuedParamNotSupported(ex.getMessage(), writer);
          writer.close();
       }
       catch(IllegalArgumentException ex)
@@ -149,7 +128,7 @@ public class FormatResponseFilter implements Filter
          responseWrapper.setContentType("text/plain");
 
          PrintWriter writer = responseWrapper.getWriter();
-         doUsageError(ex.getMessage(), writer);
+         Response.doUsageError(ex.getMessage(), writer);
          writer.close();
       }
       catch(Exception ex)
@@ -161,11 +140,11 @@ public class FormatResponseFilter implements Filter
          responseWrapper.setContentType("text/plain");
 
          PrintWriter writer = responseWrapper.getWriter();
-         doError(ex.toString(), writer);
+         Response.doError(ex.toString(), writer);
          writer.close();
       }
 
-      LOGGER.fine("REQUEST END   =============================================================================================");
+      LOGGER.fine("REQUEST END");
    }
 
    //@Override