From 510e1dba0854f2c5214171ba63808680bc261085 Mon Sep 17 00:00:00 2001
From: Brandon Clayton <bclayton@usgs.gov>
Date: Wed, 15 Jan 2025 15:30:21 -0700
Subject: [PATCH] remove context path
---
.../earthquake/nshmp/www/PrimingResource.java | 19 -------------------
.../nshmp/www/SwaggerController.java | 6 +++---
.../nshmp/www/SwaggerUIController.java | 2 +-
.../nshmp/www/hazard/DisaggController.java | 2 +-
.../nshmp/www/hazard/HazardController.java | 2 +-
.../nshmp/www/source/FeaturesController.java | 2 +-
.../www/source/LogicTreesController.java | 2 +-
.../nshmp/www/source/MapController.java | 2 +-
.../nshmp/www/source/MfdsController.java | 2 +-
.../www/source/ProbabilityController.java | 2 +-
.../nshmp/www/source/RateController.java | 2 +-
.../nshmp/www/source/SourceController.java | 2 +-
.../nshmp/www/source/TestSitesController.java | 2 +-
src/main/resources/application.yml | 1 -
14 files changed, 14 insertions(+), 34 deletions(-)
diff --git a/src/main/java/gov/usgs/earthquake/nshmp/www/PrimingResource.java b/src/main/java/gov/usgs/earthquake/nshmp/www/PrimingResource.java
index 4f4da6bb..6a461d30 100644
--- a/src/main/java/gov/usgs/earthquake/nshmp/www/PrimingResource.java
+++ b/src/main/java/gov/usgs/earthquake/nshmp/www/PrimingResource.java
@@ -11,15 +11,12 @@ import software.amazon.awssdk.services.ssm.model.ParameterType;
import software.amazon.awssdk.services.ssm.model.PutParameterRequest;
import software.amazon.awssdk.services.ssm.model.SsmException;
-import com.amazonaws.serverless.proxy.internal.testutils.MockLambdaContext;
-import com.amazonaws.serverless.proxy.model.AwsProxyRequest;
import com.google.common.util.concurrent.MoreExecutors;
import gov.usgs.earthquake.nshmp.gmm.Gmm;
import io.micronaut.context.annotation.Value;
import io.micronaut.crac.OrderedResource;
-import io.micronaut.function.aws.proxy.MicronautLambdaHandler;
import jakarta.inject.Singleton;
/**
@@ -31,19 +28,10 @@ public class PrimingResource implements OrderedResource {
@Value("${nshmp-haz.model-path}")
private Path modelPath;
- @Value("${nshmp-haz.context-path}")
- String contextPath;
-
@Override
public void beforeCheckpoint(Context<? extends Resource> context) throws Exception {
ServletUtil.model(ServletUtil.loadModel(modelPath));
updateParameter();
-
- try (MicronautLambdaHandler handler = new MicronautLambdaHandler()) {
- handler.handleRequest(
- getAwsProxyRequest(contextPath + "/hazard"),
- new MockLambdaContext());
- }
}
@Override
@@ -55,13 +43,6 @@ public class PrimingResource implements OrderedResource {
ServletUtil.TASK_EXECUTOR = Executors.newSingleThreadExecutor();
}
- private static AwsProxyRequest getAwsProxyRequest(String path) {
- final AwsProxyRequest awsProxyRequest = new AwsProxyRequest();
- awsProxyRequest.setHttpMethod("GET");
- awsProxyRequest.setPath(path);
- return awsProxyRequest;
- }
-
private void updateParameter() throws SsmException {
var parameterName = System.getenv("IMT_PARAMETER_NAME");
diff --git a/src/main/java/gov/usgs/earthquake/nshmp/www/SwaggerController.java b/src/main/java/gov/usgs/earthquake/nshmp/www/SwaggerController.java
index c46a6cbd..e5887f0f 100644
--- a/src/main/java/gov/usgs/earthquake/nshmp/www/SwaggerController.java
+++ b/src/main/java/gov/usgs/earthquake/nshmp/www/SwaggerController.java
@@ -32,7 +32,7 @@ import jakarta.inject.Inject;
name = "Swagger",
description = "Swagger OpenAPI YAML")
@Hidden
-@Controller("${nshmp-haz.context-path}/swagger")
+@Controller("/swagger")
public class SwaggerController {
@Inject
@@ -46,8 +46,8 @@ public class SwaggerController {
return HttpResponse.ok(Yaml.pretty(openApi));
} catch (Exception e) {
return ServletUtil.error(
- LoggerFactory.getLogger("Swagger"),
- e, "Swagger", request.getUri().getPath());
+ LoggerFactory.getLogger("Swagger"),
+ e, "Swagger", request.getUri().getPath());
}
}
diff --git a/src/main/java/gov/usgs/earthquake/nshmp/www/SwaggerUIController.java b/src/main/java/gov/usgs/earthquake/nshmp/www/SwaggerUIController.java
index d749c506..d18a7ff4 100644
--- a/src/main/java/gov/usgs/earthquake/nshmp/www/SwaggerUIController.java
+++ b/src/main/java/gov/usgs/earthquake/nshmp/www/SwaggerUIController.java
@@ -23,7 +23,7 @@ import jakarta.inject.Inject;
* Handle Swagger static resources.
*/
@Controller(
- value = "${nshmp-haz.context-path}/",
+ value = "/",
produces = {
MediaType.APPLICATION_YAML,
MediaType.TEXT_HTML,
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 2019f62c..1d7c49c5 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
@@ -46,7 +46,7 @@ import jakarta.inject.Inject;
@Tag(
name = DisaggService.NAME,
description = "USGS NSHM hazard disaggregation service")
-@Controller("${nshmp-haz.context-path}/disagg")
+@Controller("/disagg")
public class DisaggController {
@Inject
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 858ba751..15c4de0d 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
@@ -40,7 +40,7 @@ import jakarta.inject.Inject;
@Tag(
name = HazardService.NAME,
description = "USGS NSHM hazard calculation service")
-@Controller("${nshmp-haz.context-path}/hazard")
+@Controller("/hazard")
public class HazardController {
@Inject
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 e5184670..6ca2ed7f 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
@@ -36,7 +36,7 @@ import jakarta.inject.Inject;
@Tag(
name = FeaturesService.NAME,
description = "USGS NSHM source model features service")
-@Controller("${nshmp-haz.context-path}/features")
+@Controller("/features")
public class FeaturesController {
@Inject
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 2e399c50..7b2eb74e 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
@@ -34,7 +34,7 @@ import jakarta.inject.Inject;
@Tag(
name = LogicTreesService.NAME,
description = "USGS NSHM source model logic tree service")
-@Controller("${nshmp-haz.context-path}/trees")
+@Controller("/trees")
public class LogicTreesController {
@Inject
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 e83f7634..dc9b524e 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
@@ -39,7 +39,7 @@ import jakarta.inject.Inject;
@Tag(
name = MapController.NAME,
description = "NSHM map boundary")
-@Controller("${nshmp-haz.context-path}/map")
+@Controller("/map")
public class MapController {
static final Logger LOG = LoggerFactory.getLogger(MapController.class);
static final String NAME = "Map Boundary";
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 424049868..d095575e 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
@@ -40,7 +40,7 @@ import jakarta.inject.Inject;
@Tag(
name = MfdsService.NAME,
description = "USGS NSHM source model MFD service")
-@Controller("${nshmp-haz.context-path}/mfds")
+@Controller("/mfds")
public class MfdsController {
@Inject
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 c0dfae57..75a43001 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
@@ -34,7 +34,7 @@ import jakarta.inject.Inject;
@Tag(
name = RateService.NAME_PROBABILITY,
description = "USGS NSHM earthquake probability calculation service")
-@Controller("${nshmp-haz.context-path}/probability")
+@Controller("/probability")
public class ProbabilityController {
@Inject
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 2299ca6e..1ad8fa73 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
@@ -34,7 +34,7 @@ import jakarta.inject.Inject;
@Tag(
name = RateService.NAME_RATE,
description = "USGS NSHM earthquake rate calculation service")
-@Controller("${nshmp-haz.context-path}/rate")
+@Controller("/rate")
public class RateController {
@Inject
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 d9c6bbf1..0b308c4d 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
@@ -32,7 +32,7 @@ import jakarta.inject.Inject;
@Tag(
name = SourceService.NAME,
description = "USGS NSHM source model metadata service")
-@Controller("${nshmp-haz.context-path}/source")
+@Controller("/source")
public class SourceController {
// TODO consider renaming to /model
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 9a0fe0a2..bf17b3b8 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
@@ -39,7 +39,7 @@ import jakarta.inject.Inject;
@Tag(
name = TestSitesController.NAME,
description = "NSHM test sites")
-@Controller("${nshmp-haz.context-path}/sites")
+@Controller("/sites")
public class TestSitesController {
static final Logger LOG = LoggerFactory.getLogger(TestSitesController.class);
static final String NAME = "Test Sites";
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index bda22c4f..29a05258 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -22,4 +22,3 @@ nshmp-haz:
# java -jar build/libs/nshmp-haz.jar --model=<path/to/model>
#
model-path: ${MODEL:nshms/nshm-conus-2018}
- context-path: ${CONTEXT_PATH:}
--
GitLab