From 72a0380860441c6ce3737230e6ea363d99d3442c Mon Sep 17 00:00:00 2001
From: Peter Powers <pmpowers@usgs.gov>
Date: Wed, 10 Nov 2021 12:00:22 -0700
Subject: [PATCH] service call arg formatting
---
.../nshmp/www/HazardController.java | 25 +++++++++++++------
1 file changed, 18 insertions(+), 7 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 e85229e1c..af348a42f 100644
--- a/src/main/java/gov/usgs/earthquake/nshmp/www/HazardController.java
+++ b/src/main/java/gov/usgs/earthquake/nshmp/www/HazardController.java
@@ -4,8 +4,6 @@ import javax.inject.Inject;
import gov.usgs.earthquake.nshmp.www.services.HazardService;
import gov.usgs.earthquake.nshmp.www.services.HazardService.QueryParameters;
-
-import io.micronaut.core.annotation.Nullable;
import io.micronaut.http.HttpRequest;
import io.micronaut.http.HttpResponse;
import io.micronaut.http.annotation.Controller;
@@ -61,11 +59,24 @@ public class HazardController {
@Get(uri = "/{longitude}/{latitude}/{vs30}{?truncate,maxdir}")
public HttpResponse<String> doGetHazard(
HttpRequest<?> request,
- @Schema(minimum = "-360", maximum = "360") @PathVariable double longitude,
- @Schema(minimum = "-90", maximum = "90") @PathVariable double latitude,
- @Schema(minimum = "150", maximum = "3000") @PathVariable int vs30,
- @QueryValue(defaultValue = "false") @Nullable boolean truncate,
- @QueryValue(defaultValue = "false") @Nullable boolean maxdir) {
+
+ @Schema(minimum = "-360", maximum = "360")
+ @PathVariable
+ double longitude,
+
+ @Schema(minimum = "-90", maximum = "90")
+ @PathVariable
+ double latitude,
+
+ @Schema(minimum = "150", maximum = "3000")
+ @PathVariable
+ int vs30,
+
+ @QueryValue(defaultValue = "false")
+ boolean truncate,
+
+ @QueryValue(defaultValue = "false")
+ boolean maxdir) {
/*
* @Schema annotation parameter constraints only affect Swagger service
--
GitLab