From c8ba6a57bf057ae977511900f2e5ef8d893942f3 Mon Sep 17 00:00:00 2001
From: Brandon Clayton <bclayton@usgs.gov>
Date: Fri, 29 Jul 2022 09:52:18 -0600
Subject: [PATCH] make models generic
---
.../gov/usgs/earthquake/nshmp/netcdf/www/Metadata.java | 9 +++------
1 file changed, 3 insertions(+), 6 deletions(-)
diff --git a/src/lib/src/main/java/gov/usgs/earthquake/nshmp/netcdf/www/Metadata.java b/src/lib/src/main/java/gov/usgs/earthquake/nshmp/netcdf/www/Metadata.java
index 7738467..a3485d0 100644
--- a/src/lib/src/main/java/gov/usgs/earthquake/nshmp/netcdf/www/Metadata.java
+++ b/src/lib/src/main/java/gov/usgs/earthquake/nshmp/netcdf/www/Metadata.java
@@ -1,9 +1,6 @@
package gov.usgs.earthquake.nshmp.netcdf.www;
-import java.util.List;
-
import gov.usgs.earthquake.nshmp.gmm.NehrpSiteClass;
-import gov.usgs.earthquake.nshmp.netcdf.www.NetcdfService.SourceModel;
import gov.usgs.earthquake.nshmp.netcdf.www.Request.RequestData;
import gov.usgs.earthquake.nshmp.netcdf.www.Request.RequestDataSiteClass;
import gov.usgs.earthquake.nshmp.netcdf.www.meta.DoubleParameter;
@@ -15,13 +12,13 @@ import io.micronaut.http.HttpRequest;
*
* @author U.S. Geological Survey
*/
-public class Metadata<T extends Query> {
+public class Metadata<S, T extends Query> {
public final String description;
public final String[] syntax;
- public final List<SourceModel> models;
+ public final S models;
public final DoubleParameter vs30;
- Metadata(HttpRequest<?> request, NetcdfService<T> netcdfService, String description) {
+ Metadata(HttpRequest<?> request, NetcdfService<S, T> netcdfService, String description) {
var url = request.getUri().toString();
url = url.endsWith("/") ? url.substring(0, url.length() - 1) : url;
this.description = description;
--
GitLab