From c70fe80b9342c473a4ef7ac0457dbc38760770af Mon Sep 17 00:00:00 2001
From: Brandon Clayton <bclayton@usgs.gov>
Date: Wed, 15 Jan 2025 08:31:43 -0700
Subject: [PATCH] switch to get path
---
.../nshmp/www/hazard/DisaggController.java | 6 ++---
.../nshmp/www/hazard/DisaggService.java | 4 +--
.../nshmp/www/hazard/HazardController.java | 26 ++-----------------
.../nshmp/www/hazard/HazardService.java | 15 ++---------
.../www/source/FeatureCollectionService.java | 2 +-
.../nshmp/www/source/FeaturesController.java | 2 +-
.../www/source/LogicTreesController.java | 6 ++---
.../nshmp/www/source/MapController.java | 2 +-
.../nshmp/www/source/MfdsController.java | 6 ++---
.../www/source/ProbabilityController.java | 4 +--
.../nshmp/www/source/RateController.java | 4 +--
.../nshmp/www/source/RateService.java | 4 +--
.../nshmp/www/source/SourceController.java | 2 +-
.../nshmp/www/source/TestSitesController.java | 2 +-
14 files changed, 26 insertions(+), 59 deletions(-)
diff --git a/src/main/java/gov/usgs/earthquake/nshmp/www/hazard/DisaggController.java b/src/main/java/gov/usgs/earthquake/nshmp/www/hazard/DisaggController.java
index 962b5ad5..29ee464e 100644
--- a/src/main/java/gov/usgs/earthquake/nshmp/www/hazard/DisaggController.java
+++ b/src/main/java/gov/usgs/earthquake/nshmp/www/hazard/DisaggController.java
@@ -73,7 +73,7 @@ public class DisaggController {
return ServletUtil.error(
DisaggService.LOG, e,
DisaggService.NAME,
- http.getUri().toString());
+ http.getUri().getPath());
}
}
@@ -130,7 +130,7 @@ public class DisaggController {
return ServletUtil.error(
DisaggService.LOG, e,
DisaggService.NAME,
- http.getUri().toString());
+ http.getUri().getPath());
}
}
@@ -174,7 +174,7 @@ public class DisaggController {
return ServletUtil.error(
DisaggService.LOG, e,
DisaggService.NAME,
- http.getUri().toString());
+ http.getUri().getPath());
}
}
diff --git a/src/main/java/gov/usgs/earthquake/nshmp/www/hazard/DisaggService.java b/src/main/java/gov/usgs/earthquake/nshmp/www/hazard/DisaggService.java
index 5775030b..290cabec 100644
--- a/src/main/java/gov/usgs/earthquake/nshmp/www/hazard/DisaggService.java
+++ b/src/main/java/gov/usgs/earthquake/nshmp/www/hazard/DisaggService.java
@@ -103,7 +103,7 @@ public final class DisaggService {
.build();
var body = ResponseBody.success()
.name(NAME)
- .url(request.http.getUri().toString())
+ .url(request.http.getUri().getPath())
.metadata(new ResponseMetadata(HazVersion.appVersions(ServletUtil.model().root())))
.request(request)
.response(response)
@@ -123,7 +123,7 @@ public final class DisaggService {
.build();
var body = ResponseBody.success()
.name(NAME)
- .url(request.http.getUri().toString())
+ .url(request.http.getUri().getPath())
.metadata(new ResponseMetadata(HazVersion.appVersions(ServletUtil.model().root())))
.request(request)
.response(response)
diff --git a/src/main/java/gov/usgs/earthquake/nshmp/www/hazard/HazardController.java b/src/main/java/gov/usgs/earthquake/nshmp/www/hazard/HazardController.java
index cdca65ce..dd0bf769 100644
--- a/src/main/java/gov/usgs/earthquake/nshmp/www/hazard/HazardController.java
+++ b/src/main/java/gov/usgs/earthquake/nshmp/www/hazard/HazardController.java
@@ -48,20 +48,6 @@ public class HazardController {
@Inject
private NshmpMicronautServlet servlet;
- @Get(produces = MediaType.APPLICATION_JSON, uri = "/config")
- public HttpResponse<String> doGetConfig(HttpRequest<?> http) {
- var config = ServletUtil.model().config();
-
- return HttpResponse.ok(config.toString());
- }
-
- @Get(produces = MediaType.APPLICATION_JSON, uri = "/imts")
- public HttpResponse<String> doGetImts(HttpRequest<?> http) {
- var config = Gmm.supportedImts(ServletUtil.model().gmms());
-
- return HttpResponse.ok(ServletUtil.GSON2.toJson(config));
- }
-
@Operation(
summary = "Hazard calculation model and service metadata",
description = "Returns details of the installed model and service request parameters",
@@ -73,19 +59,14 @@ public class HazardController {
schema = @Schema(implementation = MetadataResponse.class)))
@Get(produces = MediaType.APPLICATION_JSON)
public HttpResponse<String> doGetMetadata(HttpRequest<?> http) {
- var log = Logger.getAnonymousLogger();
try {
- log.info("Do get metadata");
- log.info("HazardService.getMetadata");
var response = HazardService.getMetadata(http);
- log.info("asdasdsddsasad");
return response;
} catch (Exception e) {
- log.info(e.getMessage());
return ServletUtil.error(
HazardService.LOG, e,
HazardService.NAME,
- http.getUri().toString());
+ http.getUri().getPath());
}
}
@@ -124,9 +105,6 @@ public class HazardController {
defaultValue = "false") @Nullable Boolean maxdir,
@QueryValue @Nullable Set<Imt> imt) {
try {
- Logger log = Logger.getAnonymousLogger();
- log.info("Hazard call");
- log.info("Thread count: " + ServletUtil.THREAD_COUNT);
Set<Imt> imts = HazardService.readImts(http);
HazardService.Request request = new HazardService.Request(
http, longitude, latitude, vs30, imts, truncate, maxdir);
@@ -135,7 +113,7 @@ public class HazardController {
return ServletUtil.error(
HazardService.LOG, e,
HazardService.NAME,
- http.getUri().toString());
+ http.getUri().getPath());
}
}
diff --git a/src/main/java/gov/usgs/earthquake/nshmp/www/hazard/HazardService.java b/src/main/java/gov/usgs/earthquake/nshmp/www/hazard/HazardService.java
index ca7a11b2..c4353e1e 100644
--- a/src/main/java/gov/usgs/earthquake/nshmp/www/hazard/HazardService.java
+++ b/src/main/java/gov/usgs/earthquake/nshmp/www/hazard/HazardService.java
@@ -64,13 +64,10 @@ public final class HazardService {
public static HttpResponse<String> getMetadata(HttpRequest<?> request) {
var log = java.util.logging.Logger.getAnonymousLogger();
- var url = "test"; // request.getUri().getPath();
- log.info("A");
+ var url = request.getUri().getPath();
var model = ServletUtil.model();
- log.info("B");
log.info(model.name());
var usage = new Metadata(model);
- log.info("C");
var body = ResponseBody.usage()
.name(NAME)
.url(url)
@@ -78,9 +75,7 @@ public final class HazardService {
.request(url)
.response(usage)
.build();
- log.info("D");
var json = ServletUtil.GSON2.toJson(body);
- log.info("E");
return HttpResponse.ok(json);
}
@@ -95,7 +90,7 @@ public final class HazardService {
.build();
var body = ResponseBody.success()
.name(NAME)
- .url(request.http.getUri().toString())
+ .url(request.http.getUri().getPath().toString())
.metadata(new ResponseMetadata(HazVersion.appVersions(ServletUtil.model().root())))
.request(request)
.response(response)
@@ -166,23 +161,17 @@ public final class HazardService {
Metadata(HazardModel model) {
var log = java.util.logging.Logger.getAnonymousLogger();
- log.info("Model: A");
this.model = new SourceModel(model);
- log.info("Model: B");
longitude = new DoubleParameter(
"Longitude",
"°",
model.bounds().min.longitude,
model.bounds().max.longitude);
-
- log.info("Model: C");
latitude = new DoubleParameter(
"Latitude",
"°",
model.bounds().min.latitude,
model.bounds().max.latitude);
-
- log.info("Model: D");
vs30 = new DoubleParameter(
"Vs30",
"m/s",
diff --git a/src/main/java/gov/usgs/earthquake/nshmp/www/source/FeatureCollectionService.java b/src/main/java/gov/usgs/earthquake/nshmp/www/source/FeatureCollectionService.java
index ed865dac..566def81 100644
--- a/src/main/java/gov/usgs/earthquake/nshmp/www/source/FeatureCollectionService.java
+++ b/src/main/java/gov/usgs/earthquake/nshmp/www/source/FeatureCollectionService.java
@@ -31,7 +31,7 @@ public class FeatureCollectionService {
} else {
var response = ResponseBody.<RequestData, JsonElement> success()
.name(name)
- .url(http.getUri().toString())
+ .url(http.getUri().getPath())
.metadata(new ResponseMetadata(HazVersion.appVersions(ServletUtil.model().root())))
.request(requestData)
.response(fc.toJsonTree())
diff --git a/src/main/java/gov/usgs/earthquake/nshmp/www/source/FeaturesController.java b/src/main/java/gov/usgs/earthquake/nshmp/www/source/FeaturesController.java
index 441dbc6f..e5184670 100644
--- a/src/main/java/gov/usgs/earthquake/nshmp/www/source/FeaturesController.java
+++ b/src/main/java/gov/usgs/earthquake/nshmp/www/source/FeaturesController.java
@@ -62,7 +62,7 @@ public class FeaturesController {
return ServletUtil.error(
FeaturesService.LOG, e,
FeaturesService.NAME,
- http.getUri().toString());
+ http.getUri().getPath());
}
}
diff --git a/src/main/java/gov/usgs/earthquake/nshmp/www/source/LogicTreesController.java b/src/main/java/gov/usgs/earthquake/nshmp/www/source/LogicTreesController.java
index e6b33962..2e399c50 100644
--- a/src/main/java/gov/usgs/earthquake/nshmp/www/source/LogicTreesController.java
+++ b/src/main/java/gov/usgs/earthquake/nshmp/www/source/LogicTreesController.java
@@ -58,7 +58,7 @@ public class LogicTreesController {
return ServletUtil.error(
LogicTreesService.LOG, e,
LogicTreesService.NAME,
- http.getUri().toString());
+ http.getUri().getPath());
}
}
@@ -82,7 +82,7 @@ public class LogicTreesController {
return ServletUtil.error(
LogicTreesService.LOG, e,
LogicTreesService.NAME,
- http.getUri().toString());
+ http.getUri().getPath());
}
}
@@ -106,7 +106,7 @@ public class LogicTreesController {
return ServletUtil.error(
LogicTreesService.LOG, e,
LogicTreesService.NAME,
- http.getUri().toString());
+ http.getUri().getPath());
}
}
diff --git a/src/main/java/gov/usgs/earthquake/nshmp/www/source/MapController.java b/src/main/java/gov/usgs/earthquake/nshmp/www/source/MapController.java
index 53245a75..e83f7634 100644
--- a/src/main/java/gov/usgs/earthquake/nshmp/www/source/MapController.java
+++ b/src/main/java/gov/usgs/earthquake/nshmp/www/source/MapController.java
@@ -69,7 +69,7 @@ public class MapController {
LOG,
e,
NAME,
- http.getUri().toString());
+ http.getUri().getPath());
}
}
diff --git a/src/main/java/gov/usgs/earthquake/nshmp/www/source/MfdsController.java b/src/main/java/gov/usgs/earthquake/nshmp/www/source/MfdsController.java
index 8ce8c6e9..424049868 100644
--- a/src/main/java/gov/usgs/earthquake/nshmp/www/source/MfdsController.java
+++ b/src/main/java/gov/usgs/earthquake/nshmp/www/source/MfdsController.java
@@ -64,7 +64,7 @@ public class MfdsController {
return ServletUtil.error(
LogicTreesService.LOG, e,
LogicTreesService.NAME,
- http.getUri().toString());
+ http.getUri().getPath());
}
}
@@ -90,7 +90,7 @@ public class MfdsController {
return ServletUtil.error(
LogicTreesService.LOG, e,
LogicTreesService.NAME,
- http.getUri().toString());
+ http.getUri().getPath());
}
}
@@ -118,7 +118,7 @@ public class MfdsController {
return ServletUtil.error(
LogicTreesService.LOG, e,
LogicTreesService.NAME,
- http.getUri().toString());
+ http.getUri().getPath());
}
}
diff --git a/src/main/java/gov/usgs/earthquake/nshmp/www/source/ProbabilityController.java b/src/main/java/gov/usgs/earthquake/nshmp/www/source/ProbabilityController.java
index 0a317a59..c0dfae57 100644
--- a/src/main/java/gov/usgs/earthquake/nshmp/www/source/ProbabilityController.java
+++ b/src/main/java/gov/usgs/earthquake/nshmp/www/source/ProbabilityController.java
@@ -57,7 +57,7 @@ public class ProbabilityController {
return ServletUtil.error(
RateService.LOG, e,
RateService.NAME_PROBABILITY,
- http.getUri().toString());
+ http.getUri().getPath());
}
}
@@ -98,7 +98,7 @@ public class ProbabilityController {
return ServletUtil.error(
RateService.LOG, e,
RateService.NAME_PROBABILITY,
- http.getUri().toString());
+ http.getUri().getPath());
}
}
diff --git a/src/main/java/gov/usgs/earthquake/nshmp/www/source/RateController.java b/src/main/java/gov/usgs/earthquake/nshmp/www/source/RateController.java
index f54f3ec0..2299ca6e 100644
--- a/src/main/java/gov/usgs/earthquake/nshmp/www/source/RateController.java
+++ b/src/main/java/gov/usgs/earthquake/nshmp/www/source/RateController.java
@@ -57,7 +57,7 @@ public class RateController {
return ServletUtil.error(
RateService.LOG, e,
RateService.NAME_RATE,
- http.getUri().toString());
+ http.getUri().getPath());
}
}
@@ -93,7 +93,7 @@ public class RateController {
return ServletUtil.error(
RateService.LOG, e,
RateService.NAME_RATE,
- http.getUri().toString());
+ http.getUri().getPath());
}
}
diff --git a/src/main/java/gov/usgs/earthquake/nshmp/www/source/RateService.java b/src/main/java/gov/usgs/earthquake/nshmp/www/source/RateService.java
index 69916006..59246530 100644
--- a/src/main/java/gov/usgs/earthquake/nshmp/www/source/RateService.java
+++ b/src/main/java/gov/usgs/earthquake/nshmp/www/source/RateService.java
@@ -68,7 +68,7 @@ public final class RateService {
.build();
var body = ResponseBody.success()
.name(NAME_RATE)
- .url(request.http.getUri().toString())
+ .url(request.http.getUri().getPath())
.metadata(new ResponseMetadata(HazVersion.appVersions(ServletUtil.model().root())))
.request(request)
.response(response)
@@ -87,7 +87,7 @@ public final class RateService {
.build();
var body = ResponseBody.success()
.name(NAME_PROBABILITY)
- .url(request.http.getUri().toString())
+ .url(request.http.getUri().getPath())
.metadata(new ResponseMetadata(HazVersion.appVersions(ServletUtil.model().root())))
.request(request)
.response(response)
diff --git a/src/main/java/gov/usgs/earthquake/nshmp/www/source/SourceController.java b/src/main/java/gov/usgs/earthquake/nshmp/www/source/SourceController.java
index 0ac6f08e..d9c6bbf1 100644
--- a/src/main/java/gov/usgs/earthquake/nshmp/www/source/SourceController.java
+++ b/src/main/java/gov/usgs/earthquake/nshmp/www/source/SourceController.java
@@ -62,7 +62,7 @@ public class SourceController {
return ServletUtil.error(
SourceService.LOG, e,
SourceService.NAME,
- http.getUri().toString());
+ http.getUri().getPath());
}
}
diff --git a/src/main/java/gov/usgs/earthquake/nshmp/www/source/TestSitesController.java b/src/main/java/gov/usgs/earthquake/nshmp/www/source/TestSitesController.java
index 3464f706..9a0fe0a2 100644
--- a/src/main/java/gov/usgs/earthquake/nshmp/www/source/TestSitesController.java
+++ b/src/main/java/gov/usgs/earthquake/nshmp/www/source/TestSitesController.java
@@ -69,7 +69,7 @@ public class TestSitesController {
LOG,
e,
NAME,
- http.getUri().toString());
+ http.getUri().getPath());
}
}
--
GitLab