From bd67d08386c4017c6068f4f0311fb46ecc62cce4 Mon Sep 17 00:00:00 2001
From: bclayton-usgs <bclayton@usgs.gov>
Date: Tue, 2 Jun 2020 15:20:45 -0600
Subject: [PATCH 1/4] update location
---
.../usgs/earthquake/nshmp/aws/HazardResultSliceLambda.java | 4 ++--
.../java/gov/usgs/earthquake/nshmp/site/CybershakeSite.java | 2 +-
.../java/gov/usgs/earthquake/nshmp/site/NshmpPolygon.java | 2 +-
src/main/java/gov/usgs/earthquake/nshmp/site/NshmpSite.java | 2 +-
.../java/gov/usgs/earthquake/nshmp/site/NshmpSiteFiles.java | 4 ++--
src/main/java/gov/usgs/earthquake/nshmp/site/NuregSite.java | 2 +-
.../earthquake/nshmp/www/services/DeaggEpsilonService.java | 4 ++--
.../usgs/earthquake/nshmp/www/services/HazardService.java | 6 +++---
.../gov/usgs/earthquake/nshmp/www/services/RateService.java | 6 +++---
.../java/gov/usgs/earthquake/nshmp/site/NshmpSiteTests.java | 2 +-
10 files changed, 17 insertions(+), 17 deletions(-)
diff --git a/src/main/java/gov/usgs/earthquake/nshmp/aws/HazardResultSliceLambda.java b/src/main/java/gov/usgs/earthquake/nshmp/aws/HazardResultSliceLambda.java
index 813b12165..5ba9a19fc 100644
--- a/src/main/java/gov/usgs/earthquake/nshmp/aws/HazardResultSliceLambda.java
+++ b/src/main/java/gov/usgs/earthquake/nshmp/aws/HazardResultSliceLambda.java
@@ -43,7 +43,7 @@ import gov.usgs.earthquake.nshmp.www.services.ServletUtil;
/**
* AWS Lambda function to read in a curves file from AWS S3 and create slices at
* return periods interest. <br>
- *
+ *
* The results are written to S3 as map.csv bucket.
*/
@SuppressWarnings("unused")
@@ -174,7 +174,7 @@ public class HazardResultSliceLambda implements RequestStreamHandler {
}
return Site.builder()
- .location(lat, lon)
+ .location(lon, lat)
.name(name)
.build();
}
diff --git a/src/main/java/gov/usgs/earthquake/nshmp/site/CybershakeSite.java b/src/main/java/gov/usgs/earthquake/nshmp/site/CybershakeSite.java
index da0d03e04..1cd89db28 100644
--- a/src/main/java/gov/usgs/earthquake/nshmp/site/CybershakeSite.java
+++ b/src/main/java/gov/usgs/earthquake/nshmp/site/CybershakeSite.java
@@ -118,7 +118,7 @@ public enum CybershakeSite implements NamedLocation {
double z1p0,
double z2p5) {
- this.loc = Location.create(lat, lon);
+ this.loc = Location.create(lon, lat);
this.run = run;
this.willsVs30 = willsVs30;
this.cvmVs30 = cvmVs30;
diff --git a/src/main/java/gov/usgs/earthquake/nshmp/site/NshmpPolygon.java b/src/main/java/gov/usgs/earthquake/nshmp/site/NshmpPolygon.java
index 4c15b89fc..ccc634578 100644
--- a/src/main/java/gov/usgs/earthquake/nshmp/site/NshmpPolygon.java
+++ b/src/main/java/gov/usgs/earthquake/nshmp/site/NshmpPolygon.java
@@ -55,7 +55,7 @@ public enum NshmpPolygon {
private static LocationList createPolygon(double[][] coords) {
LocationList.Builder locs = LocationList.builder();
for (double[] coord : coords) {
- locs.add(coord[1], coord[0]);
+ locs.add(coord[0], coord[1]);
}
return locs.build();
}
diff --git a/src/main/java/gov/usgs/earthquake/nshmp/site/NshmpSite.java b/src/main/java/gov/usgs/earthquake/nshmp/site/NshmpSite.java
index 7221fa82a..27041e5f2 100644
--- a/src/main/java/gov/usgs/earthquake/nshmp/site/NshmpSite.java
+++ b/src/main/java/gov/usgs/earthquake/nshmp/site/NshmpSite.java
@@ -324,7 +324,7 @@ public enum NshmpSite implements NamedLocation {
private final String label;
private NshmpSite(double lon, double lat) {
- this.location = Location.create(lat, lon);
+ this.location = Location.create(lon, lat);
this.state = UsRegion.valueOf(name().substring(name().lastIndexOf('_') + 1));
this.label = createLabel();
}
diff --git a/src/main/java/gov/usgs/earthquake/nshmp/site/NshmpSiteFiles.java b/src/main/java/gov/usgs/earthquake/nshmp/site/NshmpSiteFiles.java
index 2947000ac..796c767d1 100644
--- a/src/main/java/gov/usgs/earthquake/nshmp/site/NshmpSiteFiles.java
+++ b/src/main/java/gov/usgs/earthquake/nshmp/site/NshmpSiteFiles.java
@@ -439,8 +439,8 @@ final class NshmpSiteFiles {
@Override
public Location location() {
return Location.create(
- Maths.round(input.location().latitude, 1),
- Maths.round(input.location().longitude, 1));
+ Maths.round(input.location().longitude, 1),
+ Maths.round(input.location().latitude, 1));
}
@Override
diff --git a/src/main/java/gov/usgs/earthquake/nshmp/site/NuregSite.java b/src/main/java/gov/usgs/earthquake/nshmp/site/NuregSite.java
index b645547a9..0aba72dce 100644
--- a/src/main/java/gov/usgs/earthquake/nshmp/site/NuregSite.java
+++ b/src/main/java/gov/usgs/earthquake/nshmp/site/NuregSite.java
@@ -26,7 +26,7 @@ public enum NuregSite implements NamedLocation {
private final UsRegion state;
private NuregSite(double lon, double lat) {
- this.loc = Location.create(lat, lon);
+ this.loc = Location.create(lon, lat);
this.state = UsRegion.valueOf(name().substring(name().lastIndexOf('_') + 1));
}
diff --git a/src/main/java/gov/usgs/earthquake/nshmp/www/services/DeaggEpsilonService.java b/src/main/java/gov/usgs/earthquake/nshmp/www/services/DeaggEpsilonService.java
index 9722ce118..7ac915038 100644
--- a/src/main/java/gov/usgs/earthquake/nshmp/www/services/DeaggEpsilonService.java
+++ b/src/main/java/gov/usgs/earthquake/nshmp/www/services/DeaggEpsilonService.java
@@ -68,7 +68,7 @@ public final class DeaggEpsilonService {
/**
* Handler for {@link DeaggEpsilonController#doGetDeaggEpsilon}. Returns the
* usage or the deagg result.
- *
+ *
* @param query The query
* @param urlHelper The URL helper
*/
@@ -180,7 +180,7 @@ public final class DeaggEpsilonService {
@Override
public Site apply(CalcConfig config) {
return Site.builder()
- .location(Location.create(data.latitude, data.longitude))
+ .location(Location.create(data.longitude, data.latitude))
.basinDataProvider(data.basin ? basinUrl : null)
.vs30(data.vs30.value())
.build();
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 8b36bc0bd..9df7324c9 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
@@ -54,7 +54,7 @@ public final class HazardService {
/**
* Handler for {@link HazardController#doGetUsage}. Returns the usage for the
* hazard service.
- *
+ *
* @param urlHelper The URL helper
*/
public static HttpResponse<String> handleDoGetUsage(UrlHelper urlHelper) {
@@ -71,7 +71,7 @@ public final class HazardService {
/**
* Handler for {@link HazardController#doGetHazard}. Returns the usage or the
* hazard result.
- *
+ *
* @param query The query
* @param urlHelper The URL helper
*/
@@ -128,7 +128,7 @@ public final class HazardService {
public Site apply(CalcConfig config) {
return Site.builder()
.basinDataProvider(config.siteData.basinDataProvider)
- .location(Location.create(data.latitude, data.longitude))
+ .location(Location.create(data.longitude, data.latitude))
.vs30(data.vs30.value())
.build();
}
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 ada84547e..272f69bdb 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
@@ -52,7 +52,7 @@ public final class RateService {
/**
* Handler for {@link RateController#doGetUsageRate} and
* {@link RateController#doGetUsageProbability}.
- *
+ *
* @param service The service
* @param urlHelper The url helper
*/
@@ -70,7 +70,7 @@ public final class RateService {
* Handler for {@link RateController#doGetProbability},
* {@link RateController#doGetProbabilitySlash},
* {@link RateController#doGetRate}, and {@link RateController#doGetRateSlash}
- *
+ *
* @param service The service
* @param query The query
* @param urlHelper The url helper
@@ -114,7 +114,7 @@ public final class RateService {
private static EqRate calc(Service service, RequestData data)
throws InterruptedException, ExecutionException {
- var location = Location.create(data.latitude, data.longitude);
+ var location = Location.create(data.longitude, data.latitude);
var site = Site.builder().location(location).build();
var futureRates = new ArrayList<ListenableFuture<EqRate>>();
diff --git a/src/test/java/gov/usgs/earthquake/nshmp/site/NshmpSiteTests.java b/src/test/java/gov/usgs/earthquake/nshmp/site/NshmpSiteTests.java
index f6c09d266..6d64067a3 100644
--- a/src/test/java/gov/usgs/earthquake/nshmp/site/NshmpSiteTests.java
+++ b/src/test/java/gov/usgs/earthquake/nshmp/site/NshmpSiteTests.java
@@ -68,7 +68,7 @@ public class NshmpSiteTests {
public final void methodsTest() {
NshmpSite s = WASHINGTON_DC;
assertEquals(s.state(), UsRegion.DC);
- assertEquals(s.location(), Location.create(38.90, -77.05));
+ assertEquals(s.location(), Location.create(-77.05, 38.90));
assertEquals(s.toString(), "Washington DC");
s = MCGRATH_AK;
--
GitLab
From e97a10bee7c358b613b46892f3d9e7336fd4fae3 Mon Sep 17 00:00:00 2001
From: bclayton-usgs <bclayton@usgs.gov>
Date: Tue, 2 Jun 2020 15:21:40 -0600
Subject: [PATCH 2/4] update versions
---
gradle.properties | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/gradle.properties b/gradle.properties
index 1cb947167..a084e5af4 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,10 +1,15 @@
+aptEclipseVersion = 0.21
awsEc2Version = 1.11.619
awsLambdaCoreVersion = 1.1.0
awsLambdaVersion = 1.11.461
awsS3Version = 1.11.579
+githooksVersion = 1.2.0
jacksonVersion = 2.9.0
junitVersion = 5.5.2
logbackVersion = 1.2.3
mnOpenAPIVersion = 1.4.0
mnVersion = 1.3.2
+shadowVersion = 5.2.0
+spotbugsVersion = 4.2.4
+spotlessVersion = 4.1.0
swaggerVersion = 2.1.1
--
GitLab
From 666f707e5541cb1cad53ef2453c1a0847c1b3530 Mon Sep 17 00:00:00 2001
From: bclayton-usgs <bclayton@usgs.gov>
Date: Tue, 2 Jun 2020 15:29:20 -0600
Subject: [PATCH 3/4] spotlessApply
---
.../nshmp/aws/HazardResultsSlicerLambda.java | 2 +-
.../gov/usgs/earthquake/nshmp/etc/HazMat.java | 6 +++---
.../nshmp/www/DeaggEpsilonController.java | 4 ++--
.../earthquake/nshmp/www/HazardController.java | 10 +++++-----
.../earthquake/nshmp/www/RateController.java | 16 ++++++++--------
.../earthquake/nshmp/www/SourceController.java | 10 +++++-----
.../earthquake/nshmp/www/meta/package-info.java | 2 +-
src/main/resources/logback.xml | 2 +-
8 files changed, 26 insertions(+), 26 deletions(-)
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 8178a79c4..f48d7babe 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 05bdc38fc..48ad5d38f 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 df7472f33..ab2976d4e 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 7a5b67010..73942632e 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 e8830a488..caaa0379f 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 8a2f74c6f..618b77b55 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 891b3a5f7..ea198d902 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 f7f49d44d..f74e41693 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])
--
GitLab
From b3dd174bc8e86d884fb319e409ec4efce81ae684 Mon Sep 17 00:00:00 2001
From: bclayton-usgs <bclayton@usgs.gov>
Date: Tue, 2 Jun 2020 15:30:01 -0600
Subject: [PATCH 4/4] update Spotbugs
---
build.gradle | 21 +++++++++++----------
1 file changed, 11 insertions(+), 10 deletions(-)
diff --git a/build.gradle b/build.gradle
index 7fe810d40..987a41acb 100644
--- a/build.gradle
+++ b/build.gradle
@@ -29,13 +29,13 @@
plugins {
id "application"
- id "com.diffplug.gradle.spotless" version "3.27.1"
- id "com.github.spotbugs" version "3.0.0"
- id "com.github.johnrengelman.shadow" version "5.2.0"
- id "com.star-zero.gradle.githook" version "1.2.0"
+ id "com.diffplug.gradle.spotless" version "${spotlessVersion}"
+ id "com.github.spotbugs" version "${spotbugsVersion}"
+ id "com.github.johnrengelman.shadow" version "${shadowVersion}"
+ id "com.star-zero.gradle.githook" version "${githooksVersion}"
id "eclipse-wtp"
id "jacoco"
- id "net.ltgt.apt-eclipse" version "0.21"
+ id "net.ltgt.apt-eclipse" version "${aptEclipseVersion}"
}
apply from: "${projectDir}/gradle/ext.gradle"
@@ -59,7 +59,7 @@ repositories {
git {
implementation("https://code.usgs.gov/ghsc/nshmp/nshmp-lib.git", {
name "nshmp-haz-dep--nshmp-lib"
- tag "v0.0.5"
+ tag "v0.1.1"
})
}
@@ -138,10 +138,11 @@ tasks.withType(JavaExec) {
}
/* Add HTML reports to SpotBugs */
-tasks.withType(com.github.spotbugs.SpotBugsTask) {
- ignoreFailures = false // TODO remove when nshmp-lib is updated
+tasks.withType(com.github.spotbugs.snom.SpotBugsTask) {
reports {
- xml.enabled = false
- html.enabled = true
+ html {
+ enabled true
+ stylesheet = 'fancy-hist.xsl'
+ }
}
}
--
GitLab