From 72b5563335ab6566416f9ecf1ea0f75a73f76aed Mon Sep 17 00:00:00 2001 From: Alex Cramer Date: Sun, 20 Apr 2025 13:31:14 -0400 Subject: [PATCH 1/2] Update our netcdf versions (and various others) --- app/build.gradle.kts | 2 +- app/src/config/reflect-config.json | 345 +----------------- app/src/config/resource-config.json | 81 +--- .../netcdf/cli/json/BindingMaker.java | 109 +++--- .../stellarsunset/netcdf/cli/json/Json.java | 10 +- .../netcdf/cli/json/SafeGenerator.java | 109 ++++++ gradle/libs.versions.toml | 2 +- gradle/wrapper/gradle-wrapper.jar | Bin 43453 -> 43583 bytes gradle/wrapper/gradle-wrapper.properties | 2 +- gradlew | 6 +- gradlew.bat | 2 + justfile | 25 +- 12 files changed, 228 insertions(+), 465 deletions(-) create mode 100644 app/src/main/java/com/stellarsunset/netcdf/cli/json/SafeGenerator.java diff --git a/app/build.gradle.kts b/app/build.gradle.kts index 09c78b3..ed9e688 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -47,7 +47,7 @@ graalvmNative { imageName = "netcdf" javaLauncher = javaToolchains.launcherFor { - languageVersion = JavaLanguageVersion.of(21) + languageVersion = JavaLanguageVersion.of(23) } resources.autodetect() diff --git a/app/src/config/reflect-config.json b/app/src/config/reflect-config.json index ba445f1..1dbc384 100644 --- a/app/src/config/reflect-config.json +++ b/app/src/config/reflect-config.json @@ -1,24 +1,10 @@ [ { - "name": "[Ljava.lang.Object;" - }, - { - "name": "[Ljava.util.HashMap;" + "name": "[Ljava.lang.String;" }, { "name": "[Lorg.jdom2.Content;" }, - { - "name": "com.fasterxml.jackson.databind.ext.Java7SupportImpl", - "methods": [ - { - "name": "", - "parameterTypes": [ - - ] - } - ] - }, { "name": "com.google.protobuf.ExtensionRegistry", "methods": [ @@ -31,250 +17,44 @@ ] }, { - "allDeclaredClasses": true, - "queryAllDeclaredConstructors": true, + "name": "com.sun.org.apache.xerces.internal.jaxp.SAXParserFactoryImpl", "methods": [ { "name": "", "parameterTypes": [ - ] - }, - { - "name": "testRead", - "parameterTypes": [ - ] } - ], - "name": "com.stellarsunset.netcdf.cli.BufrTest", - "queryAllDeclaredMethods": true, - "allDeclaredFields": true, - "queryAllPublicMethods": true + ] }, { - "allDeclaredClasses": true, - "queryAllDeclaredConstructors": true, - "methods": [ - { - "name": "", - "parameterTypes": [ - - ] - }, - { - "name": "testRead", - "parameterTypes": [ - - ] - } - ], - "name": "com.stellarsunset.netcdf.cli.Grib1Test", - "queryAllDeclaredMethods": true, - "allDeclaredFields": true, - "queryAllPublicMethods": true + "name": "groovy.lang.Closure" }, { - "allDeclaredClasses": true, - "queryAllDeclaredConstructors": true, - "methods": [ - { - "name": "", - "parameterTypes": [ - - ] - }, - { - "name": "testRead", - "parameterTypes": [ - - ] - } - ], - "name": "com.stellarsunset.netcdf.cli.Grib2Test", - "queryAllDeclaredMethods": true, - "allDeclaredFields": true, - "queryAllPublicMethods": true + "name": "libcore.io.Memory" }, { - "name": "com.stellarsunset.netcdf.cli.Nc3FileWriter", - "allDeclaredClasses": true, + "name": "org.example.Netcdf", "queryAllDeclaredMethods": true, - "queryAllPublicMethods": true + "allDeclaredFields": true }, { - "allDeclaredClasses": true, - "queryAllDeclaredConstructors": true, - "methods": [ - { - "name": "", - "parameterTypes": [ - - ] - }, - { - "name": "setup", - "parameterTypes": [ - "java.nio.file.Path" - ] - }, - { - "name": "testRead", - "parameterTypes": [ - - ] - } - ], - "name": "com.stellarsunset.netcdf.cli.Nc3Test", + "name": "org.example.info.Info", "queryAllDeclaredMethods": true, - "allDeclaredFields": true, - "queryAllPublicMethods": true + "allDeclaredFields": true }, { - "allDeclaredClasses": true, - "queryAllDeclaredConstructors": true, - "methods": [ - { - "name": "", - "parameterTypes": [ - - ] - }, - { - "name": "testRead", - "parameterTypes": [ - - ] - } - ], - "name": "com.stellarsunset.netcdf.cli.ZarrTest", - "queryAllDeclaredMethods": true, - "allDeclaredFields": true, - "queryAllPublicMethods": true - }, - { - "allDeclaredClasses": true, - "queryAllDeclaredConstructors": true, - "methods": [ - { - "name": "", - "parameterTypes": [ - - ] - }, - { - "name": "testParseBinding", - "parameterTypes": [ - - ] - } - ], - "name": "com.stellarsunset.netcdf.cli.json.JsonTest", + "name": "org.example.json.Json", "queryAllDeclaredMethods": true, - "allDeclaredFields": true, - "queryAllPublicMethods": true + "allDeclaredFields": true }, { - "name": "com.sun.org.apache.xerces.internal.jaxp.SAXParserFactoryImpl", - "methods": [ - { - "name": "", - "parameterTypes": [ - - ] - } - ] - }, - { - "name": "java.lang.Enum" + "name": "org.robolectric.Robolectric" }, { - "name": "java.lang.Record", - "allDeclaredClasses": true, + "name": "picocli.CommandLine$HelpCommand", "queryAllDeclaredMethods": true, - "queryAllPublicMethods": true - }, - { - "name": "java.lang.Thread", - "fields": [ - { - "name": "threadLocalRandomProbe" - } - ] - }, - { - "name": "java.lang.invoke.MethodHandle" - }, - { - "name": "java.nio.Buffer", - "fields": [ - { - "name": "address" - } - ] - }, - { - "name": "java.security.SecureRandomParameters" - }, - { - "name": "java.util.HashSet" - }, - { - "name": "java.util.LinkedHashSet" - }, - { - "name": "java.util.concurrent.ArrayBlockingQueue" - }, - { - "name": "java.util.concurrent.atomic.AtomicBoolean", - "fields": [ - { - "name": "value" - } - ] - }, - { - "name": "java.util.concurrent.atomic.AtomicReference", - "fields": [ - { - "name": "value" - } - ] - }, - { - "name": "java.util.concurrent.atomic.Striped64", - "fields": [ - { - "name": "base" - }, - { - "name": "cellsBusy" - } - ] - }, - { - "name": "java.util.concurrent.locks.AbstractOwnableSynchronizer" - }, - { - "name": "java.util.concurrent.locks.AbstractQueuedSynchronizer" - }, - { - "name": "java.util.concurrent.locks.AbstractQueuedSynchronizer$ConditionObject" - }, - { - "name": "java.util.concurrent.locks.ReentrantLock" - }, - { - "name": "java.util.concurrent.locks.ReentrantLock$NonfairSync" - }, - { - "name": "java.util.concurrent.locks.ReentrantLock$Sync" - }, - { - "name": "libcore.io.Memory" - }, - { - "name": "org.robolectric.Robolectric" + "allDeclaredFields": true }, { "name": "sun.misc.Unsafe", @@ -283,13 +63,13 @@ { "name": "arrayBaseOffset", "parameterTypes": [ - "java.lang.Class" + ] }, { "name": "arrayIndexScale", "parameterTypes": [ - "java.lang.Class" + ] }, { @@ -303,9 +83,7 @@ { "name": "copyMemory", "parameterTypes": [ - "java.lang.Object", "long", - "java.lang.Object", "long", "long" ] @@ -313,7 +91,6 @@ { "name": "getBoolean", "parameterTypes": [ - "java.lang.Object", "long" ] }, @@ -326,21 +103,18 @@ { "name": "getByte", "parameterTypes": [ - "java.lang.Object", "long" ] }, { "name": "getDouble", "parameterTypes": [ - "java.lang.Object", "long" ] }, { "name": "getFloat", "parameterTypes": [ - "java.lang.Object", "long" ] }, @@ -353,7 +127,6 @@ { "name": "getInt", "parameterTypes": [ - "java.lang.Object", "long" ] }, @@ -366,27 +139,24 @@ { "name": "getLong", "parameterTypes": [ - "java.lang.Object", "long" ] }, { "name": "getObject", "parameterTypes": [ - "java.lang.Object", "long" ] }, { "name": "objectFieldOffset", "parameterTypes": [ - "java.lang.reflect.Field" + ] }, { "name": "putBoolean", "parameterTypes": [ - "java.lang.Object", "long", "boolean" ] @@ -401,7 +171,6 @@ { "name": "putByte", "parameterTypes": [ - "java.lang.Object", "long", "byte" ] @@ -409,7 +178,6 @@ { "name": "putDouble", "parameterTypes": [ - "java.lang.Object", "long", "double" ] @@ -417,7 +185,6 @@ { "name": "putFloat", "parameterTypes": [ - "java.lang.Object", "long", "float" ] @@ -432,7 +199,6 @@ { "name": "putInt", "parameterTypes": [ - "java.lang.Object", "long", "int" ] @@ -447,7 +213,6 @@ { "name": "putLong", "parameterTypes": [ - "java.lang.Object", "long", "long" ] @@ -455,48 +220,7 @@ { "name": "putObject", "parameterTypes": [ - "java.lang.Object", - "long", - "java.lang.Object" - ] - } - ] - }, - { - "name": "sun.security.provider.NativePRNG", - "methods": [ - { - "name": "", - "parameterTypes": [ - - ] - }, - { - "name": "", - "parameterTypes": [ - "java.security.SecureRandomParameters" - ] - } - ] - }, - { - "name": "sun.security.provider.SHA", - "methods": [ - { - "name": "", - "parameterTypes": [ - - ] - } - ] - }, - { - "name": "ucar.nc2.grib.collection.Grib1Iosp", - "methods": [ - { - "name": "", - "parameterTypes": [ - + "long" ] } ] @@ -534,17 +258,6 @@ } ] }, - { - "name": "ucar.nc2.iosp.bufr.BufrIosp2", - "methods": [ - { - "name": "", - "parameterTypes": [ - - ] - } - ] - }, { "name": "ucar.nc2.iosp.hdf4.H4iosp", "methods": [ @@ -556,28 +269,6 @@ } ] }, - { - "name": "ucar.nc2.iosp.zarr.ZArray$ZArrayDeserializer", - "methods": [ - { - "name": "", - "parameterTypes": [ - - ] - } - ] - }, - { - "name": "ucar.nc2.iosp.zarr.ZarrIosp", - "methods": [ - { - "name": "", - "parameterTypes": [ - - ] - } - ] - }, { "name": "ucar.nc2.stream.NcStreamIosp", "methods": [ diff --git a/app/src/config/resource-config.json b/app/src/config/resource-config.json index 3b47f0e..ce609ea 100644 --- a/app/src/config/resource-config.json +++ b/app/src/config/resource-config.json @@ -4,116 +4,74 @@ { "pattern": "\\QMETA-INF/services/java.lang.System$LoggerFinder\\E" }, - { - "pattern": "\\QMETA-INF/services/java.nio.channels.spi.SelectorProvider\\E" - }, { "pattern": "\\QMETA-INF/services/javax.xml.parsers.SAXParserFactory\\E" }, - { - "pattern": "\\QMETA-INF/services/org.junit.platform.engine.TestEngine\\E" - }, - { - "pattern": "\\QMETA-INF/services/org.junit.platform.launcher.LauncherDiscoveryListener\\E" - }, - { - "pattern": "\\QMETA-INF/services/org.junit.platform.launcher.LauncherSessionListener\\E" - }, - { - "pattern": "\\QMETA-INF/services/org.junit.platform.launcher.PostDiscoveryFilter\\E" - }, - { - "pattern": "\\QMETA-INF/services/org.junit.platform.launcher.TestExecutionListener\\E" - }, { "pattern": "\\QMETA-INF/services/org.slf4j.spi.SLF4JServiceProvider\\E" }, - { - "pattern": "\\QMETA-INF/services/thredds.inventory.MControllerProvider\\E" - }, - { - "pattern": "\\QMETA-INF/services/thredds.inventory.MFileProvider\\E" - }, { "pattern": "\\QMETA-INF/services/ucar.nc2.iosp.IOServiceProvider\\E" }, { "pattern": "\\QMETA-INF/services/ucar.unidata.io.spi.RandomAccessFileProvider\\E" }, - { - "pattern": "\\Qjunit-platform.properties\\E" - }, - { - "pattern": "\\Qorg/joda/time/tz/data/America/New_York\\E" - }, - { - "pattern": "\\Qorg/joda/time/tz/data/ZoneInfoMap\\E" - }, { "pattern": "\\Qorg/slf4j/impl/StaticLoggerBinder.class\\E" }, { - "pattern": "\\Qresources/bufrTables/local/tablelookup.csv\\E" - }, - { - "pattern": "\\Qresources/bufrTables/wmo/BUFRCREX_32_0_0_CodeFlag_en.xml\\E" - }, - { - "pattern": "\\Qresources/bufrTables/wmo/BUFRCREX_32_0_0_TableB_en.xml\\E" - }, - { - "pattern": "\\Qresources/bufrTables/wmo/BUFR_32_0_0_TableA_en.xml\\E" + "pattern": "\\Qresources/grib1/ncep/ncepTableA.xml\\E" }, { - "pattern": "\\Qresources/bufrTables/wmo/BUFR_32_0_0_TableD_en.xml\\E" + "pattern": "\\Qresources/grib2/ncep/v23.0.0/Table4.2.0.0.xml\\E" }, { - "pattern": "\\Qresources/grib1/dss/WMO_GRIB1.xml\\E" + "pattern": "\\Qresources/grib2/ncep/v23.0.0/Table4.2.0.1.xml\\E" }, { - "pattern": "\\Qresources/grib1/dss/lookupTables.txt\\E" + "pattern": "\\Qresources/grib2/ncep/v23.0.0/Table4.2.0.15.xml\\E" }, { - "pattern": "\\Qresources/grib1/ecmwf/lookupTables.txt\\E" + "pattern": "\\Qresources/grib2/ncep/v23.0.0/Table4.2.0.16.xml\\E" }, { - "pattern": "\\Qresources/grib1/ecmwfEcCodes/lookupTables.txt\\E" + "pattern": "\\Qresources/grib2/ncep/v23.0.0/Table4.2.0.17.xml\\E" }, { - "pattern": "\\Qresources/grib1/lookupTables.txt\\E" + "pattern": "\\Qresources/grib2/ncep/v23.0.0/Table4.2.0.19.xml\\E" }, { - "pattern": "\\Qresources/grib1/ncep/ncepGrib1-2.xml\\E" + "pattern": "\\Qresources/grib2/ncep/v23.0.0/Table4.2.0.2.xml\\E" }, { - "pattern": "\\Qresources/grib1/ncep/ncepTableA.xml\\E" + "pattern": "\\Qresources/grib2/ncep/v23.0.0/Table4.2.0.20.xml\\E" }, { - "pattern": "\\Qresources/grib1/ncl/lookupTables.txt\\E" + "pattern": "\\Qresources/grib2/ncep/v23.0.0/Table4.2.0.3.xml\\E" }, { - "pattern": "\\Qresources/grib1/wmoTable3.xml\\E" + "pattern": "\\Qresources/grib2/ncep/v23.0.0/Table4.2.0.4.xml\\E" }, { - "pattern": "\\Qresources/grib1/wrf/lookupTables.txt\\E" + "pattern": "\\Qresources/grib2/ncep/v23.0.0/Table4.2.0.5.xml\\E" }, { - "pattern": "\\Qresources/grib2/ecmwf/localConcepts/ecmf/cfName.def\\E" + "pattern": "\\Qresources/grib2/ncep/v23.0.0/Table4.2.0.6.xml\\E" }, { - "pattern": "\\Qresources/grib2/ecmwf/localConcepts/ecmf/cfVarName.def\\E" + "pattern": "\\Qresources/grib2/ncep/v23.0.0/Table4.2.0.7.xml\\E" }, { - "pattern": "\\Qresources/grib2/ecmwf/localConcepts/ecmf/name.def\\E" + "pattern": "\\Qresources/grib2/ncep/v23.0.0/Table4.2.1.0.xml\\E" }, { - "pattern": "\\Qresources/grib2/ecmwf/localConcepts/ecmf/paramId.def\\E" + "pattern": "\\Qresources/grib2/ncep/v23.0.0/Table4.2.10.2.xml\\E" }, { - "pattern": "\\Qresources/grib2/ecmwf/localConcepts/ecmf/shortName.def\\E" + "pattern": "\\Qresources/grib2/ncep/v23.0.0/Table4.2.2.0.xml\\E" }, { - "pattern": "\\Qresources/grib2/ecmwf/localConcepts/ecmf/units.def\\E" + "pattern": "\\Qresources/grib2/ncep/v23.0.0/Table4.2.3.192.xml\\E" }, { "pattern": "\\Qresources/grib2/standardTableMap.txt\\E" @@ -126,9 +84,6 @@ }, { "pattern": "\\Qresources/wmo/Common_C12_20181107_en.xml\\E" - }, - { - "pattern": "\\Qresources/wmo/Common_C13_20181107_en.xml\\E" } ] }, diff --git a/app/src/main/java/com/stellarsunset/netcdf/cli/json/BindingMaker.java b/app/src/main/java/com/stellarsunset/netcdf/cli/json/BindingMaker.java index aee8a1d..ce631ec 100644 --- a/app/src/main/java/com/stellarsunset/netcdf/cli/json/BindingMaker.java +++ b/app/src/main/java/com/stellarsunset/netcdf/cli/json/BindingMaker.java @@ -1,15 +1,12 @@ package com.stellarsunset.netcdf.cli.json; -import com.fasterxml.jackson.core.JsonGenerator; -import com.stellarsunset.netcdf.SchemaBinding; import com.stellarsunset.netcdf.cli.json.JsonBinding.AliasedVariable; -import com.stellarsunset.netcdf.field.FieldSetter; +import io.github.stellarsunset.netcdf.FieldBinding; +import io.github.stellarsunset.netcdf.SchemaBinding; import ucar.ma2.DataType; import ucar.nc2.NetcdfFile; import ucar.nc2.Variable; -import java.io.IOException; - final class BindingMaker { private BindingMaker() { @@ -18,9 +15,9 @@ private BindingMaker() { /** * Uses the target {@link NetcdfFile} to convert the incoming {@link JsonBinding} into a full {@link SchemaBinding}. */ - static SchemaBinding createBindingFor(NetcdfFile file, JsonBinding binding, JsonGenerator generator) { + static SchemaBinding createBindingFor(NetcdfFile file, JsonBinding binding, SafeGenerator generator) { - SchemaBinding.Builder builder = SchemaBinding.builder(); + SchemaBinding.Builder builder = SchemaBinding.builder(); for (AliasedVariable dimensionVariable : binding.dimensionVariables()) { @@ -48,60 +45,58 @@ static SchemaBinding createBindingFor(NetcdfFile file, JsonBindin } return builder - .recordInitializer(() -> { - try { - generator.writeStartObject(); - return generator; - } catch (IOException e) { - throw new RuntimeException(e); - } - }) - .recordFinalizer(g -> { - try { - g.writeEndObject(); - g.writeRaw(System.lineSeparator()); - } catch (IOException e) { - throw new RuntimeException(e); - } - }) + .recordInitializer(generator::writeStartObject) + .recordFinalizer(g -> g.writeEndObject().writeRaw(System.lineSeparator())) .build(); } - private static FieldSetter jsonSetter(String fieldName, DataType type) { + private static FieldBinding jsonSetter(String fieldName, DataType type) { return switch (type) { - case DOUBLE -> FieldSetter.doubles((s, d) -> { - s.writeNumberField(fieldName, d); - return s; - }); - case FLOAT -> FieldSetter.floats((s, f) -> { - s.writeNumberField(fieldName, f); - return s; - }); - case CHAR -> FieldSetter.characters((s, c) -> { - s.writeStringField(fieldName, Character.toString(c)); - return s; - }); - case BOOLEAN -> FieldSetter.booleans((s, b) -> { - s.writeBooleanField(fieldName, b); - return s; - }); - case ENUM4, UINT, INT -> FieldSetter.ints((s, i) -> { - s.writeNumberField(fieldName, i); - return s; - }); - case ENUM2, USHORT, SHORT -> FieldSetter.shorts((s, h) -> { - s.writeNumberField(fieldName, h); - return s; - }); - case ENUM1, UBYTE, BYTE -> FieldSetter.bytes((s, b) -> { - s.writeBinaryField(fieldName, new byte[]{b}); - return s; - }); - case ULONG, LONG -> FieldSetter.longs((s, l) -> { - s.writeNumberField(fieldName, l); - return s; - }); - case STRING, STRUCTURE, SEQUENCE, OPAQUE, OBJECT -> FieldSetter.noop(); + case DOUBLE -> doubles((s, d) -> s.writeDouble(fieldName, d)); + case FLOAT -> floats((s, f) -> s.writeFloat(fieldName, f)); + case CHAR -> chars((s, c) -> s.writeChar(fieldName, c)); + case BOOLEAN -> bools((s, b) -> s.writeBool(fieldName, b)); + case UINT -> ints((s, b) -> s.writeLong(fieldName, Integer.toUnsignedLong(b))); // no unsigned types + case ENUM4, INT -> ints((s, b) -> s.writeInt(fieldName, b)); + case USHORT -> shorts((s, b) -> s.writeInt(fieldName, Short.toUnsignedInt(b))); // no unsigned + case ENUM2, SHORT -> shorts((s, b) -> s.writeShort(fieldName, b)); + case UBYTE -> bytes((s, b) -> s.writeInt(fieldName, Short.toUnsignedInt(b))); + case ENUM1, BYTE -> bytes((s, b) -> s.writeShort(fieldName, (short) b)); // no byte type - upcast to short + case LONG -> longs((s, l) -> s.writeLong(fieldName, l)); + case ULONG, STRING, STRUCTURE, SEQUENCE, OPAQUE, OBJECT -> + throw new IllegalArgumentException(String.format("Unhandled Json binding for NetCDF primitive type: %s", type)); }; } + + private static FieldBinding doubles(FieldBinding.Double doubles) { + return doubles; + } + + private static FieldBinding floats(FieldBinding.Float floats) { + return floats; + } + + private static FieldBinding chars(FieldBinding.Char chars) { + return chars; + } + + private static FieldBinding bools(FieldBinding.Bool bools) { + return bools; + } + + private static FieldBinding ints(FieldBinding.Int ints) { + return ints; + } + + private static FieldBinding shorts(FieldBinding.Short shorts) { + return shorts; + } + + private static FieldBinding bytes(FieldBinding.Byte bytes) { + return bytes; + } + + private static FieldBinding longs(FieldBinding.Long longs) { + return longs; + } } diff --git a/app/src/main/java/com/stellarsunset/netcdf/cli/json/Json.java b/app/src/main/java/com/stellarsunset/netcdf/cli/json/Json.java index fa0afdb..5c6c0db 100644 --- a/app/src/main/java/com/stellarsunset/netcdf/cli/json/Json.java +++ b/app/src/main/java/com/stellarsunset/netcdf/cli/json/Json.java @@ -2,8 +2,8 @@ import com.fasterxml.jackson.core.JsonFactory; import com.fasterxml.jackson.core.JsonGenerator; -import com.stellarsunset.netcdf.NetcdfRecordReader; -import com.stellarsunset.netcdf.SchemaBinding; +import io.github.stellarsunset.netcdf.NetcdfRecordReader; +import io.github.stellarsunset.netcdf.SchemaBinding; import picocli.CommandLine.Command; import picocli.CommandLine.Option; import picocli.CommandLine.Parameters; @@ -11,8 +11,6 @@ import ucar.nc2.NetcdfFiles; import java.io.File; -import java.io.OutputStreamWriter; -import java.io.Writer; import java.util.concurrent.Callable; @Command( @@ -44,9 +42,9 @@ public final class Json implements Callable { @Override public Integer call() throws Exception { try (NetcdfFile netcdfFile = NetcdfFiles.open(file.getAbsolutePath()); - JsonGenerator generator = FACTORY.createGenerator(System.out)) { + SafeGenerator generator = new SafeGenerator(FACTORY.createGenerator(System.out))) { - SchemaBinding binding = BindingMaker.createBindingFor( + SchemaBinding binding = BindingMaker.createBindingFor( netcdfFile, parseBinding(dimensionVariables, coordinateVariables), generator diff --git a/app/src/main/java/com/stellarsunset/netcdf/cli/json/SafeGenerator.java b/app/src/main/java/com/stellarsunset/netcdf/cli/json/SafeGenerator.java new file mode 100644 index 0000000..127c4c8 --- /dev/null +++ b/app/src/main/java/com/stellarsunset/netcdf/cli/json/SafeGenerator.java @@ -0,0 +1,109 @@ +package com.stellarsunset.netcdf.cli.json; + +import com.fasterxml.jackson.core.JsonGenerator; + +import java.io.IOException; + +record SafeGenerator(JsonGenerator delegate) implements AutoCloseable { + + SafeGenerator writeStartObject() { + try { + this.delegate.writeStartObject(); + return this; + } catch (IOException e) { + throw new UnableToWriteJsonFieldException("start_object", e); + } + } + + SafeGenerator writeDouble(String name, double value) { + try { + this.delegate.writeNumberField(name, value); + return this; + } catch (IOException e) { + throw new UnableToWriteJsonFieldException(name, e); + } + } + + SafeGenerator writeFloat(String name, float value) { + try { + this.delegate.writeNumberField(name, value); + return this; + } catch (IOException e) { + throw new UnableToWriteJsonFieldException(name, e); + } + } + + SafeGenerator writeChar(String name, char value) { + try { + this.delegate.writeStringField(name, Character.toString(value)); + return this; + } catch (IOException e) { + throw new UnableToWriteJsonFieldException(name, e); + } + } + + SafeGenerator writeBool(String name, boolean value) { + try { + this.delegate.writeBooleanField(name, value); + return this; + } catch (IOException e) { + throw new UnableToWriteJsonFieldException(name, e); + } + } + + SafeGenerator writeInt(String name, int value) { + try { + this.delegate.writeNumberField(name, value); + return this; + } catch (IOException e) { + throw new UnableToWriteJsonFieldException(name, e); + } + } + + SafeGenerator writeShort(String name, short value) { + try { + this.delegate.writeNumberField(name, value); + return this; + } catch (IOException e) { + throw new UnableToWriteJsonFieldException(name, e); + } + } + + SafeGenerator writeLong(String name, long value) { + try { + this.delegate.writeNumberField(name, value); + return this; + } catch (IOException e) { + throw new UnableToWriteJsonFieldException(name, e); + } + } + + SafeGenerator writeEndObject() { + try { + this.delegate.writeEndObject(); + return this; + } catch (IOException e) { + throw new UnableToWriteJsonFieldException("end_object", e); + } + } + + SafeGenerator writeRaw(String text) { + try { + this.delegate.writeRaw(text); + return this; + } catch (IOException e) { + throw new UnableToWriteJsonFieldException("raw_content", e); + } + } + + @Override + public void close() throws Exception { + this.delegate.close(); + } + + static final class UnableToWriteJsonFieldException extends RuntimeException { + public UnableToWriteJsonFieldException(String field, Throwable throwable) { + super(String.format("Unable to write Json content for field: %s", field), throwable); + } + } +} diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 14f89b6..e7f07ff 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -9,7 +9,7 @@ junit-jupiter = "5.10.1" picocli = { module = "info.picocli:picocli", version.ref = "picocli" } picocli-gen = { module = "info.picocli:picocli-codegen", version.ref = "picocli" } -netcdf = { module = "io.github.stellarsunset:netcdf", version = "0.0.3" } +netcdf = { module = "io.github.stellarsunset:netcdf", version = "1.0.0" } # Runtime dependencies supporting specific file formats bufr = { module = "edu.ucar:bufr", version.ref = "netcdf" } grib = { module = "edu.ucar:grib", version.ref = "netcdf" } diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index e6441136f3d4ba8a0da8d277868979cfbc8ad796..a4b76b9530d66f5e68d973ea569d8e19de379189 100644 GIT binary patch delta 12612 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 HJ4oML2Lo<@i8BwbL^1~GkG`E7C$SEa_ zF^}Ea+#Je`Xy6;#D0FPnSrR%Y!QGA~NA^{oWmW8C<3dr{x6wWQ{4+bzemqV5W$i5~ z=J0jXZ>uZb>DT@0Ks?4QJ{`z?8JWl3$y;2pj#$XP*pv$>$g(z43{YH9KmmR6<#sIn zA`#=0#sgycaBQ^&}Xba!|KaZ8~b30v~nLt z9%#gz_*=~KD{3t^X~l>480*}PhKN=??g`RV|4Ud{Gyyl187MJ}r(#e+H$GEdI+p1s zq_25h;fV)$EPK%Dw-(G=f`yHB-_tttsC!?k7*#!|4a>`Ahj8nm?&n>NRs%jkZW^3-0P_yMP5&*6a26{MRj1&TPF zyE#|c)5uUHzMWx=rMKpuPih*V=S;W3MzIZTw2uTbr}8`p2bm+Z6Sa%vvWAWSf4H)p(+ zSQ8;EvUa#wqWV+9vmIio(%7wukK2SwjUS8Yl%Rq%=~PU)2$Tvm6`1!r3H@U#_|bB0 zmlT1PS3wPB(b&^+@YY7Y$n4l3mV3-X0$>z|gZp6O*Lhzn&?Gad2ZCF;+#95-Y?#y+ z?*l@Yf=a4w{Px=o!N|3~_XKfk&G;fN>Ps&dp2FpA~qD=0~=!NOS@B#XAKKkND>Y{4>rqxrViKD7;?>j8`R` z&G)3FN|dfsxnaI^!d1G%=>AbTTxZWo;n-DLrQ!sj=f~VAOe5zhGS(dgx|!ls62fbX zV@<7Ck^!}R=`Swr?(7w1rY6Nmq~sfXJ?TiKJLn=&SQdEt9$@0 zA+h1Wbwbri0s-stc8yVq;mRa6@kEf8^KXUz&jcic!+avDvvJFa>k0ioWug=T3oPw; zyj4it&0@>_*uI@2=^+T7sL1_!^aJW@Xfo8aC#3^WtQC7fET8b9C} z*u^ue6Ojn z7@(eskJ2+cNnH9~VyfIh<-|7!je~vGy*odz(sk-u$~SrYF3glruZ*W`{sqnS+9=;Z zh{D@MSG91%lr&ua8%$sJF%y1I<|e;EdfJykY8#D$Hc_81n5`$7;1N|b0tvvPLzSg& zn7!5x?T*@rQUKcUhTIjV(rw*5oQYlm5DbEO?60#mohHfbR$3_x#+PZoYi@Vd4`#YgKyTd^!4n{fN~WZDY61sAOm6 zl!d^i*a01QxpWM9Pcl?&{RgO}uq%ErOk5WpECvnfEh!*YP&1Sl)uTN4hg??Vqs~i5 zYsfufz3?{TtwuBN=`0~Qg1PlWH#OGG$ zLLWU17$v``)CE1cds_7kj8mJ{-+l8{DS|zAQ&3|qpOY=!J|kXUhXue9|H>4gqk|n) z-i34GmxLFj8asb3D#D&=ya*a5`C<=o?G;Ev^LV%;l#nH#O=7Nh@z1Do>j6Q;I5S2P zhg|AZbC&|c7}uSJt57s2IK#rSWuararn-02dkptTjo*R{c5o(bWV}_k3BBnKcE|6l zrHl&ezUyw^DmaMdDFVn<8ZY=7_{u{uW&*F<7Al6};lD(u;SB=RpIwI)PTyL=e25h* zGi{lRT}snjbMK~IUx|EGonH+w;iC2Ws)x>=5_{5$m?K z5(*1jMn%u0V1Y%m@`YS3kskt~`1p(rA4uk;Cs!w^KL$w>MH)+cP6|XKr4FfHIATJH z!EGAK4N>1yFR`-zW|w%ByRe#=&kA&#WyUldDGpt!wf-8SFWiSi!5QZL+l7*CE?u!NW1T$<1rdLJ9y3u{_zvHaM?#Rm4 zFk}^1!ffcrB|XK3gsO-s=wr*sUe&^$yN|KxrA)uW00Gu60%pw_+DcUjW`oW<35OC8 zq2{j8SgC}W$?10pvFU83(SL$%C?Kctu3*cs0aa%q!fjn1%xD*Jrm!F3HGR9-C{b?- zHp(cL;ezXMpL@0-1v0DMWddSDNZ5h?q50cOZyVi#bU3&PWE=(hpVn|M4_KYG5h9LffKNRsfhr^=SYiKg?#r&HNMi2@cd4aYL9lw(5_IvQJ zcB*DD()hUSAD^PdA0y|QrVnqwgI@pUXZXjHq3lG2OU&7sPOxxU$Y3&ytj6Qb=2#cC z;{d-{k|xI*bu+Vy&N+}{i(+1me!M;nshY_*&ZQLTGG*xNw#{RpI`3^eGfHck+*38NRgiGahkFethtVY=czJs#)VVc{T65rhU#3Vf?X)8f0)X{w!J3J{z|Sq|%?)nA+zo?$>L9@o`Kc|*7sJo4UjIqu0Ir~S5k^vEH};6K?-dZ0h*m%-1L zf!VC%YbM1~sZOG5zu&Sh>R;(md*_)kGHP)<;OA44W?y53PI%{&@MEN}9TOiqu+1a3AGetBr$c)Ao3OX>iGxmA;^^_alwS818r4Pn&uYe^;z6dh z)68T|AN=hjNdGpF7n>y+RTAZc9&opTXf zqWfK_dUv=mW{p_vN>|(cIkd(+Jy}qnK{IW%X*3!l`^H~FbAHwof+vLZ0C2ZXN1$v7 zgN&R9c8IO`fkR{6U%ERq8FN<1DQYbAN0-pH7EfcA{A&nhT!Be>jj>J!bNRw4NF|}! z1c70_#fkk!VQ!q1h2ff@`yDyrI1`np>*e#D4-Z~*!T^8#o*$V~!8bWQaie?P@KGBb z8rXc!YDL!$3ZgZZ%;-%~0Kn<+d+{xJ$stQbtN8GWV?MCJvzPU|(E(1z;rFw{&6vy) z3*@y%7Tx8rH-p$boS>bLyod?OKRE8v`QSBvGfY6f}_{Zo1q85xoyOF16n~yHx2W ziydUoYLkJmzq|n&2S(O!ZmLdP1(o1Jsq88cX)x3V-BK5eF&0e_0G!5?U7&3KN0`mc zH&Lt)q8!d_VgzxyL^(@xrbp2y)Hmr^V48));RSfE=*Ly0uh9!$3dv-vMZr2URf@l5zdwLjGZB zugY>7_fd_vbV*Qv1?H~>Z%RD%nEeFSI$n$$Lrpc6g>i4+XdBB!%zM$Bhrz5Swzyg? z$~I~n@~-wTBY3-T&pr+|gC+OHDoR?I(eLWa{Z#Rsh>lc~%u0!&R|s0pA*w<7QZ}{i z*AFr~0F3y~f$MGh_HDL7J_1?SxKL}fWIk!$G}`^{)xh*dZ5kK>xGL9>V`WZZg_ z)^Vm)EQK`yfh5KiR(vb&aHvhich z_5o+{d~0+4BEBqYJXyXBIEb1UgVDs;a!N2$9WA>CbfrWryqT25)S4E4)QXBd*3jN} z?phkAt`1rKW?xoLzEm!*IfkH|P>BtECVr0l8-IGk_`UjE#IWkUGqvyS+dMrCnFl<7RCgSMX^qn|Ld_4iYRldO zY&cHhv)GDo8nKvKwAbfyLR%t?9gG?R7~PSD#4D-;?F&!kV59O}neYut5AGbKwy-(U zqyBi=&Mgj|VIo>$u!DHM`R7O?W8-idbePuxiJMH``6c_5L-chKd}=rGC5Gfrc{f!* zWFEBm?l@_b7kzY7%1RQQbG5V<4=ZlkZ%sF74Q|mKOc7Ak7dP2#quiGcZ0_J%7Q?j{ zv9{WFw;n5G-Mn%r#0R;{jLt{yy}9J6rQ(>X9pJ`7Xy?Zv z=lNit#qXaq?CnElK^zF~sG}U5oCpR0T>FH=ZX}Prju$);?;VOhFH8L3I><9P_A|C+ z{;>~dk%9rrq(snjsEm}oUz2FQ21MCG*e?g)?{!&|eg7PX@I+Q0!hL6C7ZVY|g2E>i zr!Ri2@OfEu$)d52+>+cpgh6Z;cLYCZ&EMR0i<^~4&wEu_bdo;y^6}+U2GIQgW$|Od z_jg{O=pU>0-H$P-EOlWyQy#W0r@@_uT}Lg+!d5NxMii7aT1=|qm6BRaWOf{Pws54v zTu=}LR!V(JzI07>QR;;px0+zq=(s+XH-0~rVbmGp8<)7G+Jf)UYs<$Dd>-K+4}CsD zS}KYLmkbRvjwBO3PB%2@j(vOpm)!JABH_E7X^f#V-bzifSaKtE)|QrczC1$sC<<*Y z$hY*3E10fYk`2W09gM_U<2>+r^+ro$Bqh-O7uSa)cfPE_<#^O) zF+5V;-8LaCLKdIh3UB@idQZL`0Vx8`OE#6*1<;8(zi&E7MWB1S%~HAm%axyIHN2vd zA(pJGm_PraB0Aat3~?obWBs?iSc*NhM!{-l_WNCx4@F7I?)5&oI|z{o@JKd1HZ}zf*#}JjK3$ z-;3V*WJZvUcKvSOBH4c7C{fl8oRw8-vfgKQjNiR|KhQ%k6hWNEke(k8w-Ro| z7Y3)FsY-?7%;VT64vRM)l0%&HI~BXkSAOV#F3Bf#|3QLZM%6C{paqLTb3MU-_)`{R zRdfVQ)uX90VCa3ja$8m;cdtxQ*(tNjIfVb%#TCJWeH?o4RY#LWpyZBJHR| z6G-!4W5O^Z8U}e5GfZ!_M{B``ve{r0Z#CXV0x@~X#Pc;}{{ClY_uw^=wWurj0RKnoFzeY` z;gS!PCLCo*c}-hLc?C&wv&>P1hH75=p#;D3{Q8UZ0ctX!b)_@Ur=WCMEuz>pTs$@s z#7bIutL9Pm2FDb~d+H}uBI#pu6R}T{nzpz9U0XLb9lu@=9bTY&PEyFwhHHtXFX~6C zrcg|qqTk(|MIM%KQ<@j=DOjt|V)+8K26wE_CBNnZTg+Z+s}AU|jp6CFoIptG1{J*# z7Ne~l;ba*=bSwAMQ|Vq#fW~+je4PXA91YFzBubNF?ovIOw-$C-8=Ehed{lGD0}(Id zRe4sh8L>&T%{>8o))he}eE;5_ zxoXk3wX?MyNl-xF!q1d$G?=wp^`@09(jU&X zOqZIBI#dN`2PJNdATR3ivtub|nO$dulSaP|e4)WXF1YAGN1pDQIbIjXFG!oC85Mt; zW$eteoL{y^5t4TMRwP$jNPjZFpGsWnGe=jMMqKtcZm9Y9PFZLi*1p@qoKKub^T@2+ zk$@*KYdQ?Z`}<%4ALwk*Yc{(WTf@#u;as(fvE^9{Gk)lWbJP*SjttWofV0s?AB({~l zZI1hZVWFT~W-T?nfMMcnCS4-#6H-MU7H$KxD;yaM46K4Kc@~Q>xzB+QnD_I`b_l3m zo9pRx46b!p?a^&zCDwygqqV3epjs(s0NQI6ARA1n!Yy-qduipxQ& zUAlqRpNjBS+y-ZheD(!R;F}&^V_}b_gqH%tVZ5%%ziO7k^w=es+wZtK^i*vmrWNLMs{oWu_CIov|s1raZiS)>38>pYu;i+-t zI_DiNe6aA4KTZ2P09qPj(0~K4nUq^0+f(2$g`229zkG4jLzRvJUWE0oF1XHL4t3UN zDH466G56sy9hTZoAJB!C3;@F;ONxEk5u6Mv%zdo}Rq`=* zw1n7MOhfNSV48TS989ArIcj`C%Gk8~93~u>)!Yt2b4ZriKj9x2d`H2HQNJ=I>hkDlcZn zqRj>!;oRMTIOu zx|Zfsu~v76T{z7AC(jxj^c@tnJHZtGPsq$DE!8kqvkDx5W?KUJPL+!Ffpwfa+|5z5 zKPCiOPqZZrAG;2%OH0T$W|`C@C*!Z`@Wkop{CTjB&Tk`+{XPnt`ND`Haz;xV`H^RS zyXYtw@WlqTvToi;=mq1<-|IQ(gcOpU%)b#_46|IuWL#4$oYLbqwuk6=Q@xZaJSKVF zZcHs~ZBl;&lF3=+nK; zF`4gSCeZXlwmC_t4I`#PUNQ*)Uv&oGxMALip|sxv^lyVV73tKI7)+QY5=tEMas{vTD-BaTJ^*Y6gq~PU;F5X!sxqiq$iFCo+Uv7m%1w((=e}Vf*=dtds|6 zbX}91!G?C*KG03eHoN}RZS9DJxa&8YwNCT8?JxMXyZqZr13NA|GB{+vG`08C{V(yy zf*Lw$+tYSU_+dI`3n{bMrPdDb`A=Mkg!O=k>1|*3MC8j~- zXL79J4E=U^H=iBLTeHE_OKzE&dws8RNynsSJ!d;`zK?P92U{f)xvD7VQVosrXZrL+ z6lMVdD1YgL;%(1cq{#bS6yXmp|DS@nax#AqqlZhtUQdh<^2vr5`EpAO

LGYq)sa(w9^3-f}NHy=GR4v%t2YZly3m1G@5y`xBh_HGrD%f z>;|Ty?9FiJAc&UVD(StT4I` zfVQwxhE9bXE6r2mKO8Ag7{L^jCyqQb0QqKDPE=RAgqn8q1O^>(z7h5kE(6va%QqRZ zkIOmp(})rLSS(2{=C12e&@!W2=Jel-^_R``0xHO^+t!(oXbcv5yhD4g*$t_F)_5Dl zSVCgesW%;DtYPCFs{G;GX_o?1J3;QQPPv)rWw;>} zJ&KwnUqwNXloNXlK_+pNDfI~hON#SokVJb&ilg8d7^NWo2ZQymCqQMnjfi>ePibjr z-Z@q!?RGN$Mj}Nk){X_vaj6?Mj$>ACR*z|6MsXy3VZ^PFn@yHkPo(>m(iWepn8SC@ z>D2;R4m+gDRZ=SIX!b+CP(qE=JDIUkn=D$aUu+Ihn9-+k1LS3PreQg0N5eWIG@x${nC3v^7caS>1!PKNAY9J z#}E}Q9w#SP>(GY7Hbj&z4$Li6o5taBO|4+F`yS9zq*LJ<38wy4I>HA9(&GYrk4dLajKGww))BWli6Ln1A^Lda@N~p+snkb9C z@OthI+<##vp8!HVQT4Wk(=@zQ{OvZ$EKWS73+JHb)eYLGD-cqi6^|vd$<+IHuc?Nq zW7JertT~3))4?J|28n$I@nAD0c1%9C&IVhEZX~mUsf{efyS(XNG%ch;!N~d7S(Ri7 zb&=BuON95aVA&kLn6&MVU|x}xPMp7xwWxNU1wS+F6#y}1@^wQZB*(&ecT?RnQcI}Y z2*z!^!D?gDUhc@;M^OpLs4mq>C&p{}OWVv<)S9KMars@0JQ{c_ScGsFo3BJ)Irg++ zAWwypJdTO-_{Uh8m(Z!3KL7K{ZZzKHj;{M8I$mV>k znTM?sa0);^=X^cglL`uC+^J)M7nEa$w=VwFULg~%DJllw+7dJAj3{qnP5i3@wr7%y zjXp?Wl2%Th=my&3u?Q$RV6N5tzKMSPTsc#J+-cDDp~qFB6bL2C8AS7Y3PKtVhdhl) zIaLqH5+OnWPWSt(lQCgkN8lczc-V%_iZ{>#1%Z$N*>lu#S;0MZ$T2Y8Kg!U;hAZj> z6S#%$DQ_`Ic%Zr@?}GgjRXg@qTj^17n`65oJ@Wj0u1X8&+UVd|Xs?J+i_^GZ94m6= zUc96~Q`OJvlKB_Lr15*Yw_PUPEr?f?H&00b^-W%26mD)(n(rGGNfK9~2h=C>p-7BZ zFd&*&Msdu{w~(eyFOglwCPH^Rb}O(N7LtS+nnEwDx*pGD?|&9Si~M43a+*L(b0$5A zv`T`(G3xO;I_sx;FwTP21ZlfDpz zOo?}Vlgf~fo{YWm@n_JyD*frOg{XsvBA~|Tn4V6hu>Gd>89-rblfVJUaGvj6X%NZ} z$tFF9sx=4_$*c~G`9iPLGh@=sV+O{D2-t*K@J7H=`V+oVt}8?04WwU3h1BgS!f%1P zFak-T#7`TtLcR=Yz>g0R!ZQrH!YiZOQN=_V-UyncN1Rc18?KY?#O`v#JK+pq0K$~H z3D@v9DZF42R)b9#BBX{^$DOMlJ!g)Gc za{o-1e%F6NvgKq9tC8pV+9S$;9*zNv{J*)n&dmf~anP1)4~N%~h#c(=B#3*KgzhCKhFdgDoWi2IDog{RVyzK|Y`rCUs3T~pJMmdZJy4?b z&s5G=zhf**(t7Y^oC_mcTsE-{^}wiaoUu&?kojLKs>SJPxjcP>{a5CbXCx92AcBE) zHtqP}LjZ{W>PH?Tu(E0X=%{PBMW@F_?#7b&#!^q`<-5$ur+-q6 z{dn=(^UZw6*3-XM_(=@<1_*i&XM4=0t5u!gm6 z{UlmNGPKgO_;e;q9|#esq~Sq`<}%d{+sRmhvsA{5i*91=tub>OZZ%)xUA#4q$dDyy z1`w4%?OPLg3JeZb#cqSMO?*Xn%|-FCcuH2i2fn_{IFusub6;NQdN|7TD1N?%E8*g? z$apAt@cEe!I%jB=*q$p_3=t_5R0ph%{qaq+QDg!c99Y!Xa!&oDZOeis_ot)gNXr{l zdY$|So2Qed2Y7KMNBrS^E169kG%h<+z{Z_p_;shB!uY)>yAVcK=&!bg`lVg)4T1|7 z0}7FpfydVH4F87K@c!nEG+WGKm{Ouo)Slpl;#qcEIQ0zdMfLA#;dBxYw;p;KoVv6| z3_D5&7rJdG12CnDSvZUW?$UC6^UVSW^|vw|o-_4bz)(w5(3AiVhpeT(|=f#x_}E?s#qHZF#xA6AF_ujl$G z-jHD%q(d2}v2PhXx&6YWps~m(^+RXl91Q#xRRJBhjKl$FG4bk);|ag;ieUZ&!Ii3$ z(iGz1+0m7#g5>ASldBbNZL=ZHh=tmmJt$!71; zIML2GhEz1pg@1rQN(M^_691wAGkJ@Pga_05WuQ6! zG5RkGY2^`@(H~pp7&Ga+Pwh3L!Njj!-rc;^bTIfo5hP@H##1X8xUZJckrx>id`bAd3QUx9GuomqBYZ!uN1-&o zvTxC?;p8vL67&fW8fw(YOqt>L@bdLrEF*3OgYe$4n4{ zEB40LiU#6-0@5jdN`0w}N0qi@c0~oT2FP z)LNk&a82my?jv(tQpiMi$TK_L@lub#lsM$R{Dk?Ya@%%%huZkct~tSWM714c!45k}-ZLVA-bVM`>|_ZBbW_m-7| z3U%xrAhi}n?T(2F{_n4EZ10inkIFl#y09?7$uwBoJgqY8vylwev)fDOn;>0R!aEnV zBz%j0Mqpx~EZU3q@%+oV7;}|vt7$~ou@faEIq{p?FY$XXg&6*K)b_LP=}gi9`Bij3 zN`zEo|B6*|-;>S`rNa^BKRDbDAk>X#MsR`EvL>6bqU@SaDDs z8>bu@3YdRaWs*Te@G-UHjU%F~kTHw5(0PVJ+pwh#ha2u;DB+UMo@A5UYIl#5rtBV- zGX_hIpw}3C@H*Us(Cc-d#-gNrG#w$(9+S=GxO>3SR`SE2fHZ2KrDc#_C^$jI>Y}#; zMwY=R6@+dWi~0RXw(c@3GZ&%~9K(q&ee0Zw;pwL`E_tZak-#8^_b)Dpyi73^he?xV zXJ08&wh5-M&}qy4f7!D&=E)puDD(Nmg1d_(j`4LvxM5x_huNg-pGG%9rYqO6mImyJ@}*3Y>^3OvcnTG%EV1) zq_Ap?Z!Iw__7#D=pOWnQN$gB!Mr0!9yx|g<4icJh{cFOu3B8}&RiYm+Mb;VEK``LK zL(NcpcTiGieOIssSjr?ob}^``nNf&UcJhXyncO9m{6gD$kqSD`S69(aF8dkWz5>!9 zBLe4Sib7Hs2x_L2Ls6Ish$MGVKrGt5+_2zCyP1byaCg3upo+-I}R4&$m)8 zQ7|jc1Z^VWggpuQj*cP;>Zo9LS!VSzrqmZczaf;u`d0J(f%Z9r%An@s!e>n9%y=n!IZ_tVGu{Jmsbp}Fk%HJIU?a+-~bjfLTuH|JExA8EROowzr zqW9{YyZhR0a4clRK>1I4Ncx&WER~{iE;F^$T7K%X@3PGOA%6#Z%p3TS^&M;Dnjw@i z^o!$9nhcsmcHcY4?4j9+ofL_CWsZ4Hcch(rjsGfGD(nsH>w}^ERqGnz%iGj0j{g}h z7wMkJ-2Z2~eS>2!i}0~B63i;>SyFJU2+>VCS^AxaDOx%g6-t0eM^P<3+*z`ztvOqrG3)&#$K?& z_Y0wbWID47@cU`E1A6A&!`aZk0ZE@z-h#l1NqX2#`$Uev2gepW`rf8*!=rD5&;Jb{ zl08rU>dPo=K%-1Ao1~G-@4ve~y5#9E8x;TE0k5d^TC(=Zc>mwjW^c=+U-<9}b0ku~}gj z3sbW>R2M6DR!g#NUP;nxo>)@7*=RP{U18SDop6b2&PHce^&h97@xx3t+VK+!keE#} z;(Uf&89as9k8{$nkLbuB!-d7TP`_VJpL^Xs8OKB~ri$YUbW8fch64}7|0EWoT(TRj{ z*GT<7Y<7DsrCi79ZsM)z#c(!nNOGySOCkY1fAuQOq12&iUVC!a`#O;dBLf=d?&4*B zI~LgAO7E0qxK(uRTM;IgJ}+z^gD+bi-6I!3x{r9`l~%8TRP%UE0V8E*Sz>Nl1NVG<<7(wDHZ+HcOkQm$O&k+vyx)y)x{Pz!U8hS$*m zByc0h6BUI*BOpuL==P+H|Hx%`>7!W+1H!l9vi&)`V zyn2o9{z=lc+VX*!Vh~SF=)L}Z40XeG>LF6cP^b+R$NxSeUqbK^Q*UTalKzP8X%{9@RSCXm_NhF>{=S2 zi}ezam_^P`S!!-cyEW9y7DBbK93roz@Raccy*v}?mKXScU9E_4g;hBU7}zSofAFda zKYEe?{{I54 diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index b82aa23..37f853b 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/gradlew b/gradlew index 1aa94a4..f3b75f3 100755 --- a/gradlew +++ b/gradlew @@ -15,6 +15,8 @@ # See the License for the specific language governing permissions and # limitations under the License. # +# SPDX-License-Identifier: Apache-2.0 +# ############################################################################## # @@ -55,7 +57,7 @@ # Darwin, MinGW, and NonStop. # # (3) This script is generated from the Groovy template -# https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt +# https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt # within the Gradle project. # # You can find Gradle at https://github.com/gradle/gradle/. @@ -84,7 +86,7 @@ done # shellcheck disable=SC2034 APP_BASE_NAME=${0##*/} # Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036) -APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit +APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s\n' "$PWD" ) || exit # Use the maximum available, or set MAX_FD != -1 to use that value. MAX_FD=maximum diff --git a/gradlew.bat b/gradlew.bat index 25da30d..9d21a21 100644 --- a/gradlew.bat +++ b/gradlew.bat @@ -13,6 +13,8 @@ @rem See the License for the specific language governing permissions and @rem limitations under the License. @rem +@rem SPDX-License-Identifier: Apache-2.0 +@rem @if "%DEBUG%"=="" @echo off @rem ########################################################################## diff --git a/justfile b/justfile index 70f47c0..b4584e0 100644 --- a/justfile +++ b/justfile @@ -1,10 +1,21 @@ -# Re-generate the resource/reflection configs based on the unit tests -configure: +set positional-arguments + +default: + just --list + +# generate graal resource/reflection configs from unit test coverage +@configure: ./gradlew -Pagent test - cp -r ./app/build/native/agent-output/test/{reflect-config.json,resource-config.json} ./app/src/config + cp -r ./app/build/native/agent-output/run/{reflect-config.json,resource-config.json} ./app/src/config -# Re-build the executable binary -make: configure +# run the unit tests of the project +@test: + ./gradlew test + +# build the binary +@binary: configure ./gradlew nativeCompile - mkdir -p ./bin - cp -rf ./app/build/native/nativeCompile/netcdf ./bin/ + +# invoke the cli binary with the provided arguments (assuming its been built) +@cli *args='': + ./app/build/native/nativeCompile/netcdf $@ From fae68469e0c98f64ba6c65fde1e1225cfd74dcdc Mon Sep 17 00:00:00 2001 From: Alex Cramer Date: Sun, 20 Apr 2025 21:14:01 -0400 Subject: [PATCH 2/2] Update docs --- .github/workflows/native.yaml | 2 +- .github/workflows/test.yaml | 2 +- README.md | 47 +++- app/src/config/resource-config.json | 224 +++++++++++------- .../stellarsunset/netcdf/cli/json/Json.java | 7 +- justfile | 4 +- 6 files changed, 186 insertions(+), 100 deletions(-) diff --git a/.github/workflows/native.yaml b/.github/workflows/native.yaml index bcf39e6..88e74bf 100644 --- a/.github/workflows/native.yaml +++ b/.github/workflows/native.yaml @@ -13,7 +13,7 @@ jobs: - uses: actions/checkout@v4 - uses: graalvm/setup-graalvm@v1 with: - java-version: '21' + java-version: '23' distribution: 'graalvm' github-token: ${{ secrets.GITHUB_TOKEN }} diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml index 4255201..f2c8afa 100644 --- a/.github/workflows/test.yaml +++ b/.github/workflows/test.yaml @@ -16,7 +16,7 @@ jobs: - uses: actions/checkout@v4 - uses: actions/setup-java@v4 with: - java-version: '21' + java-version: '23' distribution: 'temurin' - name: Setup Gradle diff --git a/README.md b/README.md index cfb88e7..a7c2e96 100644 --- a/README.md +++ b/README.md @@ -1,10 +1,47 @@ -# Netcdf CLI +# netcdf cli [![Test](https://github.com/stellarsunset/netcdf-cli/actions/workflows/test.yaml/badge.svg)](https://github.com/stellarsunset/netcdf-cli/actions/workflows/test.yaml) -Minimal CLI tool for working with [netcdf](https://github.com/stellarsunset/netcdf) supported data files. +Minimal [CLI](https://picocli.info) tool for working with [netcdf](https://github.com/stellarsunset/netcdf) supported +data files. -### Build +## usage -- Activate GraalVM with [SDKMAN](https://sdkman.io/) `sdk use java 21.0.2-graalce` before building -- Run `just make` to build the `netcdf` binary and copy it into the `./bin` directory of the project \ No newline at end of file +compile the cli yourself for whatever your target platform is via graal + +```bash +$ sdk use java 23.0.2-graalce + +# build the binary +$ just binary + +# test out the binary locally +$ just cli help +Usage:

[-v] [COMMAND] + -v, --version +Commands: + help Display help information about the specified command. + json Convert a Netcdf file to a stream of JSON records. + describe Describe the contents of a NetCDF file in terms of dimensions and + variables. + +# show help docs for subcommands +$ just cli help describe +Usage:
describe [-cds] +Describe the contents of a NetCDF file in terms of dimensions and variables. + the file to analyze + -c, --coordinate-variables + print information about all 'coordinate' variables + in a file, that is variables which vary along + greater than one dimension + -d, --dimension-variables + print information about all the 'dimension' + variables in the file, that is variables which + vary only along a single dimension + -s, --scalar-variables print information about all 'scalar' variables, that + is variables with only a single value in the file + these may contain coordinate system information, + file publication time, etc. +``` + +use the cli to generate json or explore the contents of various netcdf files \ No newline at end of file diff --git a/app/src/config/resource-config.json b/app/src/config/resource-config.json index ce609ea..0f036b0 100644 --- a/app/src/config/resource-config.json +++ b/app/src/config/resource-config.json @@ -1,93 +1,137 @@ { - "resources": { - "includes": [ - { - "pattern": "\\QMETA-INF/services/java.lang.System$LoggerFinder\\E" - }, - { - "pattern": "\\QMETA-INF/services/javax.xml.parsers.SAXParserFactory\\E" - }, - { - "pattern": "\\QMETA-INF/services/org.slf4j.spi.SLF4JServiceProvider\\E" - }, - { - "pattern": "\\QMETA-INF/services/ucar.nc2.iosp.IOServiceProvider\\E" - }, - { - "pattern": "\\QMETA-INF/services/ucar.unidata.io.spi.RandomAccessFileProvider\\E" - }, - { - "pattern": "\\Qorg/slf4j/impl/StaticLoggerBinder.class\\E" - }, - { - "pattern": "\\Qresources/grib1/ncep/ncepTableA.xml\\E" - }, - { - "pattern": "\\Qresources/grib2/ncep/v23.0.0/Table4.2.0.0.xml\\E" - }, - { - "pattern": "\\Qresources/grib2/ncep/v23.0.0/Table4.2.0.1.xml\\E" - }, - { - "pattern": "\\Qresources/grib2/ncep/v23.0.0/Table4.2.0.15.xml\\E" - }, - { - "pattern": "\\Qresources/grib2/ncep/v23.0.0/Table4.2.0.16.xml\\E" - }, - { - "pattern": "\\Qresources/grib2/ncep/v23.0.0/Table4.2.0.17.xml\\E" - }, - { - "pattern": "\\Qresources/grib2/ncep/v23.0.0/Table4.2.0.19.xml\\E" - }, - { - "pattern": "\\Qresources/grib2/ncep/v23.0.0/Table4.2.0.2.xml\\E" - }, - { - "pattern": "\\Qresources/grib2/ncep/v23.0.0/Table4.2.0.20.xml\\E" - }, - { - "pattern": "\\Qresources/grib2/ncep/v23.0.0/Table4.2.0.3.xml\\E" - }, - { - "pattern": "\\Qresources/grib2/ncep/v23.0.0/Table4.2.0.4.xml\\E" - }, - { - "pattern": "\\Qresources/grib2/ncep/v23.0.0/Table4.2.0.5.xml\\E" - }, - { - "pattern": "\\Qresources/grib2/ncep/v23.0.0/Table4.2.0.6.xml\\E" - }, - { - "pattern": "\\Qresources/grib2/ncep/v23.0.0/Table4.2.0.7.xml\\E" - }, - { - "pattern": "\\Qresources/grib2/ncep/v23.0.0/Table4.2.1.0.xml\\E" - }, - { - "pattern": "\\Qresources/grib2/ncep/v23.0.0/Table4.2.10.2.xml\\E" - }, - { - "pattern": "\\Qresources/grib2/ncep/v23.0.0/Table4.2.2.0.xml\\E" - }, - { - "pattern": "\\Qresources/grib2/ncep/v23.0.0/Table4.2.3.192.xml\\E" - }, - { - "pattern": "\\Qresources/grib2/standardTableMap.txt\\E" - }, - { - "pattern": "\\Qresources/grib2/wmo/GRIB2_22_0_0_CodeFlag_exp_en.xml\\E" - }, - { - "pattern": "\\Qresources/wmo/Common_C11_20181107_en.xml\\E" - }, - { - "pattern": "\\Qresources/wmo/Common_C12_20181107_en.xml\\E" - } - ] - }, - "bundles": [ - + "resources": { + "includes": [ + { + "pattern": "\\QMETA-INF/services/java.lang.System$LoggerFinder\\E" + }, + { + "pattern": "\\QMETA-INF/services/java.nio.channels.spi.SelectorProvider\\E" + }, + { + "pattern": "\\QMETA-INF/services/javax.xml.parsers.SAXParserFactory\\E" + }, + { + "pattern": "\\QMETA-INF/services/org.junit.platform.engine.TestEngine\\E" + }, + { + "pattern": "\\QMETA-INF/services/org.junit.platform.launcher.LauncherDiscoveryListener\\E" + }, + { + "pattern": "\\QMETA-INF/services/org.junit.platform.launcher.LauncherSessionListener\\E" + }, + { + "pattern": "\\QMETA-INF/services/org.junit.platform.launcher.PostDiscoveryFilter\\E" + }, + { + "pattern": "\\QMETA-INF/services/org.junit.platform.launcher.TestExecutionListener\\E" + }, + { + "pattern": "\\QMETA-INF/services/org.slf4j.spi.SLF4JServiceProvider\\E" + }, + { + "pattern": "\\QMETA-INF/services/thredds.inventory.MControllerProvider\\E" + }, + { + "pattern": "\\QMETA-INF/services/thredds.inventory.MFileProvider\\E" + }, + { + "pattern": "\\QMETA-INF/services/ucar.nc2.iosp.IOServiceProvider\\E" + }, + { + "pattern": "\\QMETA-INF/services/ucar.unidata.io.spi.RandomAccessFileProvider\\E" + }, + { + "pattern": "\\Qjunit-platform.properties\\E" + }, + { + "pattern": "\\Qorg/joda/time/tz/data/America/New_York\\E" + }, + { + "pattern": "\\Qorg/joda/time/tz/data/ZoneInfoMap\\E" + }, + { + "pattern": "\\Qorg/slf4j/impl/StaticLoggerBinder.class\\E" + }, + { + "pattern": "\\Qresources/bufrTables/local/tablelookup.csv\\E" + }, + { + "pattern": "\\Qresources/bufrTables/wmo/BUFRCREX_32_0_0_CodeFlag_en.xml\\E" + }, + { + "pattern": "\\Qresources/bufrTables/wmo/BUFRCREX_32_0_0_TableB_en.xml\\E" + }, + { + "pattern": "\\Qresources/bufrTables/wmo/BUFR_32_0_0_TableA_en.xml\\E" + }, + { + "pattern": "\\Qresources/bufrTables/wmo/BUFR_32_0_0_TableD_en.xml\\E" + }, + { + "pattern": "\\Qresources/grib1/dss/WMO_GRIB1.xml\\E" + }, + { + "pattern": "\\Qresources/grib1/dss/lookupTables.txt\\E" + }, + { + "pattern": "\\Qresources/grib1/ecmwf/lookupTables.txt\\E" + }, + { + "pattern": "\\Qresources/grib1/ecmwfEcCodes/lookupTables.txt\\E" + }, + { + "pattern": "\\Qresources/grib1/lookupTables.txt\\E" + }, + { + "pattern": "\\Qresources/grib1/ncep/ncepGrib1-2.xml\\E" + }, + { + "pattern": "\\Qresources/grib1/ncep/ncepTableA.xml\\E" + }, + { + "pattern": "\\Qresources/grib1/ncl/lookupTables.txt\\E" + }, + { + "pattern": "\\Qresources/grib1/wmoTable3.xml\\E" + }, + { + "pattern": "\\Qresources/grib1/wrf/lookupTables.txt\\E" + }, + { + "pattern": "\\Qresources/grib2/ecmwf/localConcepts/ecmf/cfName.def\\E" + }, + { + "pattern": "\\Qresources/grib2/ecmwf/localConcepts/ecmf/cfVarName.def\\E" + }, + { + "pattern": "\\Qresources/grib2/ecmwf/localConcepts/ecmf/name.def\\E" + }, + { + "pattern": "\\Qresources/grib2/ecmwf/localConcepts/ecmf/paramId.def\\E" + }, + { + "pattern": "\\Qresources/grib2/ecmwf/localConcepts/ecmf/shortName.def\\E" + }, + { + "pattern": "\\Qresources/grib2/ecmwf/localConcepts/ecmf/units.def\\E" + }, + { + "pattern": "\\Qresources/grib2/standardTableMap.txt\\E" + }, + { + "pattern": "\\Qresources/grib2/wmo/GRIB2_22_0_0_CodeFlag_exp_en.xml\\E" + }, + { + "pattern": "\\Qresources/wmo/Common_C11_20181107_en.xml\\E" + }, + { + "pattern": "\\Qresources/wmo/Common_C12_20181107_en.xml\\E" + }, + { + "pattern": "\\Qresources/wmo/Common_C13_20181107_en.xml\\E" + } ] + }, + "bundles": [ + ] } \ No newline at end of file diff --git a/app/src/main/java/com/stellarsunset/netcdf/cli/json/Json.java b/app/src/main/java/com/stellarsunset/netcdf/cli/json/Json.java index 5c6c0db..0aeed44 100644 --- a/app/src/main/java/com/stellarsunset/netcdf/cli/json/Json.java +++ b/app/src/main/java/com/stellarsunset/netcdf/cli/json/Json.java @@ -15,7 +15,12 @@ @Command( name = "json", - description = "Convert a Netcdf file to a stream of JSON records." + description = """ + Convert a Netcdf file to a stream of JSON records. + + Extract records with subsets of the record's fields including dimension and coordinate variables as seen + in via 'netcdf describe'. + """ ) public final class Json implements Callable { diff --git a/justfile b/justfile index b4584e0..f6bccf7 100644 --- a/justfile +++ b/justfile @@ -3,7 +3,7 @@ set positional-arguments default: just --list -# generate graal resource/reflection configs from unit test coverage +# generate graal resource/reflection configs from unit tests, these require some additional configuration @configure: ./gradlew -Pagent test cp -r ./app/build/native/agent-output/run/{reflect-config.json,resource-config.json} ./app/src/config @@ -13,7 +13,7 @@ default: ./gradlew test # build the binary -@binary: configure +@binary: ./gradlew nativeCompile # invoke the cli binary with the provided arguments (assuming its been built)