From 5c17b8e3a7aed7be70f9036e3aa2218c462faa03 Mon Sep 17 00:00:00 2001
From: Brandon Clayton <bclayton@usgs.gov>
Date: Mon, 22 Apr 2024 13:06:09 -0600
Subject: [PATCH] change path to property

---
 .../java/gov/usgs/earthquake/nshmp/www/PrimingResource.java     | 2 +-
 .../java/gov/usgs/earthquake/nshmp/www/SwaggerController.java   | 2 +-
 .../java/gov/usgs/earthquake/nshmp/www/SwaggerUIController.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 +-
 13 files changed, 13 insertions(+), 13 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 7342e138..dbe5f9d3 100644
--- a/src/main/java/gov/usgs/earthquake/nshmp/www/PrimingResource.java
+++ b/src/main/java/gov/usgs/earthquake/nshmp/www/PrimingResource.java
@@ -17,7 +17,7 @@ import jakarta.inject.Singleton;
 @Singleton
 public class PrimingResource implements OrderedResource {
 
-  @Value("${nshmp.context-path}")
+  @Value("${nshmp-haz.context-path}")
   String contextPath;
 
   @Override
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 5dcbfc7d..41e30233 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("${nshmp.context-path}/swagger")
+@Controller("${nshmp-haz.context-path}/swagger")
 public class SwaggerController {
 
   @Inject
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 ed292975..d042c4be 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.context-path}/",
+    value = "${nshmp-haz.context-path}/",
     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 7c28592b..96749dde 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.context-path}/disagg")
+@Controller("${nshmp-haz.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 c630a102..b78c842c 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.context-path}/hazard")
+@Controller("${nshmp-haz.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 4a993685..441dbc6f 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.context-path}/features")
+@Controller("${nshmp-haz.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 2fe956f3..e6b33962 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.context-path}/trees")
+@Controller("${nshmp-haz.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 00313797..53245a75 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.context-path}/map")
+@Controller("${nshmp-haz.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 fd8151fd..8ce8c6e9 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.context-path}/mfds")
+@Controller("${nshmp-haz.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 750f0f1f..0a317a59 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.context-path}/probability")
+@Controller("${nshmp-haz.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 f0f12d36..f54f3ec0 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.context-path}/rate")
+@Controller("${nshmp-haz.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 0febc062..0ac6f08e 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.context-path}/source")
+@Controller("${nshmp-haz.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 8a07388c..3464f706 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.context-path}/sites")
+@Controller("${nshmp-haz.context-path}/sites")
 public class TestSitesController {
   static final Logger LOG = LoggerFactory.getLogger(TestSitesController.class);
   static final String NAME = "Test Sites";
-- 
GitLab