From 50aef6c45f366445b55bb1477560750675e6b7a5 Mon Sep 17 00:00:00 2001
From: Brandon Clayton <bclayton@usgs.gov>
Date: Mon, 22 Apr 2024 13:03:07 -0600
Subject: [PATCH] add context path

---
 .../java/gov/usgs/earthquake/nshmp/www/SwaggerController.java   | 2 +-
 .../gov/usgs/earthquake/nshmp/www/hazard/DisaggController.java  | 2 +-
 .../gov/usgs/earthquake/nshmp/www/hazard/HazardController.java  | 2 +-
 .../usgs/earthquake/nshmp/www/source/FeaturesController.java    | 2 +-
 .../usgs/earthquake/nshmp/www/source/LogicTreesController.java  | 2 +-
 .../gov/usgs/earthquake/nshmp/www/source/MapController.java     | 2 +-
 .../gov/usgs/earthquake/nshmp/www/source/MfdsController.java    | 2 +-
 .../usgs/earthquake/nshmp/www/source/ProbabilityController.java | 2 +-
 .../gov/usgs/earthquake/nshmp/www/source/RateController.java    | 2 +-
 .../gov/usgs/earthquake/nshmp/www/source/SourceController.java  | 2 +-
 .../usgs/earthquake/nshmp/www/source/TestSitesController.java   | 2 +-
 11 files changed, 11 insertions(+), 11 deletions(-)

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 18fd6f303..5dcbfc7d3 100644
--- a/src/main/java/gov/usgs/earthquake/nshmp/www/SwaggerController.java
+++ b/src/main/java/gov/usgs/earthquake/nshmp/www/SwaggerController.java
@@ -28,7 +28,7 @@ import jakarta.inject.Inject;
     name = "Swagger",
     description = "Swagger OpenAPI YAML")
 @Hidden
-@Controller("/swagger")
+@Controller("${nshmp.context-path}/swagger")
 public class SwaggerController {
 
   @Inject
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 ae7cb13e7..7c28592bc 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("/disagg")
+@Controller("${nshmp.context-path}/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 261b62b69..c630a102c 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("/hazard")
+@Controller("${nshmp.context-path}/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 5276a2afd..4a9936850 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("/features")
+@Controller("${nshmp.context-path}/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 2f941ff14..2fe956f36 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("/trees")
+@Controller("${nshmp.context-path}/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 dffe69793..003137975 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("/map")
+@Controller("${nshmp.context-path}/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 3d87c87bb..fd8151fdb 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("/mfds")
+@Controller("${nshmp.context-path}/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 33dbd1b17..750f0f1f0 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("/probability")
+@Controller("${nshmp.context-path}/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 8dffb0c1f..f0f12d36a 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("/rate")
+@Controller("${nshmp.context-path}/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 2bd63ae10..0febc062b 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("/source")
+@Controller("${nshmp.context-path}/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 45fa30f2f..8a07388c5 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("/sites")
+@Controller("${nshmp.context-path}/sites")
 public class TestSitesController {
   static final Logger LOG = LoggerFactory.getLogger(TestSitesController.class);
   static final String NAME = "Test Sites";
-- 
GitLab