Merge pull request #355 from JohnLCaron/openCleanup

lesserwhirls · web-flow · commit b47817f55942 · 2020-07-09T20:41:35.000-06:00
Move NetcdfDataset.open to NetcdfDatasets.
diff --git a/cdm-test/src/test/java/ucar/nc2/dt/grid/TestGridSubset.java b/cdm-test/src/test/java/ucar/nc2/dt/grid/TestGridSubset.java
@@ -15,6 +15,7 @@
 import ucar.nc2.dataset.CoordinateAxis;
 import ucar.nc2.dataset.CoordinateAxis1D;
 import ucar.nc2.dataset.NetcdfDataset;
+import ucar.nc2.dataset.NetcdfDatasets;
 import ucar.nc2.dt.GridCoordSystem;
 import ucar.nc2.dt.GridDatatype;
 import ucar.nc2.grib.collection.Grib;
@@ -426,7 +427,7 @@ public void testBBSubsetVP2() throws Exception {
   @Test
   public void testSubsetCoordEdges() throws Exception {
     try (NetcdfDataset fooDataset =
-        NetcdfDataset.openDataset(TestDir.cdmLocalFromTestDataDir + "ncml/subsetCoordEdges.ncml")) {
+        NetcdfDatasets.openDataset(TestDir.cdmLocalFromTestDataDir + "ncml/subsetCoordEdges.ncml")) {
       logger.debug("Open {}", fooDataset.getLocation());
       CompareNetcdf2 compare = new CompareNetcdf2();
       boolean ok = true;
diff --git a/cdm-test/src/test/java/ucar/nc2/dt/grid/TestGridSubsetCoordinateSystem.java b/cdm-test/src/test/java/ucar/nc2/dt/grid/TestGridSubsetCoordinateSystem.java
@@ -17,6 +17,7 @@
 import ucar.nc2.dataset.CoordinateAxis;
 import ucar.nc2.dataset.CoordinateSystem;
 import ucar.nc2.dataset.NetcdfDataset;
+import ucar.nc2.dataset.NetcdfDatasets;
 import ucar.nc2.dataset.VariableDS;
 import ucar.nc2.dt.GridCoordSystem;
 import ucar.nc2.dt.GridDatatype;
@@ -111,7 +112,7 @@ public void testCoordinateSystemDomain() throws Exception {
     System.err.printf("%nOpen %s grid='%s'%n", filename, gridName);
     Grib.setDebugFlags(new DebugFlagsImpl("Grib/indexOnly"));
 
-    try (NetcdfDataset ncd = NetcdfDataset.openDataset(filename)) {
+    try (NetcdfDataset ncd = NetcdfDatasets.openDataset(filename)) {
       Assert.assertNotNull(filename, ncd);
       VariableDS vds = (VariableDS) ncd.findVariable(gridName);
       Assert.assertNotNull(gridName, vds);
diff --git a/cdm-test/src/test/java/ucar/nc2/ft/coverage/TestCoverageClassificationP.java b/cdm-test/src/test/java/ucar/nc2/ft/coverage/TestCoverageClassificationP.java
@@ -11,6 +11,7 @@
 import ucar.nc2.constants.FeatureType;
 import ucar.nc2.dataset.CoordinateSystem;
 import ucar.nc2.dataset.NetcdfDataset;
+import ucar.nc2.dataset.NetcdfDatasets;
 import ucar.nc2.ft2.coverage.FeatureDatasetCoverage;
 import ucar.nc2.ft2.coverage.CoverageCollection;
 import ucar.nc2.ft2.coverage.CoverageDatasetFactory;
@@ -99,7 +100,7 @@ public void testAdapter() throws IOException {
     }
 
     // check DtCoverageCS
-    try (NetcdfDataset ds = NetcdfDataset.openDataset(endpoint)) {
+    try (NetcdfDataset ds = NetcdfDatasets.openDataset(endpoint)) {
       Formatter errlog = new Formatter();
       DtCoverageCSBuilder builder = DtCoverageCSBuilder.classify(ds, errlog); // uses cs with largest # axes
       Assert.assertNotNull(errlog.toString(), builder);
diff --git a/cdm-test/src/test/java/ucar/nc2/ft/point/TestMiscPointFeature.java b/cdm-test/src/test/java/ucar/nc2/ft/point/TestMiscPointFeature.java
@@ -50,6 +50,7 @@
 import ucar.nc2.VariableSimpleIF;
 import ucar.nc2.constants.FeatureType;
 import ucar.nc2.dataset.NetcdfDataset;
+import ucar.nc2.dataset.NetcdfDatasets;
 import ucar.nc2.ft.*;
 import ucar.nc2.time.CalendarDate;
 import ucar.nc2.time.CalendarDateRange;
@@ -303,12 +304,12 @@ public void testTryWith() throws IOException {
   @Test
   public void testTryWithWrap() throws IOException {
     String location = TestDir.cdmLocalFromTestDataDir + "testWrite.nc";
-    NetcdfDataset ncd = NetcdfDataset.openDataset(location);
-    Formatter errlog = new Formatter();
-    try (FeatureDataset fdataset = FeatureDatasetFactoryManager.wrap(null, ncd, null, errlog)) {
-      assert (fdataset == null);
+    try (NetcdfDataset ncd = NetcdfDatasets.openDataset(location)) {
+      Formatter errlog = new Formatter();
+      try (FeatureDataset fdataset = FeatureDatasetFactoryManager.wrap(null, ncd, null, errlog)) {
+        assert (fdataset == null);
+      }
     }
-    ncd.close();
   }
 
   // This is a regression test for TDS-513: https://bugtracking.unidata.ucar.edu/browse/TDS-513
diff --git a/cdm-test/src/test/java/ucar/nc2/ft/point/standard/TestTableAnalyzer.java b/cdm-test/src/test/java/ucar/nc2/ft/point/standard/TestTableAnalyzer.java
@@ -4,6 +4,7 @@
 import java.util.Formatter;
 import org.junit.Test;
 import org.junit.experimental.categories.Category;
+import ucar.nc2.NetcdfFile;
 import ucar.nc2.dataset.NetcdfDataset;
 import ucar.unidata.util.test.TestDir;
 import ucar.unidata.util.test.category.NeedsCdmUnitTest;
@@ -14,10 +15,12 @@ public class TestTableAnalyzer {
   static void doit(String filename) throws IOException {
     filename = TestDir.cdmUnitTestDir + filename;
     System.out.println(filename);
-    NetcdfDataset ncd = ucar.nc2.dataset.NetcdfDataset.openDataset(filename);
-    TableAnalyzer csa = TableAnalyzer.factory(null, null, ncd);
-    csa.getDetailInfo(new Formatter(System.out));
-    System.out.println("%n-----------------");
+    try (NetcdfDataset ncd = ucar.nc2.dataset.NetcdfDatasets.openDataset(filename, true, -1, null,
+        NetcdfFile.IOSP_MESSAGE_ADD_RECORD_STRUCTURE)) {
+      TableAnalyzer csa = TableAnalyzer.factory(null, null, ncd);
+      csa.getDetailInfo(new Formatter(System.out));
+      System.out.println("%n-----------------");
+    }
   }
 
   @Test
diff --git a/cdm-test/src/timing/java/ucar/nc2/TimeCdmRemote.java b/cdm-test/src/timing/java/ucar/nc2/TimeCdmRemote.java
@@ -80,14 +80,13 @@ static Section makeSubset(Variable v) throws InvalidRangeException {
     return new Section(shape);
   }
 
-
   static void testRead(String filename, Stat stat, boolean readData) throws IOException, InvalidRangeException {
     long bytes = 0;
     long start = System.nanoTime();
     if (show)
       System.out.printf("%n------Reading filename %s (%s)%n", filename, stat.getName());
 
-    try (NetcdfFile ncfile = NetcdfDataset.openFile(filename, null)) {
+    try (NetcdfFile ncfile = NetcdfDatasets.openFile(filename, null)) {
       if (readData)
         bytes = readAllData(ncfile);
       long end = System.nanoTime();
diff --git a/cdm/misc/src/test/java/ucar/nc2/TestDsmpCoverageClassification.java b/cdm/misc/src/test/java/ucar/nc2/TestDsmpCoverageClassification.java
@@ -12,6 +12,7 @@
 import ucar.nc2.constants.FeatureType;
 import ucar.nc2.dataset.CoordinateSystem;
 import ucar.nc2.dataset.NetcdfDataset;
+import ucar.nc2.dataset.NetcdfDatasets;
 import ucar.nc2.ft2.coverage.CoverageCollection;
 import ucar.nc2.ft2.coverage.CoverageDatasetFactory;
 import ucar.nc2.ft2.coverage.FeatureDatasetCoverage;
@@ -24,7 +25,6 @@
 /** Test Dsmp Coverage Classification */
 @Category(NeedsCdmUnitTest.class)
 public class TestDsmpCoverageClassification {
-
   String endpoint = TestDir.cdmUnitTestDir + "formats/dmsp/F14200307192230.s.OIS";
   FeatureType expectType = FeatureType.SWATH;
   int domain = 2;
@@ -42,7 +42,7 @@ public void testAdapter() throws IOException {
     }
 
     // check DtCoverageCS
-    try (NetcdfDataset ds = NetcdfDataset.openDataset(endpoint)) {
+    try (NetcdfDataset ds = NetcdfDatasets.openDataset(endpoint)) {
       Formatter errlog = new Formatter();
       DtCoverageCSBuilder builder = DtCoverageCSBuilder.classify(ds, errlog); // uses cs with largest # axes
       Assert.assertNotNull(errlog.toString(), builder);
diff --git a/cdm/radial/src/test/java/ucar/nc2/iosp/nexrad2/TestNexrad2.java b/cdm/radial/src/test/java/ucar/nc2/iosp/nexrad2/TestNexrad2.java
@@ -15,6 +15,7 @@
 import ucar.nc2.NetcdfFile;
 import ucar.nc2.Variable;
 import ucar.nc2.dataset.NetcdfDataset;
+import ucar.nc2.dataset.NetcdfDatasets;
 import ucar.nc2.dataset.VariableDS;
 import ucar.unidata.util.test.category.NeedsCdmUnitTest;
 import ucar.unidata.util.test.TestDir;
@@ -52,7 +53,7 @@ public int doAct(String filename) throws IOException {
         return 0;
       }
 
-      try (NetcdfFile ncfile = NetcdfDataset.openFile(filename, null)) {
+      try (NetcdfFile ncfile = NetcdfDatasets.openFile(filename, null)) {
         return testRead(ncfile);
       }
     }
@@ -129,10 +130,8 @@ static public boolean testCoordSystem(NetcdfFile nexrad2) throws IOException {
 
   @Test
   public void testCoordSys() throws IOException {
-    // NetcdfDataset ncd = NetcdfDataset.openDataset(
-    // "dods://localhost:8080/thredds/dodsC/testAll/Level2_KSOX_20051010_2322.ar2v", false, null);
     String filename = TestDir.cdmUnitTestDir + "formats/nexrad/level2/Level2_KYUX_20060527_2335.ar2v";
-    try (NetcdfFile ncfile = NetcdfDataset.openFile(filename, null)) {
+    try (NetcdfFile ncfile = NetcdfDatasets.openFile(filename, null)) {
       testCoordSystem(ncfile);
     }
   }
@@ -142,7 +141,7 @@ public void testBzipProblem() throws IOException, InvalidRangeException {
     // file where there was an error unzipping the file
     String filename =
         TestDir.cdmUnitTestDir + "formats/nexrad/level2/Level2_KFTG_20060818_1814.ar2v.uncompress.missingradials";
-    try (NetcdfDataset ncd = NetcdfDataset.openDataset(filename)) {
+    try (NetcdfDataset ncd = NetcdfDatasets.openDataset(filename)) {
 
       VariableDS azi = (VariableDS) ncd.findVariable("azimuthR");
       assert azi != null;
diff --git a/cdm/radial/src/test/java/ucar/nc2/iosp/nexrad2/TestNexrad2HiResolution.java b/cdm/radial/src/test/java/ucar/nc2/iosp/nexrad2/TestNexrad2HiResolution.java
@@ -14,6 +14,7 @@
 import ucar.nc2.NetcdfFile;
 import ucar.nc2.Variable;
 import ucar.nc2.dataset.NetcdfDataset;
+import ucar.nc2.dataset.NetcdfDatasets;
 import ucar.unidata.util.test.category.NeedsCdmUnitTest;
 import ucar.unidata.util.test.TestDir;
 import java.io.File;
@@ -51,15 +52,14 @@ public int doAct(String filename) throws IOException {
         return 0;
       }
 
-      try (NetcdfFile ncfile = NetcdfDataset.openFile(filename, null)) {
+      try (NetcdfFile ncfile = NetcdfDatasets.openFile(filename, null)) {
         testRead(ncfile);
         testCoordSystem(ncfile);
         return 1;
       }
     }
   }
 
-
   private void testRead(NetcdfFile nexrad2) throws IOException {
     Dimension scanR = nexrad2.findDimension("scanR");
     assert null != scanR;
diff --git a/opendap/src/main/java/opendap/dap/HeaderInputStream.java b/opendap/src/main/java/opendap/dap/HeaderInputStream.java
@@ -49,7 +49,6 @@
  *
  * @author jehamby
  * @version $Revision: 15901 $
- * @see DConnect
  */
 public class HeaderInputStream extends FilterInputStream {
   /**
diff --git a/testUtil/src/main/java/ucar/unidata/util/test/UnitTestCommon.java b/testUtil/src/main/java/ucar/unidata/util/test/UnitTestCommon.java
@@ -24,6 +24,7 @@
 import java.util.EnumSet;
 import java.util.List;
 import java.util.Set;
+import ucar.nc2.write.Ncdump;
 
 public abstract class UnitTestCommon {
   //////////////////////////////////////////////////
@@ -554,8 +555,7 @@ protected static String ncdumpmetadata(NetcdfFile ncfile, String datasetname) th
     }
     // Print the meta-databuffer using these args to NcdumpW
     try {
-      if (!ucar.nc2.NCdumpW.print(ncfile, args.toString(), sw, null))
-        throw new Exception("NcdumpW failed");
+      Ncdump.ncdump(ncfile, args.toString(), sw, null);
     } catch (IOException ioe) {
       throw new Exception("NcdumpW failed", ioe);
     }
@@ -572,8 +572,7 @@ protected static String ncdumpdata(NetcdfFile ncfile, String datasetname) throws
     // Dump the databuffer
     StringWriter sw = new StringWriter();
     try {
-      if (!ucar.nc2.NCdumpW.print(ncfile, args.toString(), sw, null))
-        throw new Exception("NCdumpW failed");
+      Ncdump.ncdump(ncfile, args.toString(), sw, null);
     } catch (IOException ioe) {
       ioe.printStackTrace();
       throw new Exception("NCdumpW failed", ioe);
diff --git a/uibase/src/test/java/ucar/util/memory/memory/MemoryCounterAgentTest.java b/uibase/src/test/java/ucar/util/memory/memory/MemoryCounterAgentTest.java
@@ -5,7 +5,6 @@
 
 package ucar.util.memory.memory;
 
-import org.junit.Test;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import ucar.nc2.*;
@@ -16,6 +15,7 @@
 import java.util.HashMap;
 import java.util.LinkedHashMap;
 import java.util.concurrent.locks.ReentrantReadWriteLock;
+import ucar.nc2.dataset.NetcdfDatasets;
 
 public class MemoryCounterAgentTest {
   private static final Logger logger = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
@@ -140,33 +140,31 @@ static void showAll(NetcdfFile ncfile) {
 
   static void testNcd() throws IOException {
     String filename = "C:/data/test2.nc";
-    NetcdfDataset ncfile = NetcdfDataset.openDataset(filename);
-    measureSize("C:/data/test2.nc", ncfile, null, true);
+    try (NetcdfDataset ncfile = NetcdfDatasets.openDataset(filename)) {
+      measureSize("C:/data/test2.nc", ncfile, null, true);
 
-    NetcdfDatasetInfo info = new NetcdfDatasetInfo(filename);
-    measureSize("info", info, null, true);
-    String pifo = info.getParseInfo();
-    System.out.println("info= " + pifo);
-    ncfile.close();
+      NetcdfDatasetInfo info = new NetcdfDatasetInfo(filename);
+      measureSize("info", info, null, true);
+      String pifo = info.getParseInfo();
+      System.out.println("info= " + pifo);
+    }
   }
 
   static void testN3() throws IOException {
-    NetcdfFile ncfile = NetcdfDataset.openFile("C:/data/test2.nc", null);
-    measureSize("beforeRead", ncfile, null, true);
-
-    for (Variable v : ncfile.getVariables()) {
-      v.read();
+    try (NetcdfFile ncfile = NetcdfDatasets.openFile("C:/data/test2.nc", null)) {
+      measureSize("beforeRead", ncfile, null, true);
+      for (Variable v : ncfile.getVariables()) {
+        v.read();
+      }
+      measureSize("afterRead", ncfile, null, true);
     }
-    measureSize("afterRead", ncfile, null, true);
-
-    ncfile.close();
   }
 
   static void testNcml() throws IOException {
     String filename = "C:/dev/tds/thredds/cdm/src/test/data/ncml/aggUnionSimple.xml";
-    NetcdfDataset ncfile = NetcdfDataset.openDataset(filename, false, null);
-    measureSize("aggUnionSimple", ncfile, null, true);
-    ncfile.close();
+    try (NetcdfDataset ncfile = NetcdfDatasets.openDataset(filename, false, null)) {
+      measureSize("aggUnionSimple", ncfile, null, true);
+    }
   }
 
 }

Original file line number	Diff line number	Diff line change
`@@ -14,6 +14,7 @@`
`14`	`14`	`import ucar.nc2.NetcdfFile;`
`15`	`15`	`import ucar.nc2.Variable;`
`16`	`16`	`import ucar.nc2.dataset.NetcdfDataset;`
	`17`	`+import ucar.nc2.dataset.NetcdfDatasets;`
`17`	`18`	`import ucar.unidata.util.test.category.NeedsCdmUnitTest;`
`18`	`19`	`import ucar.unidata.util.test.TestDir;`
`19`	`20`	`import java.io.File;`
`@@ -51,15 +52,14 @@ public int doAct(String filename) throws IOException {`
`51`	`52`	`return 0;`
`52`	`53`	`}`
`53`	`54`
`54`		`- try (NetcdfFile ncfile = NetcdfDataset.openFile(filename, null)) {`
	`55`	`+ try (NetcdfFile ncfile = NetcdfDatasets.openFile(filename, null)) {`
`55`	`56`	`testRead(ncfile);`
`56`	`57`	`testCoordSystem(ncfile);`
`57`	`58`	`return 1;`
`58`	`59`	`}`
`59`	`60`	`}`
`60`	`61`	`}`
`61`	`62`
`62`		`-`
`63`	`63`	`private void testRead(NetcdfFile nexrad2) throws IOException {`
`64`	`64`	`Dimension scanR = nexrad2.findDimension("scanR");`
`65`	`65`	`assert null != scanR;`
Original file line number	Diff line number	Diff line change
`@@ -49,7 +49,6 @@`
`49`	`49`	`*`
`50`	`50`	`* @author jehamby`
`51`	`51`	`* @version $Revision: 15901 $`
`52`		`- * @see DConnect`
`53`	`52`	`*/`
`54`	`53`	`public class HeaderInputStream extends FilterInputStream {`
`55`	`54`	`/**`