diff --git a/src/main/java/gov/usgs/earthquake/nshmp/aws/HazardResultsSlicerLambda.java b/src/main/java/gov/usgs/earthquake/nshmp/aws/HazardResultsSlicerLambda.java index 8178a79c432ec8ee8f684175bfd2c2e572d60e2b..f48d7babebb87882844c5f7dcfe8d41c24163153 100644 --- a/src/main/java/gov/usgs/earthquake/nshmp/aws/HazardResultsSlicerLambda.java +++ b/src/main/java/gov/usgs/earthquake/nshmp/aws/HazardResultsSlicerLambda.java @@ -36,7 +36,7 @@ import gov.usgs.earthquake.nshmp.www.services.ServletUtil; /** * AWS Lambda function to read in hazard results from S3 and to create slices of * return periods of interest. - * + * * @see HazardResultSliceLambda */ @SuppressWarnings("unused") diff --git a/src/main/java/gov/usgs/earthquake/nshmp/etc/HazMat.java b/src/main/java/gov/usgs/earthquake/nshmp/etc/HazMat.java index 05bdc38fc3b894ba379bf3f85fdf1ea4e4af9170..48ad5d38fee8ace623c512d869a69997a4a64824 100644 --- a/src/main/java/gov/usgs/earthquake/nshmp/etc/HazMat.java +++ b/src/main/java/gov/usgs/earthquake/nshmp/etc/HazMat.java @@ -12,7 +12,7 @@ public class HazMat { /* * Developer notes: - * + * * Mathworks has gone out of its way to make it more and more difficult to use * Java in Matlab as time goes on, despite it being a first-class citizen. * Specifically, the Matlab classpath includes a dizzying number of 3rd party @@ -26,14 +26,14 @@ public class HazMat { * it's dependency on Guava, but putting nshmp-haz early on the Matlab * classpath causes Matlab to crash as it can't find (now missing) methods in * Guava. - * + * * The unsatisfactory but functional workaround is to use a custom class * loader that, once we want to use nshmp-haz classes, scans nshmp-haz.jar * before looking in the matlab classpath. This approach is messy in that the * sole point of entry is this class, which delegates to HazMatHelper (loaded * with the custom class loader) and the methods of which must be accessed via * reflection. - * + * * Note that if nshmp-haz moves to Java 8, which will probably occur sooner * rather than later, the custom class loader will also have to have Java 8 on * it's classpath. Sigh. diff --git a/src/main/java/gov/usgs/earthquake/nshmp/www/DeaggEpsilonController.java b/src/main/java/gov/usgs/earthquake/nshmp/www/DeaggEpsilonController.java index df7472f331b7c56e392bd60ce07b0a22d8774c21..ab2976d4e2b23d2f3d1e8a54170458c3048a645e 100644 --- a/src/main/java/gov/usgs/earthquake/nshmp/www/DeaggEpsilonController.java +++ b/src/main/java/gov/usgs/earthquake/nshmp/www/DeaggEpsilonController.java @@ -45,7 +45,7 @@ public class DeaggEpsilonController { /** * GET method to return usage or hazard curves, query based. - * + * * @param request The HTTP request * @param longitude Longitude (in decimal degrees) ([-360, 360]) * @param latitude Latitude (in decimal degrees) ([-90, 90]) @@ -82,7 +82,7 @@ public class DeaggEpsilonController { /** * GET method to return usage or hazard curves, slash based. - * + * * @param request The HTTP request * @param longitude Longitude (in decimal degrees) ([-360, 360]) * @param latitude Latitude (in decimal degrees) ([-90, 90]) 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 7a5b670104729bfdcc7626eaaeece15ed6696559..73942632e385a63c037ed4738c8d3f850bd5587d 100644 --- a/src/main/java/gov/usgs/earthquake/nshmp/www/HazardController.java +++ b/src/main/java/gov/usgs/earthquake/nshmp/www/HazardController.java @@ -21,9 +21,9 @@ import io.swagger.v3.oas.annotations.tags.Tag; /** * Micronaut controller for probabilistic seismic hazard calculations. - * + * * @see HazardService - * + * * @author U.S. Geological Survey */ @Tag( @@ -37,7 +37,7 @@ public class HazardController { /** * GET method to return the hazard usage. - * + * * @param request The HTTP request */ @Operation( @@ -56,7 +56,7 @@ public class HazardController { /** * GET method to return usage or hazard curves, query based. - * + * * @param request The HTTP request * @param longitude Longitude (in decimal degrees) ([-360, 360]) * @param latitude Latitude (in decimal degrees) ([-90, 90]) @@ -88,7 +88,7 @@ public class HazardController { /** * GET method to return usage or hazard curves, slash based. - * + * * @param request The HTTP request * @param longitude Longitude (in decimal degrees) ([-360, 360]) * @param latitude Latitude (in decimal degrees) ([-90, 90]) 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 e8830a4881cac3a2a599027e05dd18e8862d9b8e..caaa0379f2e9f611845f213a61ea538c6fcc4c20 100644 --- a/src/main/java/gov/usgs/earthquake/nshmp/www/RateController.java +++ b/src/main/java/gov/usgs/earthquake/nshmp/www/RateController.java @@ -23,9 +23,9 @@ import io.swagger.v3.oas.annotations.responses.ApiResponse; /** * Micronaut controller for rate and probability services. - * + * * @see RateService - * + * * @author U.S. Geological Survey */ @Controller("/") @@ -36,7 +36,7 @@ public class RateController { /** * GET method to return the usage information on the rate service. - * + * * @param request The HTTP request */ @Operation( @@ -55,7 +55,7 @@ public class RateController { /** * GET method to compute annual-rate, query based. - * + * * @param request The HTTP request * @param longitude Longitude (in decimal degrees) ([-360, 360]) * @param latitude Latitude (in decimal degrees) ([-90, 90]) @@ -94,7 +94,7 @@ public class RateController { /** * GET method to compute annual-rate, slash based - * + * * @param request The HTTP request * @param longitude Longitude (in decimal degrees) ([-360, 360]) * @param latitude Latitude (in decimal degrees) ([-90, 90]) @@ -133,7 +133,7 @@ public class RateController { /** * GET method to return the usage information on the probability service. - * + * * @param request The HTTP request */ @Operation( @@ -153,7 +153,7 @@ public class RateController { /** * GET method to compute probability, query based. - * + * * @param request The HTTP request * @param longitude Longitude (in decimal degrees) ([-360, 360]) * @param latitude Latitude (in decimal degrees) ([-90, 90]) @@ -197,7 +197,7 @@ public class RateController { /** * GET method to compute probability, slash based - * + * * @param request The HTTP request * @param longitude Longitude (in decimal degrees) ([-360, 360]) * @param latitude Latitude (in decimal degrees) ([-90, 90]) 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 8a2f74c6f8c3d1a95bce8acac59055ffacc88549..618b77b55d791b36f9fe0e27ebafa5c2b91f135f 100644 --- a/src/main/java/gov/usgs/earthquake/nshmp/www/SourceController.java +++ b/src/main/java/gov/usgs/earthquake/nshmp/www/SourceController.java @@ -16,14 +16,14 @@ import io.swagger.v3.oas.annotations.tags.Tag; /** * Source model service to return the current installed model. - * + * * <p> See src/main/resources/applicaiton.yml nshmp-haz.installed-model for * default model used - * + * * <p> To run the Micronaut jar file with a model: java -jar * path/to/nshmp-haz-v2-all.jar -model=<{@code Model}> - * - * + * + * * @author U.S. Geological Survey */ @Tag(name = "Source Model") @@ -35,7 +35,7 @@ public class SourceController { /** * GET method to return the source model usage - * + * * @param request The HTTP request */ @Operation( diff --git a/src/main/java/gov/usgs/earthquake/nshmp/www/meta/package-info.java b/src/main/java/gov/usgs/earthquake/nshmp/www/meta/package-info.java index 891b3a5f7fed4a71f1519c7d70d0dcb84939efc5..ea198d9021ea597574e4079cd33275773279ff4c 100644 --- a/src/main/java/gov/usgs/earthquake/nshmp/www/meta/package-info.java +++ b/src/main/java/gov/usgs/earthquake/nshmp/www/meta/package-info.java @@ -1,6 +1,6 @@ /** * Web-service metadata support classes. - * + * * <p>Classes in this package largely provide support for web services used on * the public facing USGS website. Services that are not public facing may use a * simpler metadata structure defined within the service class itself (e.g. diff --git a/src/main/resources/logback.xml b/src/main/resources/logback.xml index f7f49d44d2952daea8299b55ab83db65c8952f46..f74e41693090ae1b24cabe0642f4ec814564c4a1 100644 --- a/src/main/resources/logback.xml +++ b/src/main/resources/logback.xml @@ -3,7 +3,7 @@ <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender"> <withJansi>true</withJansi> - <!-- encoders are assigned the type ch.qos.logback.classic.encoder.PatternLayoutEncoder + <!-- encoders are assigned the type ch.qos.logback.classic.encoder.PatternLayoutEncoder by default --> <encoder> <pattern>%cyan(%d{HH:mm:ss.SSS}) %gray([%thread])