Merge branch 'fix' into 'master'

Fix services

See merge request ghsc/nshmp/nshmp-haz-v2!518

src/main/java/gov/usgs/earthquake/nshmp/www/services/DeaggEpsilonService.java

@@ -6,6 +6,8 @@ import java.util.List;
 import java.util.concurrent.ExecutionException;
 import java.util.function.Function;
 
+import javax.inject.Singleton;
+
 import com.google.common.base.Stopwatch;
 import com.google.common.collect.ImmutableList;
 
@@ -32,6 +34,7 @@ import io.micronaut.http.HttpResponse;
  *
  * @author U.S. Geological Survey
  */
+@Singleton
 public final class DeaggEpsilonService {
 
   /* Developer notes: See HazardService. */

src/main/java/gov/usgs/earthquake/nshmp/www/services/HazardService.java

@@ -11,6 +11,8 @@ import java.util.Map;
 import java.util.concurrent.ExecutionException;
 import java.util.function.Function;
 
+import javax.inject.Singleton;
+
 import com.google.common.base.Stopwatch;
 
 import gov.usgs.earthquake.nshmp.calc.CalcConfig;
@@ -43,6 +45,7 @@ import io.micronaut.http.HttpResponse;
  *
  * @author U.S. Geological Survey
  */
+@Singleton
 public final class HazardService {
 
   private static final String NAME = "Hazard Service";

src/main/java/gov/usgs/earthquake/nshmp/www/services/RateService.java

@@ -6,6 +6,8 @@ import java.util.Optional;
 import java.util.concurrent.ExecutionException;
 import java.util.stream.Collectors;
 
+import javax.inject.Singleton;
+
 import com.google.common.base.Stopwatch;
 import com.google.common.util.concurrent.ListenableFuture;
 
@@ -35,6 +37,7 @@ import io.micronaut.http.HttpResponse;
  *
  * @author U.S. Geological Survey
  */
+@Singleton
 public final class RateService {
 
   /*

src/main/java/gov/usgs/earthquake/nshmp/www/services/ServletUtil.java

@@ -15,6 +15,8 @@ import java.util.HashMap;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
 
+import javax.inject.Singleton;
+
 import com.google.common.base.Stopwatch;
 import com.google.common.util.concurrent.ListeningExecutorService;
 import com.google.common.util.concurrent.MoreExecutors;
@@ -42,6 +44,7 @@ import io.micronaut.runtime.event.annotation.EventListener;
  *
  * @author U.S. Geological Survey
  */
+@Singleton
 public class ServletUtil {
 
   public static final Gson GSON;

src/main/java/gov/usgs/earthquake/nshmp/www/services/SourceServices.java

@@ -3,6 +3,8 @@ package gov.usgs.earthquake.nshmp.www.services;
 import java.util.Map;
 import java.util.Set;
 
+import javax.inject.Singleton;
+
 import com.google.common.base.Stopwatch;
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
@@ -25,6 +27,7 @@ import io.micronaut.http.HttpResponse;
  *
  * @author U.S. Geological Survey
  */
+@Singleton
 public class SourceServices {
 
   private static final String NAME = "Source Model";