Skip to content
Snippets Groups Projects
Commit 8200877f authored by Clayton, Brandon Scott's avatar Clayton, Brandon Scott
Browse files

update to Micronaut v2

parent 55014437
No related branches found
No related tags found
1 merge request!60Utils
...@@ -9,7 +9,6 @@ plugins { ...@@ -9,7 +9,6 @@ plugins {
id "jacoco" id "jacoco"
id "java" id "java"
id "maven-publish" id "maven-publish"
id "net.ltgt.apt-eclipse" version "${aptEclipseVersion}"
} }
sourceCompatibility = JavaVersion.VERSION_11 sourceCompatibility = JavaVersion.VERSION_11
......
aptEclipseVersion = 0.21
cdmVersion = 5.1.0 cdmVersion = 5.1.0
githooksVersion = 1.2.0 githooksVersion = 1.2.0
jacksonVersion = 2.9.0 jacksonVersion = 2.9.0
junitVersion = 5.5.2 junitVersion = 5.5.2
logbackVersion = 1.2.3 mnVersion = 2.4.1
mnOpenAPIVersion = 1.4.0
mnVersion = 1.3.2
netcdfVersion = 5.1.0 netcdfVersion = 5.1.0
nodeVersion = 3.0.1 nodeVersion = 3.0.1
nshmpLibVersion = 0.3.1 nshmpLibVersion = 0.3.1
nshmpWsUtilsVersion = 0.1.1 nshmpWsUtilsVersion = 0.1.1
shadowVersion = 5.2.0 shadowVersion = 6.1.0
slfVersion = 1.7.30 slfVersion = 1.7.30
spotbugsVersion = 4.2.4 spotbugsVersion = 4.2.4
spotlessVersion = 4.1.0 spotlessVersion = 4.1.0
swaggerVersion = 2.1.1 swaggerVersion = 2.1.7
...@@ -20,12 +20,12 @@ dependencies { ...@@ -20,12 +20,12 @@ dependencies {
implementation "io.micronaut:micronaut-runtime" implementation "io.micronaut:micronaut-runtime"
implementation "io.micronaut:micronaut-http-server-netty" implementation "io.micronaut:micronaut-http-server-netty"
implementation "com.fasterxml.jackson.module:jackson-module-parameter-names:${jacksonVersion}" implementation "com.fasterxml.jackson.module:jackson-module-parameter-names:${jacksonVersion}"
runtimeOnly "ch.qos.logback:logback-classic:${logbackVersion}" runtimeOnly "ch.qos.logback:logback-classic"
// Swagger // Swagger
annotationProcessor("io.micronaut.configuration:micronaut-openapi:${mnOpenAPIVersion}") annotationProcessor("io.micronaut.configuration:micronaut-openapi")
implementation("io.swagger.core.v3:swagger-annotations:${swaggerVersion}") implementation("io.swagger.core.v3:swagger-annotations")
implementation("io.swagger.core.v3:swagger-models:${swaggerVersion}") implementation("io.swagger.core.v3:swagger-models")
// junit // junit
testAnnotationProcessor "io.micronaut:micronaut-inject-java:${mnVersion}" testAnnotationProcessor "io.micronaut:micronaut-inject-java:${mnVersion}"
......
...@@ -2,15 +2,15 @@ package gov.usgs.earthquake.nshmp.netcdf.www; ...@@ -2,15 +2,15 @@ package gov.usgs.earthquake.nshmp.netcdf.www;
import java.nio.file.Path; import java.nio.file.Path;
import javax.annotation.Nullable;
import javax.inject.Inject; import javax.inject.Inject;
import gov.usgs.earthquake.nshmp.gmm.Imt; import gov.usgs.earthquake.nshmp.gmm.Imt;
import gov.usgs.earthquake.nshmp.gmm.NehrpSiteClass; import gov.usgs.earthquake.nshmp.gmm.NehrpSiteClass;
import gov.usgs.earthquake.nshmp.www.NshmpMicronautServlet;
import gov.usgs.earthquake.nshmp.netcdf.NshmGroup; import gov.usgs.earthquake.nshmp.netcdf.NshmGroup;
import gov.usgs.earthquake.nshmp.www.NshmpMicronautServlet;
import io.micronaut.context.annotation.Value; import io.micronaut.context.annotation.Value;
import io.micronaut.core.annotation.Nullable;
import io.micronaut.http.HttpRequest; import io.micronaut.http.HttpRequest;
import io.micronaut.http.HttpResponse; import io.micronaut.http.HttpResponse;
import io.micronaut.http.MediaType; import io.micronaut.http.MediaType;
......
...@@ -14,9 +14,6 @@ import gov.usgs.earthquake.nshmp.geo.json.Feature; ...@@ -14,9 +14,6 @@ import gov.usgs.earthquake.nshmp.geo.json.Feature;
import gov.usgs.earthquake.nshmp.geo.json.GeoJson; import gov.usgs.earthquake.nshmp.geo.json.GeoJson;
import gov.usgs.earthquake.nshmp.gmm.Imt; import gov.usgs.earthquake.nshmp.gmm.Imt;
import gov.usgs.earthquake.nshmp.gmm.NehrpSiteClass; import gov.usgs.earthquake.nshmp.gmm.NehrpSiteClass;
import gov.usgs.earthquake.nshmp.www.Response;
import gov.usgs.earthquake.nshmp.www.WsUtils;
import gov.usgs.earthquake.nshmp.www.meta.Status;
import gov.usgs.earthquake.nshmp.netcdf.NshmGroup; import gov.usgs.earthquake.nshmp.netcdf.NshmGroup;
import gov.usgs.earthquake.nshmp.netcdf.NshmNetcdfReader; import gov.usgs.earthquake.nshmp.netcdf.NshmNetcdfReader;
import gov.usgs.earthquake.nshmp.netcdf.reader.BoundingHazards; import gov.usgs.earthquake.nshmp.netcdf.reader.BoundingHazards;
...@@ -25,6 +22,9 @@ import gov.usgs.earthquake.nshmp.netcdf.reader.StaticHazards; ...@@ -25,6 +22,9 @@ import gov.usgs.earthquake.nshmp.netcdf.reader.StaticHazards;
import gov.usgs.earthquake.nshmp.netcdf.www.NetcdfController.Query; import gov.usgs.earthquake.nshmp.netcdf.www.NetcdfController.Query;
import gov.usgs.earthquake.nshmp.netcdf.www.NetcdfController.Service; import gov.usgs.earthquake.nshmp.netcdf.www.NetcdfController.Service;
import gov.usgs.earthquake.nshmp.netcdf.www.NetcdfWsUtils.Key; import gov.usgs.earthquake.nshmp.netcdf.www.NetcdfWsUtils.Key;
import gov.usgs.earthquake.nshmp.www.Response;
import gov.usgs.earthquake.nshmp.www.WsUtils;
import gov.usgs.earthquake.nshmp.www.meta.Status;
import io.micronaut.http.HttpRequest; import io.micronaut.http.HttpRequest;
import io.micronaut.http.HttpResponse; import io.micronaut.http.HttpResponse;
...@@ -321,7 +321,7 @@ public class NetcdfService { ...@@ -321,7 +321,7 @@ public class NetcdfService {
Metadata(HttpRequest<?> request, NshmGroup nshmGroup, String netcdfFile) { Metadata(HttpRequest<?> request, NshmGroup nshmGroup, String netcdfFile) {
var url = request.getUri().toString(); var url = request.getUri().toString();
description = String.format(SERVICE_DESCRIPTION, nshmGroup.toString()); description = String.format(SERVICE_DESCRIPTION, nshmGroup.toString());
syntax = new String[]{ syntax = new String[] {
url + "/{longitude:number}/{latitude:number}", url + "/{longitude:number}/{latitude:number}",
url + "?longitude={number}&latitude={number}", url + "?longitude={number}&latitude={number}",
url + "/{longitude:number}/{latitude:number}/{siteClass:NehrpSiteClass}", url + "/{longitude:number}/{latitude:number}/{siteClass:NehrpSiteClass}",
......
...@@ -10,11 +10,11 @@ import com.google.gson.GsonBuilder; ...@@ -10,11 +10,11 @@ import com.google.gson.GsonBuilder;
import gov.usgs.earthquake.nshmp.gmm.Imt; import gov.usgs.earthquake.nshmp.gmm.Imt;
import gov.usgs.earthquake.nshmp.gmm.NehrpSiteClass; import gov.usgs.earthquake.nshmp.gmm.NehrpSiteClass;
import gov.usgs.earthquake.nshmp.netcdf.NshmGroup;
import gov.usgs.earthquake.nshmp.www.Response; import gov.usgs.earthquake.nshmp.www.Response;
import gov.usgs.earthquake.nshmp.www.WsUtils.EnumSerializer; import gov.usgs.earthquake.nshmp.www.WsUtils.EnumSerializer;
import gov.usgs.earthquake.nshmp.www.WsUtils.NaNSerializer; import gov.usgs.earthquake.nshmp.www.WsUtils.NaNSerializer;
import gov.usgs.earthquake.nshmp.www.meta.Status; import gov.usgs.earthquake.nshmp.www.meta.Status;
import gov.usgs.earthquake.nshmp.netcdf.NshmGroup;
import io.micronaut.http.HttpResponse; import io.micronaut.http.HttpResponse;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment