Utils

• Use new nshmp-ws-utils package
• Update to latest lib
• Update to Micronaut v2

Getting the url is now from request.getUri(), not sure if this will get the entire url.

Currently it only gets /hazard but could be because of using localhost?

src/main/java/gov/usgs/earthquake/nshmp/netcdf/www/NetcdfController.java

@@ -7,7 +7,7 @@ import javax.inject.Inject;
 
 import gov.usgs.earthquake.nshmp.gmm.Imt;
 import gov.usgs.earthquake.nshmp.gmm.NehrpSiteClass;
-import gov.usgs.earthquake.nshmp.internal.www.NshmpMicronautServlet;
+import gov.usgs.earthquake.nshmp.www.NshmpMicronautServlet;
 import gov.usgs.earthquake.nshmp.netcdf.NshmGroup;
 
 import io.micronaut.context.annotation.Value;
@@ -72,9 +72,8 @@ public class NetcdfController {
       @Schema(required = true) @QueryValue @Nullable Double latitude,
       @QueryValue @Nullable NehrpSiteClass siteClass,
       @QueryValue @Nullable Imt imt) {
-    var urlHelper = servlet.urlHelper(request);
     var query = new Query(longitude, latitude, siteClass, imt);
-    return NetcdfService.handleDoGet(nshmGroup, path, urlHelper, query);
+    return NetcdfService.handleDoGet(request, nshmGroup, path, query);
   }
 
   /**
@@ -174,8 +173,7 @@ public class NetcdfController {
           schema = @Schema(type = "string")))
   @Get(uri = "/border", produces = MediaType.APPLICATION_JSON)
   public HttpResponse<String> doGetBorder(HttpRequest<?> request) {
-    var urlHelper = servlet.urlHelper(request);
-    return NetcdfService.handleDoGetBorder(nshmGroup, path, urlHelper);
+    return NetcdfService.handleDoGetBorder(request, nshmGroup, path);
   }
 
   /**
@@ -191,9 +189,8 @@ public class NetcdfController {
       HttpRequest<?> request,
       @Schema(required = true) @QueryValue @Nullable Double longitude,
       @Schema(required = true) @QueryValue @Nullable Double latitude) {
-    var urlHelper = servlet.urlHelper(request);
     var query = new Query(longitude, latitude, null, null);
-    return NetcdfService.handleDoGetBounding(nshmGroup, path, urlHelper, query);
+    return NetcdfService.handleDoGetBounding(request, nshmGroup, path, query);
   }
 
   /**