Cleanup of deprecated method usages

AustinShalit · AustinShalit · commit 8c21197e0a25 · 2016-08-08T14:45:17.000-07:00
diff --git a/core/src/main/java/edu/wpi/grip/core/sources/ImageFileSource.java b/core/src/main/java/edu/wpi/grip/core/sources/ImageFileSource.java
@@ -19,7 +19,9 @@
 
 import java.io.File;
 import java.io.IOException;
+import java.io.UnsupportedEncodingException;
 import java.net.URLDecoder;
+import java.nio.charset.StandardCharsets;
 import java.nio.file.Paths;
 import java.util.List;
 import java.util.Properties;
@@ -48,9 +50,9 @@ public final class ImageFileSource extends Source {
   ImageFileSource(
       final OutputSocket.Factory outputSocketFactory,
       final ExceptionWitness.Factory exceptionWitnessFactory,
-      @Assisted final File file) {
+      @Assisted final File file) throws UnsupportedEncodingException {
     this(outputSocketFactory, exceptionWitnessFactory, URLDecoder.decode(Paths.get(file
-        .toURI()).toString()));
+        .toURI()).toString(), StandardCharsets.UTF_8.name()));
   }
 
   @AssistedInject
diff --git a/core/src/main/java/edu/wpi/grip/core/sources/MultiImageFileSource.java b/core/src/main/java/edu/wpi/grip/core/sources/MultiImageFileSource.java
@@ -9,6 +9,7 @@
 import edu.wpi.grip.core.util.ExceptionWitness;
 import edu.wpi.grip.core.util.ImageLoadingUtility;
 
+import com.google.common.base.Throwables;
 import com.google.common.collect.ImmutableList;
 import com.google.common.eventbus.EventBus;
 import com.google.common.math.IntMath;
@@ -20,7 +21,9 @@
 
 import java.io.File;
 import java.io.IOException;
+import java.io.UnsupportedEncodingException;
 import java.net.URLDecoder;
+import java.nio.charset.StandardCharsets;
 import java.nio.file.Paths;
 import java.util.Arrays;
 import java.util.List;
@@ -62,18 +65,25 @@ public final class MultiImageFileSource extends Source implements PreviousNext {
       final OutputSocket.Factory outputSocketFactory,
       final ExceptionWitness.Factory exceptionWitnessFactory,
       @Assisted final List<File> files,
-      @Assisted final int index) {
+      @Assisted final int index) throws UnsupportedEncodingException {
     this(eventBus, outputSocketFactory, exceptionWitnessFactory, files.stream()
-        .map(file -> URLDecoder.decode(Paths.get(file.toURI()).toString()))
-        .collect(Collectors.toList()).toArray(new String[files.size()]), index);
+        .map(file -> {
+          try {
+            return URLDecoder.decode(Paths.get(file.toURI()).toString(),
+                StandardCharsets.UTF_8.name());
+          } catch (UnsupportedEncodingException e) {
+            Throwables.propagate(e);
+            return "";
+          }
+        }).collect(Collectors.toList()).toArray(new String[files.size()]), index);
   }
 
   @AssistedInject
   MultiImageFileSource(
       final EventBus eventBus,
       final OutputSocket.Factory outputSocketFactory,
       final ExceptionWitness.Factory exceptionWitnessFactory,
-      @Assisted final List<File> files) {
+      @Assisted final List<File> files) throws UnsupportedEncodingException {
     this(eventBus, outputSocketFactory, exceptionWitnessFactory, files, 0);
   }
 
diff --git a/core/src/test/java/edu/wpi/grip/util/ImageWithData.java b/core/src/test/java/edu/wpi/grip/util/ImageWithData.java
@@ -8,6 +8,7 @@
 import java.io.File;
 import java.io.IOException;
 import java.net.URLDecoder;
+import java.nio.charset.StandardCharsets;
 import java.nio.file.Paths;
 
 import static org.junit.Assert.assertEquals;
@@ -26,7 +27,8 @@ protected ImageWithData(File file, int rows, int cols) {
   public Mat createMat() {
     try {
       final Mat data = new Mat();
-      ImageLoadingUtility.loadImage(URLDecoder.decode(Paths.get(file.toURI()).toString()), data);
+      ImageLoadingUtility.loadImage(URLDecoder.decode(Paths.get(file.toURI()).toString(),
+          StandardCharsets.UTF_8.name()), data);
       return data;
     } catch (IOException e) {
       throw new AssertionError("Can not load image", e);
diff --git a/ui/src/main/java/edu/wpi/grip/ui/DeployController.java b/ui/src/main/java/edu/wpi/grip/ui/DeployController.java
@@ -8,6 +8,7 @@
 import edu.wpi.grip.ui.components.LogTextArea;
 import edu.wpi.grip.ui.util.StringInMemoryFile;
 
+import com.google.common.base.Throwables;
 import com.google.common.eventbus.EventBus;
 import com.google.common.eventbus.Subscribe;
 import com.google.common.hash.Hashing;
@@ -22,19 +23,19 @@
 import net.schmizz.sshj.xfer.LoggingTransferListener;
 import net.schmizz.sshj.xfer.scp.SCPFileTransfer;
 
-import java.io.DataInputStream;
+import java.io.BufferedReader;
 import java.io.IOException;
 import java.io.InputStreamReader;
 import java.io.InterruptedIOException;
 import java.io.StringWriter;
+import java.io.UnsupportedEncodingException;
 import java.net.URL;
 import java.net.URLDecoder;
 import java.net.UnknownHostException;
 import java.nio.charset.StandardCharsets;
 import java.util.Optional;
 import java.util.logging.Level;
 import java.util.logging.Logger;
-
 import javafx.application.Platform;
 import javafx.beans.binding.Bindings;
 import javafx.beans.property.BooleanProperty;
@@ -44,7 +45,6 @@
 import javafx.scene.control.ProgressIndicator;
 import javafx.scene.control.TextField;
 import javafx.scene.control.ToggleButton;
-
 import javax.inject.Inject;
 
 /**
@@ -57,7 +57,7 @@ public class DeployController {
   private static final String GRIP_WRAPPER = "grip";
   private static final URL LOCAL_GRIP_URL = Project.class.getProtectionDomain().getCodeSource()
       .getLocation();
-  private static final String LOCAL_GRIP_PATH = URLDecoder.decode(LOCAL_GRIP_URL.getPath());
+  private static final String LOCAL_GRIP_PATH;
   private static final Logger logger = Logger.getLogger(DeployController.class.getName());
 
   @FXML
@@ -96,6 +96,16 @@ public class DeployController {
 
   private Optional<Thread> deployThread = Optional.empty();
 
+  static {
+    String path = "";
+    try {
+      path = URLDecoder.decode(LOCAL_GRIP_URL.getPath(), StandardCharsets.UTF_8.name());
+    } catch (UnsupportedEncodingException e) {
+      Throwables.propagate(e);
+    }
+    LOCAL_GRIP_PATH = path;
+  }
+
   @FXML
   protected void initialize() {
     deploying.addListener((o, b, d) -> progress.setProgress(d ? ProgressIndicator
@@ -211,8 +221,9 @@ public StreamCopier.Listener file(String name, long size) {
         // session to close it.
         final Session.Command md5Cmd = session.exec("md5sum " + pathStr + GRIP_JAR);
         final String remoteMd5Sum;
-        try (DataInputStream stream = new DataInputStream(md5Cmd.getInputStream())) {
-          remoteMd5Sum = stream.readLine();
+        try (BufferedReader reader = new BufferedReader(
+            new InputStreamReader(md5Cmd.getInputStream()))) {
+          remoteMd5Sum = reader.readLine();
         }
         String localMd5Sum = Resources.asByteSource(LOCAL_GRIP_URL).hash(Hashing.md5()).toString();
 
diff --git a/ui/src/test/java/edu/wpi/grip/ui/util/ImageConverterTest.java b/ui/src/test/java/edu/wpi/grip/ui/util/ImageConverterTest.java
@@ -9,6 +9,7 @@
 import org.testfx.framework.junit.ApplicationTest;
 
 import java.net.URLDecoder;
+import java.nio.charset.StandardCharsets;
 import java.nio.file.Paths;
 
 import javafx.scene.Scene;
@@ -38,7 +39,8 @@ public void start(Stage stage) {
   public void testConvertImage() throws Exception {
     Mat mat = new Mat();
     ImageLoadingUtility.loadImage(
-        URLDecoder.decode(Paths.get(gompeiImage.file.toURI()).toString()), mat);
+        URLDecoder.decode(Paths.get(gompeiImage.file.toURI()).toString(),
+            StandardCharsets.UTF_8.name()), mat);
     interact(() -> {
       Image javaFXImage = converter.convert(mat);
       assertSameImage(gompeiImage, javaFXImage);
@@ -56,9 +58,11 @@ public void testConvertImageSwitch() throws Exception {
     Mat gompeiMat = new Mat();
     Mat imageMat = new Mat();
     ImageLoadingUtility.loadImage(
-        URLDecoder.decode(Paths.get(gompeiImage.file.toURI()).toString()), gompeiMat);
+        URLDecoder.decode(Paths.get(gompeiImage.file.toURI()).toString(),
+            StandardCharsets.UTF_8.name()), gompeiMat);
     ImageLoadingUtility.loadImage(
-        URLDecoder.decode(Paths.get(imageFile.file.toURI()).toString()), imageMat);
+        URLDecoder.decode(Paths.get(imageFile.file.toURI()).toString(),
+            StandardCharsets.UTF_8.name()), imageMat);
     interact(() -> {
       converter.convert(gompeiMat);
       Image javaFXImage = converter.convert(imageMat);
@@ -70,7 +74,8 @@ public void testConvertImageSwitch() throws Exception {
   public void testConvertSingleChanelImage() throws Exception {
     final Mat gompeiMat = new Mat();
     ImageLoadingUtility.loadImage(
-        URLDecoder.decode(Paths.get(gompeiImage.file.toURI()).toString()), gompeiMat);
+        URLDecoder.decode(Paths.get(gompeiImage.file.toURI()).toString(),
+            StandardCharsets.UTF_8.name()), gompeiMat);
     final Mat desaturatedMat = new Mat();
     cvtColor(gompeiMat, desaturatedMat, COLOR_BGR2GRAY);
 
