diff --git a/gradle.properties b/gradle.properties index 336a4f52df56f4229dbb3fbfee730f845e55d1b0..a3b34da6d52701547a7e8cf15effb864a06490ab 100644 --- a/gradle.properties +++ b/gradle.properties @@ -10,7 +10,7 @@ micronautVersion = 3.2.3 micronautRxVersion = 2.1.1 nodePluginVersion = 3.0.1 nodeVersion = 16.3.0 -nshmpLibVersion = 1.1.5 +nshmpLibVersion = 1.1.6 nshmpWsUtilsVersion = 0.3.11 openApiVersion = 4.0.0 shadowVersion = 7.1.2 diff --git a/src/main/java/gov/usgs/earthquake/nshmp/HazardMaps.java b/src/main/java/gov/usgs/earthquake/nshmp/HazardMaps.java index b4580ef94e478e0733909b9f055b73b29b8a4229..bb5733e2f5a2bface8609b837c11ce001a6d092e 100644 --- a/src/main/java/gov/usgs/earthquake/nshmp/HazardMaps.java +++ b/src/main/java/gov/usgs/earthquake/nshmp/HazardMaps.java @@ -15,7 +15,6 @@ import java.util.stream.Collectors; import java.util.stream.Stream; import gov.usgs.earthquake.nshmp.data.Interpolator; -import gov.usgs.earthquake.nshmp.internal.Parsing; /** * Utility class to create hazard map datasets from a hazard curve results. @@ -38,7 +37,7 @@ public class HazardMaps { private static final String PROGRAM = HazardMaps.class.getSimpleName(); private static final String VALUE_FMT = "%.8e"; private static final Function<Double, String> VALUE_FORMATTER = - Parsing.formatDoubleFunction(VALUE_FMT); + Text.formatDoubleFunction(VALUE_FMT); private HazardMaps() {} diff --git a/src/main/java/gov/usgs/earthquake/nshmp/www/ServletUtil.java b/src/main/java/gov/usgs/earthquake/nshmp/www/ServletUtil.java index 8eaadb3536dc61b8c90d66af93bed58b041eb2ad..759006914acf0504a2df04614de07dc6ceaea1c4 100644 --- a/src/main/java/gov/usgs/earthquake/nshmp/www/ServletUtil.java +++ b/src/main/java/gov/usgs/earthquake/nshmp/www/ServletUtil.java @@ -33,7 +33,6 @@ import gov.usgs.earthquake.nshmp.gmm.Imt; import gov.usgs.earthquake.nshmp.model.HazardModel; import gov.usgs.earthquake.nshmp.model.SiteData; import gov.usgs.earthquake.nshmp.www.meta.MetaUtil; - import io.micronaut.context.annotation.Value; import io.micronaut.context.event.ShutdownEvent; import io.micronaut.context.event.StartupEvent; @@ -49,6 +48,7 @@ import jakarta.inject.Singleton; @Singleton public class ServletUtil { + @Deprecated public static final Gson GSON; public static final Gson GSON2; diff --git a/src/test/java/gov/usgs/earthquake/nshmp/model/peer/PeerTest.java b/src/test/java/gov/usgs/earthquake/nshmp/model/peer/PeerTest.java index b18913f725d0367f5b9354842db1b0730cec99b1..d4fea07779a619d6836a05974fd9625003c0aa4e 100644 --- a/src/test/java/gov/usgs/earthquake/nshmp/model/peer/PeerTest.java +++ b/src/test/java/gov/usgs/earthquake/nshmp/model/peer/PeerTest.java @@ -2,7 +2,7 @@ package gov.usgs.earthquake.nshmp.model.peer; import static com.google.common.base.Preconditions.checkArgument; import static com.google.common.base.Preconditions.checkState; -import static gov.usgs.earthquake.nshmp.internal.Parsing.Delimiter.COMMA; +import static gov.usgs.earthquake.nshmp.Text.Delimiter.COMMA; import static java.lang.Math.abs; import static java.nio.charset.StandardCharsets.UTF_8; import static org.junit.jupiter.api.Assertions.assertArrayEquals; @@ -31,13 +31,13 @@ import com.google.gson.Gson; import com.google.gson.GsonBuilder; import gov.usgs.earthquake.nshmp.Maths; +import gov.usgs.earthquake.nshmp.Text; import gov.usgs.earthquake.nshmp.calc.CalcConfig; import gov.usgs.earthquake.nshmp.calc.Hazard; import gov.usgs.earthquake.nshmp.calc.HazardCalcs; import gov.usgs.earthquake.nshmp.calc.Site; import gov.usgs.earthquake.nshmp.calc.Sites; import gov.usgs.earthquake.nshmp.gmm.Imt; -import gov.usgs.earthquake.nshmp.internal.Parsing; import gov.usgs.earthquake.nshmp.model.HazardModel; class PeerTest { @@ -164,7 +164,7 @@ class PeerTest { for (String line : Iterables.skip(lines, 1)) { String[] splitLine = line.split(",", 4); String siteName = splitLine[0]; - List<Double> values = Parsing.splitToDoubleList(splitLine[3], COMMA); + List<Double> values = Text.splitToDoubleList(splitLine[3], COMMA); siteValuesMap.put(siteName, Doubles.toArray(values)); } return siteValuesMap;