From 7db87c9712e13b0f23f0d2bf516bc2a1e1e0d5a3 Mon Sep 17 00:00:00 2001
From: Peter Powers <pmpowers@usgs.gov>
Date: Thu, 2 Jun 2022 06:46:42 -0600
Subject: [PATCH] service cleaning

---
 .../earthquake/nshmp/www/hazard/HazardService.java     | 10 +---------
 .../nshmp/www/source/SourceLogicTreesController.java   |  3 +--
 .../earthquake/nshmp/www/source/SourceService.java     |  3 ++-
 3 files changed, 4 insertions(+), 12 deletions(-)

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 b102cece9..281521292 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
@@ -1,6 +1,5 @@
 package gov.usgs.earthquake.nshmp.www.hazard;
 
-import static com.google.common.base.Preconditions.checkState;
 import static gov.usgs.earthquake.nshmp.calc.HazardExport.curvesBySource;
 import static gov.usgs.earthquake.nshmp.data.DoubleData.checkInRange;
 import static gov.usgs.earthquake.nshmp.geo.Coordinates.checkLatitude;
@@ -42,7 +41,6 @@ import gov.usgs.earthquake.nshmp.www.ServletUtil.Server;
 import gov.usgs.earthquake.nshmp.www.meta.DoubleParameter;
 import gov.usgs.earthquake.nshmp.www.meta.Parameter;
 import gov.usgs.earthquake.nshmp.www.source.SourceService.SourceModel;
-
 import io.micronaut.http.HttpRequest;
 import io.micronaut.http.HttpResponse;
 import jakarta.inject.Singleton;
@@ -135,7 +133,6 @@ public final class HazardService {
 
     Metadata(HazardModel model) {
       this.model = new SourceModel(model);
-      // TODO should get min max from model (fix via swagger openapi injection)
       longitude = new DoubleParameter(
           "Longitude",
           "°",
@@ -294,12 +291,8 @@ public final class HazardService {
       }
 
       Builder hazard(Hazard hazard) {
-        // necessary??
-        checkState(totalMap == null, "Hazard has already been added to this builder");
-
         componentMaps = new EnumMap<>(Imt.class);
         totalMap = new EnumMap<>(Imt.class);
-
         var typeTotalMaps = curvesBySource(hazard);
 
         for (var imt : hazard.curves().keySet()) {
@@ -320,7 +313,6 @@ public final class HazardService {
             XySequence.addToMap(type, componentMap, typeTotalMap.get(type));
           }
         }
-
         return this;
       }
 
@@ -440,7 +432,7 @@ public final class HazardService {
         .collect(toCollection(() -> EnumSet.noneOf(Imt.class)));
   }
 
-  /* Read the 'imt' query values; can be comma-delimited. */
+  /* Read the 'out'put type query values; can be comma-delimited. */
   static Set<DataType> readDataTypes(HttpRequest<?> http) {
     return http.getParameters().getAll("out").stream()
         .map(s -> s.split(","))
diff --git a/src/main/java/gov/usgs/earthquake/nshmp/www/source/SourceLogicTreesController.java b/src/main/java/gov/usgs/earthquake/nshmp/www/source/SourceLogicTreesController.java
index 5f995e9fb..e15433041 100644
--- a/src/main/java/gov/usgs/earthquake/nshmp/www/source/SourceLogicTreesController.java
+++ b/src/main/java/gov/usgs/earthquake/nshmp/www/source/SourceLogicTreesController.java
@@ -5,7 +5,6 @@ import gov.usgs.earthquake.nshmp.www.ResponseBody;
 import gov.usgs.earthquake.nshmp.www.ServletUtil;
 import gov.usgs.earthquake.nshmp.www.source.SourceLogicTreesService.Metadata;
 import gov.usgs.earthquake.nshmp.www.source.SourceLogicTreesService.RequestData;
-
 import io.micronaut.http.HttpRequest;
 import io.micronaut.http.HttpResponse;
 import io.micronaut.http.annotation.Controller;
@@ -31,7 +30,7 @@ import jakarta.inject.Inject;
  * @author U.S. Geological Survey
  */
 @Tag(
-    name = "Source Model Logic Tree",
+    name = "Source Model Logic Trees",
     description = "USGS NSHM source model logic tree service")
 @Controller("/trees")
 public class SourceLogicTreesController {
diff --git a/src/main/java/gov/usgs/earthquake/nshmp/www/source/SourceService.java b/src/main/java/gov/usgs/earthquake/nshmp/www/source/SourceService.java
index 0e35411b4..3ecba39d3 100644
--- a/src/main/java/gov/usgs/earthquake/nshmp/www/source/SourceService.java
+++ b/src/main/java/gov/usgs/earthquake/nshmp/www/source/SourceService.java
@@ -17,7 +17,6 @@ import gov.usgs.earthquake.nshmp.www.ResponseBody;
 import gov.usgs.earthquake.nshmp.www.ResponseMetadata;
 import gov.usgs.earthquake.nshmp.www.ServletUtil;
 import gov.usgs.earthquake.nshmp.www.meta.Parameter;
-
 import io.micronaut.http.HttpRequest;
 import io.micronaut.http.HttpResponse;
 import jakarta.inject.Singleton;
@@ -72,6 +71,8 @@ public class SourceService {
     final Map<NehrpSiteClass, Double> siteClasses;
     final List<Parameter> imts;
 
+    // final Bounds
+
     public SourceModel(HazardModel model) {
       name = model.name();
       gmms = model.gmms();
-- 
GitLab