Merge pull request #1374 from kluever/patch-1

Migrate from `Charsets` to `StandardCharsets`.

Author: tdrwenski

cdm/core/src/test/java/ucar/nc2/TestNcDump.java

@@ -4,7 +4,6 @@
  */
 package ucar.nc2;
 
-import com.google.common.base.Charsets;
 import com.google.common.io.Files;
 import org.junit.Assert;
 import org.junit.Test;
@@ -15,6 +14,7 @@
 import java.io.IOException;
 import java.io.StringWriter;
 import java.lang.invoke.MethodHandles;
+import java.nio.charset.StandardCharsets;
 
 /** Test NcdumpW. */
 public class TestNcDump {
@@ -30,7 +30,7 @@ public void testUnsignedFillValue() throws IOException {
           null);
 
       File expectedOutputFile = new File(TestDir.cdmLocalTestDataDir, "testUnsignedFillValue.dump");
-      String expectedOutput = Files.toString(expectedOutputFile, Charsets.UTF_8);
+      String expectedOutput = Files.toString(expectedOutputFile, StandardCharsets.UTF_8);
 
       Assert.assertEquals(toUnixEOLs(expectedOutput), toUnixEOLs(sw.toString()));
     }
@@ -43,7 +43,7 @@ public void testNestedGroups() throws IOException {
       NCdumpW.print(TestDir.cdmLocalTestDataDir + "testNestedGroups.ncml", sw, true, true, false, false, null, null);
 
       File expectedOutputFile = new File(TestDir.cdmLocalTestDataDir, "testNestedGroups.dump");
-      String expectedOutput = Files.toString(expectedOutputFile, Charsets.UTF_8);
+      String expectedOutput = Files.toString(expectedOutputFile, StandardCharsets.UTF_8);
 
       Assert.assertEquals(toUnixEOLs(expectedOutput), toUnixEOLs(sw.toString()));
     }

cdm/core/src/test/java/ucar/nc2/write/TestNcdump.java

@@ -4,11 +4,11 @@
  */
 package ucar.nc2.write;
 
-import com.google.common.base.Charsets;
 import com.google.common.io.Files;
 import java.io.File;
 import java.io.IOException;
 import java.lang.invoke.MethodHandles;
+import java.nio.charset.StandardCharsets;
 import org.junit.Assert;
 import org.junit.Test;
 import org.slf4j.Logger;
@@ -32,7 +32,7 @@ public void testUnsignedFillValue() throws IOException {
       String ncdumpOut = ncdump.print();
 
       File expectedOutputFile = new File(TestDir.cdmLocalTestDataDir, "testUnsignedFillValueNew.dump");
-      String expectedOutput = Files.toString(expectedOutputFile, Charsets.UTF_8);
+      String expectedOutput = Files.toString(expectedOutputFile, StandardCharsets.UTF_8);
 
       Assert.assertEquals(toUnixEOLs(expectedOutput), toUnixEOLs(ncdumpOut));
     }
@@ -46,7 +46,7 @@ public void testNestedGroups() throws IOException {
       String ncdumpOut = ncdump.print();
 
       File expectedOutputFile = new File(TestDir.cdmLocalTestDataDir, "testNestedGroups.dump");
-      String expectedOutput = Files.toString(expectedOutputFile, Charsets.UTF_8);
+      String expectedOutput = Files.toString(expectedOutputFile, StandardCharsets.UTF_8);
 
       Assert.assertEquals(toUnixEOLs(expectedOutput), toUnixEOLs(ncdumpOut));
     }