Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
V
vlkb-siav2
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package registry
Container registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
ViaLactea
vlkb-siav2
Commits
b36cd5ce
Commit
b36cd5ce
authored
1 year ago
by
Robert Butora
Browse files
Options
Downloads
Patches
Plain Diff
adds (crude) error handling to Formatting-filter
parent
05a9f19f
No related branches found
No related tags found
No related merge requests found
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
data-discovery/src/main/java/vlkb/webapi/FormatResponseFilter.java
+18
-9
18 additions, 9 deletions
...overy/src/main/java/vlkb/webapi/FormatResponseFilter.java
data-discovery/src/main/java/vlkb/webapi/SearchServlet.java
+0
-4
0 additions, 4 deletions
data-discovery/src/main/java/vlkb/webapi/SearchServlet.java
with
18 additions
and
13 deletions
data-discovery/src/main/java/vlkb/webapi/FormatResponseFilter.java
+
18
−
9
View file @
b36cd5ce
...
@@ -57,6 +57,11 @@ public class FormatResponseFilter implements Filter
...
@@ -57,6 +57,11 @@ public class FormatResponseFilter implements Filter
protected
Subsurvey
[]
dbSubsurveyArr
=
null
;
protected
Subsurvey
[]
dbSubsurveyArr
=
null
;
private
String
reqQueryString
;
private
String
reqQueryString
;
protected
void
doUsageError
(
String
message
,
PrintWriter
printWriter
)
{
printWriter
.
println
(
"UsageError : "
+
message
);
}
@Override
@Override
public
void
init
(
FilterConfig
filterConfig
)
throws
ServletException
public
void
init
(
FilterConfig
filterConfig
)
throws
ServletException
...
@@ -77,16 +82,11 @@ public class FormatResponseFilter implements Filter
...
@@ -77,16 +82,11 @@ public class FormatResponseFilter implements Filter
LOGGER
.
info
(
"trace"
);
LOGGER
.
info
(
"trace"
);
LOGGER
.
info
(
"REQUEST START ============================================================================================="
);
LOGGER
.
info
(
"REQUEST START ============================================================================================="
);
Map
<
String
,
String
[]>
params
=
request
.
getParameterMap
();
//for(String keys : params.keySet()) LOGGER.info("Params: " + keys);
Coord
coord
=
new
Coord
(
params
);
SubsurveyId
subsurveyId
=
new
SubsurveyId
(
params
);
// FIXME add invalid param excpetions
FormatResponseWrapper
responseWrapper
=
new
FormatResponseWrapper
((
HttpServletResponse
)
response
);
FormatResponseWrapper
responseWrapper
=
new
FormatResponseWrapper
((
HttpServletResponse
)
response
);
chain
.
doFilter
(
request
,
responseWrapper
);
chain
.
doFilter
(
request
,
responseWrapper
);
long
startTime_msec
=
System
.
currentTimeMillis
();
long
startTime_msec
=
System
.
currentTimeMillis
();
String
[]
pubdidArr
=
responseWrapper
.
getPubdidArr
();
String
[]
pubdidArr
=
responseWrapper
.
getPubdidArr
();
...
@@ -95,6 +95,12 @@ public class FormatResponseFilter implements Filter
...
@@ -95,6 +95,12 @@ public class FormatResponseFilter implements Filter
{
{
PrintWriter
responseWriter
=
((
HttpServletResponse
)
response
).
getWriter
();
PrintWriter
responseWriter
=
((
HttpServletResponse
)
response
).
getWriter
();
Map
<
String
,
String
[]>
params
=
request
.
getParameterMap
();
Coord
coord
=
new
Coord
(
params
);
SubsurveyId
subsurveyId
=
new
SubsurveyId
(
params
);
// FIXME add invalid param excpetions -> params already parsed in servlet
Dataset
[]
datasetArr
=
queryObsCore
(
Dataset
[]
datasetArr
=
queryObsCore
(
pubdidArr
,
pubdidArr
,
coord
,
// VLKB: calc ovelrap-codes
coord
,
// VLKB: calc ovelrap-codes
...
@@ -126,15 +132,18 @@ public class FormatResponseFilter implements Filter
...
@@ -126,15 +132,18 @@ public class FormatResponseFilter implements Filter
}
}
else
else
{
{
;
// FIXME throws wrong setting-file param: batter convert string to enum and throw 'unrecoginzed respFormat' then;
final
String
errMsg
=
"Illegal response format request: "
+
respFormat
;
// here use switch with enums and switch-default: say error: 'unsupported respFromat' type
LOGGER
.
info
(
errMsg
);
response
.
setContentType
(
"text/plain"
);
doUsageError
(
errMsg
,
responseWriter
);
// FIXME set http err code
}
}
responseWriter
.
close
();
responseWriter
.
close
();
}
}
else
else
{
{
LOGGER
.
info
(
"Servlet returned no ID's."
);
LOGGER
.
info
(
"
Search
Servlet returned no ID's."
);
}
}
LOGGER
.
info
(
"REQUEST END ============================================================================================="
);
LOGGER
.
info
(
"REQUEST END ============================================================================================="
);
...
...
This diff is collapsed.
Click to expand it.
data-discovery/src/main/java/vlkb/webapi/SearchServlet.java
+
0
−
4
View file @
b36cd5ce
...
@@ -99,7 +99,6 @@ public class SearchServlet extends javax.servlet.http.HttpServlet
...
@@ -99,7 +99,6 @@ public class SearchServlet extends javax.servlet.http.HttpServlet
response
.
setContentType
(
"text/plain"
);
response
.
setContentType
(
"text/plain"
);
response
.
setCharacterEncoding
(
RESPONSE_ENCODING
);
response
.
setCharacterEncoding
(
RESPONSE_ENCODING
);
//PrintWriter writer = response.getWriter();
for
(
String
pubdid
:
pubdidArr
)
for
(
String
pubdid
:
pubdidArr
)
{
{
...
@@ -114,7 +113,6 @@ public class SearchServlet extends javax.servlet.http.HttpServlet
...
@@ -114,7 +113,6 @@ public class SearchServlet extends javax.servlet.http.HttpServlet
response
.
setStatus
(
HttpServletResponse
.
SC_BAD_REQUEST
);
response
.
setStatus
(
HttpServletResponse
.
SC_BAD_REQUEST
);
response
.
setContentType
(
"text/plain"
);
response
.
setContentType
(
"text/plain"
);
//PrintWriter writer = new PrintWriter(new OutputStreamWriter(respOutputStream, RESPONSE_ENCODING));
doMultiValuedParamNotSupported
(
ex
.
getMessage
(),
writer
);
doMultiValuedParamNotSupported
(
ex
.
getMessage
(),
writer
);
writer
.
close
();
writer
.
close
();
...
@@ -125,7 +123,6 @@ public class SearchServlet extends javax.servlet.http.HttpServlet
...
@@ -125,7 +123,6 @@ public class SearchServlet extends javax.servlet.http.HttpServlet
response
.
setStatus
(
HttpServletResponse
.
SC_BAD_REQUEST
);
response
.
setStatus
(
HttpServletResponse
.
SC_BAD_REQUEST
);
response
.
setContentType
(
"text/plain"
);
response
.
setContentType
(
"text/plain"
);
//PrintWriter writer = new PrintWriter(new OutputStreamWriter(respOutputStream, RESPONSE_ENCODING));
doUsageError
(
ex
.
getMessage
(),
writer
);
doUsageError
(
ex
.
getMessage
(),
writer
);
writer
.
close
();
writer
.
close
();
...
@@ -137,7 +134,6 @@ public class SearchServlet extends javax.servlet.http.HttpServlet
...
@@ -137,7 +134,6 @@ public class SearchServlet extends javax.servlet.http.HttpServlet
response
.
setStatus
(
HttpServletResponse
.
SC_INTERNAL_SERVER_ERROR
);
response
.
setStatus
(
HttpServletResponse
.
SC_INTERNAL_SERVER_ERROR
);
response
.
setContentType
(
"text/plain"
);
response
.
setContentType
(
"text/plain"
);
//PrintWriter writer = new PrintWriter(new OutputStreamWriter(respOutputStream, RESPONSE_ENCODING));
doError
(
ex
.
toString
(),
writer
);
doError
(
ex
.
toString
(),
writer
);
writer
.
close
();
writer
.
close
();
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment