Merge branch 'increment-lib' into 'master'

Increment lib

See merge request ghsc/nshmp/nshmp-haz-v2!521

gradle.properties

@@ -8,7 +8,7 @@ junitVersion = 5.5.2
 micronautVersion = 2.4.1
 mnPluginVersion = 1.4.2
 nodeVersion = 3.0.1
-nshmpLibVersion = 0.4.3
+nshmpLibVersion = 0.5.0
 nshmpWsUtilsVersion = 0.1.2
 shadowVersion = 5.2.0
 spotbugsVersion = 4.2.4

src/main/java/gov/usgs/earthquake/nshmp/DeaggCalc.java

@@ -17,7 +17,7 @@ import com.google.common.base.Preconditions;
 import com.google.common.util.concurrent.MoreExecutors;
 
 import gov.usgs.earthquake.nshmp.calc.CalcConfig;
-import gov.usgs.earthquake.nshmp.calc.Deaggregation;
+import gov.usgs.earthquake.nshmp.calc.Disaggregation;
 import gov.usgs.earthquake.nshmp.calc.Hazard;
 import gov.usgs.earthquake.nshmp.calc.HazardCalcs;
 import gov.usgs.earthquake.nshmp.calc.HazardExport;
@@ -89,7 +89,7 @@ public class DeaggCalc {
       if (argCount == 4) {
         Path userConfigPath = Paths.get(args[3]);
         config = CalcConfig.copyOf(model.config())
-            .extend(CalcConfig.fromFile(userConfigPath))
+            .extend(CalcConfig.from(userConfigPath))
             .build();
       }
       log.info(config.toString());
@@ -145,8 +145,8 @@ public class DeaggCalc {
 
     for (Site site : sites) {
       Hazard hazard = HazardCalcs.hazard(model, config, site, exec);
-      Deaggregation deagg = HazardCalcs.deaggReturnPeriod(hazard, returnPeriod, exec);
-      handler.write(hazard, Optional.of(deagg));
+      Disaggregation disagg = HazardCalcs.disaggReturnPeriod(hazard, returnPeriod, exec);
+      handler.write(hazard, Optional.of(disagg));
       log.fine(hazard.toString());
     }
     handler.expire();

src/main/java/gov/usgs/earthquake/nshmp/DeaggEpsilon.java

@@ -32,7 +32,7 @@ import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
 
 import gov.usgs.earthquake.nshmp.calc.CalcConfig;
-import gov.usgs.earthquake.nshmp.calc.Deaggregation;
+import gov.usgs.earthquake.nshmp.calc.Disaggregation;
 import gov.usgs.earthquake.nshmp.calc.Hazard;
 import gov.usgs.earthquake.nshmp.calc.HazardCalcs;
 import gov.usgs.earthquake.nshmp.calc.Site;
@@ -110,11 +110,11 @@ public class DeaggEpsilon {
       if (argCount == 3) {
         Path userConfigPath = Paths.get(args[2]);
         wusConfig = CalcConfig.copyOf(wusModel.config())
-            .extend(CalcConfig.fromFile(userConfigPath))
+            .extend(CalcConfig.from(userConfigPath))
             .imts(EnumSet.copyOf(imts))
             .build();
         ceusConfig = CalcConfig.copyOf(ceusModel.config())
-            .extend(CalcConfig.fromFile(userConfigPath))
+            .extend(CalcConfig.from(userConfigPath))
             .imts(EnumSet.copyOf(imts))
             .build();
       }
@@ -240,7 +240,7 @@ public class DeaggEpsilon {
               ? wusHazard
               : Hazard.merge(wusHazard, ceusHazard);
 
-      Deaggregation deagg = Deaggregation.atImls(cousHazard, spectrum, exec);
+      Disaggregation disagg = Disaggregation.atImls(cousHazard, spectrum, exec);
 
       List<Response> responses = new ArrayList<>(spectrum.size());
       for (Imt imt : wusConfig.hazard.imts) {
@@ -249,7 +249,7 @@ public class DeaggEpsilon {
             site,
             imt,
             spectrum.get(imt));
-        Response response = new Response(imtMetadata, deagg.toJsonCompact(imt));
+        Response response = new Response(imtMetadata, disagg.toJsonCompact(imt));
         responses.add(response);
       }
       Result result = new Result(responses);

src/main/java/gov/usgs/earthquake/nshmp/DeaggIml.java

@@ -17,7 +17,7 @@ import com.google.common.base.Preconditions;
 import com.google.common.util.concurrent.MoreExecutors;
 
 import gov.usgs.earthquake.nshmp.calc.CalcConfig;
-import gov.usgs.earthquake.nshmp.calc.Deaggregation;
+import gov.usgs.earthquake.nshmp.calc.Disaggregation;
 import gov.usgs.earthquake.nshmp.calc.Hazard;
 import gov.usgs.earthquake.nshmp.calc.HazardCalcs;
 import gov.usgs.earthquake.nshmp.calc.HazardExport;
@@ -90,7 +90,7 @@ public class DeaggIml {
       if (argCount == 4) {
         Path userConfigPath = Paths.get(args[3]);
         config = CalcConfig.copyOf(model.config())
-            .extend(CalcConfig.fromFile(userConfigPath))
+            .extend(CalcConfig.from(userConfigPath))
             .build();
       }
       log.info(config.toString());
@@ -146,8 +146,8 @@ public class DeaggIml {
 
     for (Site site : sites) {
       Hazard hazard = HazardCalcs.hazard(model, config, site, exec);
-      Deaggregation deagg = HazardCalcs.deaggIml(hazard, iml, exec);
-      handler.write(hazard, Optional.of(deagg));
+      Disaggregation disagg = HazardCalcs.disaggIml(hazard, iml, exec);
+      handler.write(hazard, Optional.of(disagg));
       log.fine(hazard.toString());
     }
     handler.expire();

src/main/java/gov/usgs/earthquake/nshmp/Hazard2018.java

@@ -87,7 +87,7 @@ public class Hazard2018 {
       CalcConfig wusConfig = wusModel.config();
       CalcConfig ceusConfig = ceusModel.config();
       if (argCount == 3) {
-        CalcConfig.Builder userConfig = CalcConfig.fromFile(Paths.get(args[2]));
+        CalcConfig.Builder userConfig = CalcConfig.from(Paths.get(args[2]));
         wusConfig = CalcConfig.copyOf(wusModel.config())
             .extend(userConfig)
             .build();

src/main/java/gov/usgs/earthquake/nshmp/HazardCalc.java

@@ -101,7 +101,7 @@ public class HazardCalc {
       if (argCount == 3) {
         Path userConfigPath = Paths.get(args[2]);
         config = CalcConfig.copyOf(model.config())
-            .extend(CalcConfig.fromFile(userConfigPath))
+            .extend(CalcConfig.from(userConfigPath))
             .build();
       }
       log.info(config.toString());

src/main/java/gov/usgs/earthquake/nshmp/RateCalc.java

@@ -99,7 +99,7 @@ public class RateCalc {
       if (argCount == 3) {
         Path userConfigPath = Paths.get(args[2]);
         config = CalcConfig.copyOf(model.config())
-            .extend(CalcConfig.fromFile(userConfigPath))
+            .extend(CalcConfig.from(userConfigPath))
             .build();
       }
       log.info(config.toString());

src/main/java/gov/usgs/earthquake/nshmp/www/services/DeaggEpsilonService.java

@@ -3,6 +3,7 @@ package gov.usgs.earthquake.nshmp.www.services;
 import java.net.URL;
 import java.util.EnumMap;
 import java.util.List;
+import java.util.Optional;
 import java.util.concurrent.ExecutionException;
 import java.util.function.Function;
 
@@ -12,7 +13,7 @@ import com.google.common.base.Stopwatch;
 import com.google.common.collect.ImmutableList;
 
 import gov.usgs.earthquake.nshmp.calc.CalcConfig;
-import gov.usgs.earthquake.nshmp.calc.Deaggregation;
+import gov.usgs.earthquake.nshmp.calc.Disaggregation;
 import gov.usgs.earthquake.nshmp.calc.Site;
 import gov.usgs.earthquake.nshmp.geo.Location;
 import gov.usgs.earthquake.nshmp.gmm.Imt;
@@ -94,7 +95,7 @@ public final class DeaggEpsilonService {
     var siteFunction = new SiteFunction(data);
     var timer = Stopwatch.createStarted();
     var hazard = ServicesUtil.calcHazard(configFunction, siteFunction);
-    var deagg = Deaggregation.atImls(hazard, data.imtImls, ServletUtil.CALC_EXECUTOR);
+    var deagg = Disaggregation.atImls(hazard, data.imtImls, ServletUtil.CALC_EXECUTOR);
     return new ResultBuilder()
         .deagg(deagg)
         .requestData(data)
@@ -160,7 +161,7 @@ public final class DeaggEpsilonService {
     public Site apply(CalcConfig config) {
       return Site.builder()
           .location(Location.create(data.longitude, data.latitude))
-          .basinDataProvider(data.basin ? basinUrl : null)
+          .dataService(data.basin ? Optional.of(basinUrl) : Optional.empty())
           .vs30(data.vs30)
           .build();
     }
@@ -189,7 +190,7 @@ public final class DeaggEpsilonService {
     final String εlabel = "% Contribution to Hazard";
     final Object εbins;
 
-    ResponseMetadata(Deaggregation deagg, RequestData request, Imt imt) {
+    ResponseMetadata(Disaggregation deagg, RequestData request, Imt imt) {
       this.models = new SourceModel(ServletUtil.model());
       this.longitude = request.longitude;
       this.latitude = request.latitude;
@@ -224,9 +225,9 @@ public final class DeaggEpsilonService {
     String url;
     Stopwatch timer;
     RequestData request;
-    Deaggregation deagg;
+    Disaggregation deagg;
 
-    ResultBuilder deagg(Deaggregation deagg) {
+    ResultBuilder deagg(Disaggregation deagg) {
       this.deagg = deagg;
       return this;
     }

src/main/java/gov/usgs/earthquake/nshmp/www/services/HazardService.java

@@ -119,7 +119,7 @@ public final class HazardService {
     @Override
     public Site apply(CalcConfig config) {
       return Site.builder()
-          .basinDataProvider(config.siteData.basinDataProvider)
+          .dataService(config.siteData.service)
           .location(Location.create(data.longitude, data.latitude))
           .vs30(data.vs30)
           .build();