From 45f91d28cdc849ca7db7e61060cdaa980a40f0b9 Mon Sep 17 00:00:00 2001
From: Robert Butora <robert.butora@inaf.it>
Date: Fri, 25 Oct 2024 18:02:35 +0200
Subject: [PATCH] updates volib to 0.9.3 (fixes vo.error package and renames
Response -> Lib)
---
data-discovery/pom.xml | 2 +-
data-discovery/src/main/java/webapi/SearchServlet.java | 7 ++++---
.../java/webapi/formatfilter/FormatResponseFilter.java | 9 +++++----
3 files changed, 10 insertions(+), 8 deletions(-)
diff --git a/data-discovery/pom.xml b/data-discovery/pom.xml
index dc71e60..1d20c3e 100644
--- a/data-discovery/pom.xml
+++ b/data-discovery/pom.xml
@@ -36,7 +36,7 @@
<dependency>
<groupId>vo</groupId>
<artifactId>vlkb-volib</artifactId>
- <version>0.9.2</version>
+ <version>0.9.3</version>
</dependency>
<dependency>
diff --git a/data-discovery/src/main/java/webapi/SearchServlet.java b/data-discovery/src/main/java/webapi/SearchServlet.java
index 20b0896..a6a4715 100644
--- a/data-discovery/src/main/java/webapi/SearchServlet.java
+++ b/data-discovery/src/main/java/webapi/SearchServlet.java
@@ -16,6 +16,7 @@ import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import vo.parameter.*;
+import vo.error.*;
public class SearchServlet extends javax.servlet.http.HttpServlet
{
@@ -128,7 +129,7 @@ public class SearchServlet extends javax.servlet.http.HttpServlet
response.setContentType("text/plain");
PrintWriter writer = response.getWriter();
- Response.doMultiValuedParamNotSupported(ex.getMessage(), writer);
+ Lib.doMultiValuedParamNotSupported(ex.getMessage(), writer);
writer.close();
}
catch(IllegalArgumentException ex)
@@ -139,7 +140,7 @@ public class SearchServlet extends javax.servlet.http.HttpServlet
response.setContentType("text/plain");
PrintWriter writer = response.getWriter();
- Response.doUsageError(ex.getMessage(), writer);
+ Lib.doUsageError(ex.getMessage(), writer);
writer.close();
}
catch(Exception ex)
@@ -151,7 +152,7 @@ public class SearchServlet extends javax.servlet.http.HttpServlet
response.setContentType("text/plain");
PrintWriter writer = response.getWriter();
- Response.doError(ex.toString(), writer);
+ Lib.doError(ex.toString(), writer);
writer.close();
}
diff --git a/data-discovery/src/main/java/webapi/formatfilter/FormatResponseFilter.java b/data-discovery/src/main/java/webapi/formatfilter/FormatResponseFilter.java
index f8d3d25..223a460 100644
--- a/data-discovery/src/main/java/webapi/formatfilter/FormatResponseFilter.java
+++ b/data-discovery/src/main/java/webapi/formatfilter/FormatResponseFilter.java
@@ -20,6 +20,7 @@ import javax.servlet.http.HttpServletResponseWrapper;
import java.nio.charset.Charset;
import vo.parameter.*;
+import vo.error.*;
public class FormatResponseFilter implements Filter
@@ -98,7 +99,7 @@ public class FormatResponseFilter implements Filter
final String errMsg = "Illegal response format request: " + respFormat;
LOGGER.warning(errMsg);
response.setContentType("text/plain");
- Response.doUsageError(errMsg, responseWriter);
+ Lib.doUsageError(errMsg, responseWriter);
// FIXME set http err code
}
@@ -117,7 +118,7 @@ public class FormatResponseFilter implements Filter
responseWrapper.setContentType("text/plain");
PrintWriter writer = responseWrapper.getWriter();
- Response.doMultiValuedParamNotSupported(ex.getMessage(), writer);
+ Lib.doMultiValuedParamNotSupported(ex.getMessage(), writer);
writer.close();
}
catch(IllegalArgumentException ex)
@@ -128,7 +129,7 @@ public class FormatResponseFilter implements Filter
responseWrapper.setContentType("text/plain");
PrintWriter writer = responseWrapper.getWriter();
- Response.doUsageError(ex.getMessage(), writer);
+ Lib.doUsageError(ex.getMessage(), writer);
writer.close();
}
catch(Exception ex)
@@ -140,7 +141,7 @@ public class FormatResponseFilter implements Filter
responseWrapper.setContentType("text/plain");
PrintWriter writer = responseWrapper.getWriter();
- Response.doError(ex.toString(), writer);
+ Lib.doError(ex.toString(), writer);
writer.close();
}
--
GitLab