From 58e34368e0739cab01bb67ac4c57ca238eaab832 Mon Sep 17 00:00:00 2001
From: Peter Powers <pmpowers@usgs.gov>
Date: Wed, 29 Dec 2021 20:40:21 -0700
Subject: [PATCH] import formatting
---
.../java/gov/usgs/earthquake/nshmp/www/HazardController.java | 3 +--
.../java/gov/usgs/earthquake/nshmp/www/RateController.java | 3 +--
.../java/gov/usgs/earthquake/nshmp/www/SourceController.java | 3 +--
.../usgs/earthquake/nshmp/www/SourceLogicTreesController.java | 3 +--
.../java/gov/usgs/earthquake/nshmp/www/SwaggerController.java | 3 +--
.../gov/usgs/earthquake/nshmp/www/services/HazardService.java | 3 +--
.../gov/usgs/earthquake/nshmp/www/services/HazardService2.java | 3 +--
.../gov/usgs/earthquake/nshmp/www/services/RateService.java | 3 +--
.../gov/usgs/earthquake/nshmp/www/services/ServletUtil.java | 3 +--
.../earthquake/nshmp/www/services/SourceLogicTreesService.java | 3 +--
.../gov/usgs/earthquake/nshmp/www/services/SourceServices.java | 3 +--
11 files changed, 11 insertions(+), 22 deletions(-)
diff --git a/src/main/java/gov/usgs/earthquake/nshmp/www/HazardController.java b/src/main/java/gov/usgs/earthquake/nshmp/www/HazardController.java
index 849e2a852..fdc747478 100644
--- a/src/main/java/gov/usgs/earthquake/nshmp/www/HazardController.java
+++ b/src/main/java/gov/usgs/earthquake/nshmp/www/HazardController.java
@@ -1,7 +1,5 @@
package gov.usgs.earthquake.nshmp.www;
-import jakarta.inject.Inject;
-
import gov.usgs.earthquake.nshmp.www.services.HazardService;
import gov.usgs.earthquake.nshmp.www.services.HazardService.QueryParameters;
@@ -15,6 +13,7 @@ import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.media.Schema;
import io.swagger.v3.oas.annotations.responses.ApiResponse;
import io.swagger.v3.oas.annotations.tags.Tag;
+import jakarta.inject.Inject;
/**
* Micronaut controller for probabilistic seismic hazard calculations.
diff --git a/src/main/java/gov/usgs/earthquake/nshmp/www/RateController.java b/src/main/java/gov/usgs/earthquake/nshmp/www/RateController.java
index d2c746a74..df15c1fde 100644
--- a/src/main/java/gov/usgs/earthquake/nshmp/www/RateController.java
+++ b/src/main/java/gov/usgs/earthquake/nshmp/www/RateController.java
@@ -2,8 +2,6 @@ package gov.usgs.earthquake.nshmp.www;
import java.util.Optional;
-import jakarta.inject.Inject;
-
import gov.usgs.earthquake.nshmp.www.services.RateService;
import gov.usgs.earthquake.nshmp.www.services.RateService.Query;
import gov.usgs.earthquake.nshmp.www.services.RateService.Service;
@@ -19,6 +17,7 @@ import io.micronaut.http.annotation.QueryValue;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.media.Schema;
import io.swagger.v3.oas.annotations.responses.ApiResponse;
+import jakarta.inject.Inject;
/**
* Micronaut controller for rate and probability services.
diff --git a/src/main/java/gov/usgs/earthquake/nshmp/www/SourceController.java b/src/main/java/gov/usgs/earthquake/nshmp/www/SourceController.java
index ddaab888c..3c86ffe98 100644
--- a/src/main/java/gov/usgs/earthquake/nshmp/www/SourceController.java
+++ b/src/main/java/gov/usgs/earthquake/nshmp/www/SourceController.java
@@ -1,7 +1,5 @@
package gov.usgs.earthquake.nshmp.www;
-import jakarta.inject.Inject;
-
import gov.usgs.earthquake.nshmp.www.services.SourceServices;
import io.micronaut.http.HttpRequest;
@@ -12,6 +10,7 @@ import io.micronaut.http.annotation.Get;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.responses.ApiResponse;
import io.swagger.v3.oas.annotations.tags.Tag;
+import jakarta.inject.Inject;
/**
* Source model service to return the current installed model.
diff --git a/src/main/java/gov/usgs/earthquake/nshmp/www/SourceLogicTreesController.java b/src/main/java/gov/usgs/earthquake/nshmp/www/SourceLogicTreesController.java
index 715b4da56..7fe44c003 100644
--- a/src/main/java/gov/usgs/earthquake/nshmp/www/SourceLogicTreesController.java
+++ b/src/main/java/gov/usgs/earthquake/nshmp/www/SourceLogicTreesController.java
@@ -1,7 +1,5 @@
package gov.usgs.earthquake.nshmp.www;
-import jakarta.inject.Inject;
-
import gov.usgs.earthquake.nshmp.www.services.SourceLogicTreesService;
import io.micronaut.http.HttpRequest;
@@ -12,6 +10,7 @@ import io.micronaut.http.annotation.PathVariable;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.responses.ApiResponse;
import io.swagger.v3.oas.annotations.tags.Tag;
+import jakarta.inject.Inject;
/**
* Micronaut controller for NSHM source logic trees.
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 937a74f6a..c2251caba 100644
--- a/src/main/java/gov/usgs/earthquake/nshmp/www/SwaggerController.java
+++ b/src/main/java/gov/usgs/earthquake/nshmp/www/SwaggerController.java
@@ -3,8 +3,6 @@ package gov.usgs.earthquake.nshmp.www;
import java.nio.charset.StandardCharsets;
import java.util.stream.Collectors;
-import jakarta.inject.Inject;
-
import com.google.common.io.Resources;
import gov.usgs.earthquake.nshmp.www.services.ServicesUtil;
@@ -16,6 +14,7 @@ import io.micronaut.http.annotation.Controller;
import io.micronaut.http.annotation.Get;
import io.swagger.v3.oas.annotations.Hidden;
import io.swagger.v3.oas.annotations.tags.Tag;
+import jakarta.inject.Inject;
/**
* Expose OpenAPI YAML file.
diff --git a/src/main/java/gov/usgs/earthquake/nshmp/www/services/HazardService.java b/src/main/java/gov/usgs/earthquake/nshmp/www/services/HazardService.java
index 11e8998ec..32468d638 100644
--- a/src/main/java/gov/usgs/earthquake/nshmp/www/services/HazardService.java
+++ b/src/main/java/gov/usgs/earthquake/nshmp/www/services/HazardService.java
@@ -11,8 +11,6 @@ import java.util.Map;
import java.util.concurrent.ExecutionException;
import java.util.function.Function;
-import jakarta.inject.Singleton;
-
import com.google.common.base.Stopwatch;
import gov.usgs.earthquake.nshmp.calc.CalcConfig;
@@ -38,6 +36,7 @@ import gov.usgs.earthquake.nshmp.www.services.SourceServices.SourceModel;
import io.micronaut.http.HttpRequest;
import io.micronaut.http.HttpResponse;
+import jakarta.inject.Singleton;
/**
* Probabilistic seismic hazard calculation handler for
diff --git a/src/main/java/gov/usgs/earthquake/nshmp/www/services/HazardService2.java b/src/main/java/gov/usgs/earthquake/nshmp/www/services/HazardService2.java
index 344852962..3e58e39dd 100644
--- a/src/main/java/gov/usgs/earthquake/nshmp/www/services/HazardService2.java
+++ b/src/main/java/gov/usgs/earthquake/nshmp/www/services/HazardService2.java
@@ -11,8 +11,6 @@ import java.util.Map;
import java.util.concurrent.ExecutionException;
import java.util.function.Function;
-import jakarta.inject.Singleton;
-
import com.google.common.base.Stopwatch;
import gov.usgs.earthquake.nshmp.calc.CalcConfig;
@@ -37,6 +35,7 @@ import gov.usgs.earthquake.nshmp.www.services.SourceServices.SourceModel;
import io.micronaut.http.HttpRequest;
import io.micronaut.http.HttpResponse;
+import jakarta.inject.Singleton;
/**
* Probabilistic seismic hazard calculation handler for
diff --git a/src/main/java/gov/usgs/earthquake/nshmp/www/services/RateService.java b/src/main/java/gov/usgs/earthquake/nshmp/www/services/RateService.java
index 1a7fb2083..e0772386a 100644
--- a/src/main/java/gov/usgs/earthquake/nshmp/www/services/RateService.java
+++ b/src/main/java/gov/usgs/earthquake/nshmp/www/services/RateService.java
@@ -6,8 +6,6 @@ import java.util.Optional;
import java.util.concurrent.ExecutionException;
import java.util.stream.Collectors;
-import jakarta.inject.Singleton;
-
import com.google.common.base.Stopwatch;
import com.google.common.util.concurrent.ListenableFuture;
@@ -30,6 +28,7 @@ import gov.usgs.earthquake.nshmp.www.services.ServicesUtil.ServiceRequestData;
import io.micronaut.http.HttpRequest;
import io.micronaut.http.HttpResponse;
+import jakarta.inject.Singleton;
/**
* Earthquake probability and rate calculation handler service for
diff --git a/src/main/java/gov/usgs/earthquake/nshmp/www/services/ServletUtil.java b/src/main/java/gov/usgs/earthquake/nshmp/www/services/ServletUtil.java
index cb77da175..81651afd7 100644
--- a/src/main/java/gov/usgs/earthquake/nshmp/www/services/ServletUtil.java
+++ b/src/main/java/gov/usgs/earthquake/nshmp/www/services/ServletUtil.java
@@ -14,8 +14,6 @@ import java.util.HashMap;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
-import jakarta.inject.Singleton;
-
import com.google.common.util.concurrent.ListeningExecutorService;
import com.google.common.util.concurrent.MoreExecutors;
import com.google.gson.Gson;
@@ -36,6 +34,7 @@ import io.micronaut.context.annotation.Value;
import io.micronaut.context.event.ShutdownEvent;
import io.micronaut.context.event.StartupEvent;
import io.micronaut.runtime.event.annotation.EventListener;
+import jakarta.inject.Singleton;
/**
* Micronaut controller utility objects and methods.
diff --git a/src/main/java/gov/usgs/earthquake/nshmp/www/services/SourceLogicTreesService.java b/src/main/java/gov/usgs/earthquake/nshmp/www/services/SourceLogicTreesService.java
index b1b5b90e8..823445be9 100644
--- a/src/main/java/gov/usgs/earthquake/nshmp/www/services/SourceLogicTreesService.java
+++ b/src/main/java/gov/usgs/earthquake/nshmp/www/services/SourceLogicTreesService.java
@@ -1,7 +1,5 @@
package gov.usgs.earthquake.nshmp.www.services;
-import jakarta.inject.Singleton;
-
import gov.usgs.earthquake.nshmp.model.Models;
import gov.usgs.earthquake.nshmp.www.Response;
import gov.usgs.earthquake.nshmp.www.SourceLogicTreesController;
@@ -9,6 +7,7 @@ import gov.usgs.earthquake.nshmp.www.meta.Status;
import io.micronaut.http.HttpRequest;
import io.micronaut.http.HttpResponse;
+import jakarta.inject.Singleton;
/**
* Source model tree handler for {@link SourceLogicTreesController}
diff --git a/src/main/java/gov/usgs/earthquake/nshmp/www/services/SourceServices.java b/src/main/java/gov/usgs/earthquake/nshmp/www/services/SourceServices.java
index e6ce9b6b6..7db7d76b5 100644
--- a/src/main/java/gov/usgs/earthquake/nshmp/www/services/SourceServices.java
+++ b/src/main/java/gov/usgs/earthquake/nshmp/www/services/SourceServices.java
@@ -3,8 +3,6 @@ package gov.usgs.earthquake.nshmp.www.services;
import java.util.Map;
import java.util.Set;
-import jakarta.inject.Singleton;
-
import com.google.common.base.Stopwatch;
import com.google.gson.Gson;
import com.google.gson.GsonBuilder;
@@ -20,6 +18,7 @@ import gov.usgs.earthquake.nshmp.www.meta.Status;
import io.micronaut.http.HttpRequest;
import io.micronaut.http.HttpResponse;
+import jakarta.inject.Singleton;
/**
* Entry point for services related to source models. Current services:
--
GitLab