Merge pull request #472 from JLLeitschuh/chore/fixBugs

Cleans up most of FindBugs Warnings

Author: JLLeitschuh

buildSrc/src/main/java/edu/wpi/gripgenerator/FileParser.java

@@ -54,7 +54,7 @@ public class FileParser {
      */
     private static InputStream preProcessStream(InputStream stream) {
         //FIXME: This is a hack around. This should be removed once the above noted issue is resolved.
-        java.util.Scanner s = new java.util.Scanner(stream).useDelimiter("\\A");
+        java.util.Scanner s = new java.util.Scanner(stream, StandardCharsets.UTF_8.name()).useDelimiter("\\A");
         String input = s.hasNext() ? s.next() : "";
         input = input.replaceAll(methodReorderPattern, methodNewOrder);
         return new ByteArrayInputStream(input.getBytes(StandardCharsets.UTF_8));

buildSrc/src/main/java/edu/wpi/gripgenerator/templates/OperationList.java

@@ -28,7 +28,7 @@
  */
 public class OperationList {
     private final PackageDeclaration packageDec = new PackageDeclaration(new NameExpr("edu.wpi.grip.generated"));
-    private final String className = "CVOperations";
+    private static final String className = "CVOperations";
     private final List<ImportDeclaration> imports;
     private final List<Operation> operations;
 

buildSrc/src/main/java/edu/wpi/gripgenerator/templates/SocketHintDeclarationCollection.java

@@ -246,11 +246,11 @@ public BlockStmt getOutputSocketBody() {
 
     public List<SocketHintDeclaration> getAllSocketHints() {
         List<SocketHintDeclaration> socketHintDeclarations = new ArrayList<>();
-        for (Type type : inputHintsMap.keySet()) {
-            socketHintDeclarations.add(new SocketHintDeclaration(collector, type, inputHintsMap.get(type), DefinedParamType.DefinedParamDirection.INPUT));
+        for (Map.Entry<Type, List<DefinedParamType>> type : inputHintsMap.entrySet()) {
+            socketHintDeclarations.add(new SocketHintDeclaration(collector, type.getKey(), type.getValue(), DefinedParamType.DefinedParamDirection.INPUT));
         }
-        for (Type type : outputHintsMap.keySet()) {
-            socketHintDeclarations.add(new SocketHintDeclaration(collector, type, outputHintsMap.get(type), DefinedParamType.DefinedParamDirection.OUTPUT));
+        for (Map.Entry<Type, List<DefinedParamType>> type : outputHintsMap.entrySet()) {
+            socketHintDeclarations.add(new SocketHintDeclaration(collector, type.getKey(), type.getValue(), DefinedParamType.DefinedParamDirection.OUTPUT));
         }
         return socketHintDeclarations;
     }

core/src/main/java/edu/wpi/grip/core/Connection.java

@@ -72,15 +72,15 @@ public void onConnectionRemoved(ConnectionRemovedEvent e) {
     @Subscribe
     public void removeConnection(StepRemovedEvent e) {
         // Remove this connection if one of the steps it was connected to was removed
-        for (Socket socket : e.getStep().getOutputSockets()) {
-            if (socket == this.inputSocket || socket == this.outputSocket) {
+        for (OutputSocket socket : e.getStep().getOutputSockets()) {
+            if (socket == this.outputSocket) {
                 this.eventBus.post(new ConnectionRemovedEvent(this));
                 return;
             }
         }
 
-        for (Socket socket : e.getStep().getInputSockets()) {
-            if (socket == this.inputSocket || socket == this.outputSocket) {
+        for (InputSocket socket : e.getStep().getInputSockets()) {
+            if (socket == this.inputSocket) {
                 this.eventBus.post(new ConnectionRemovedEvent(this));
                 return;
             }

core/src/main/java/edu/wpi/grip/core/serialization/Project.java

@@ -1,6 +1,6 @@
 package edu.wpi.grip.core.serialization;
 
-import com.google.common.eventbus.EventBus;
+import com.google.common.annotations.VisibleForTesting;
 import com.thoughtworks.xstream.XStream;
 import edu.wpi.grip.core.*;
 import edu.wpi.grip.core.sources.CameraSource;
@@ -10,6 +10,7 @@
 import javax.inject.Inject;
 import javax.inject.Singleton;
 import java.io.*;
+import java.nio.charset.StandardCharsets;
 import java.util.Optional;
 
 /**
@@ -18,12 +19,8 @@
 @Singleton
 public class Project {
 
-    @Inject
-    private EventBus eventBus;
     @Inject
     private Pipeline pipeline;
-    @Inject
-    private Palette palette;
 
     protected final XStream xstream = new XStream();
     private Optional<File> file = Optional.empty();
@@ -59,11 +56,14 @@ public void setFile(Optional<File> file) {
      * Load the project from a file
      */
     public void open(File file) throws IOException {
-        this.open(new FileReader(file));
+        try (final InputStreamReader reader = new InputStreamReader(new FileInputStream(file), StandardCharsets.UTF_8)) {
+            this.open(reader);
+        }
         this.file = Optional.of(file);
     }
 
-    public void open(Reader reader) {
+    @VisibleForTesting
+    void open(Reader reader) {
         this.pipeline.clear();
         this.xstream.fromXML(reader);
     }
@@ -72,7 +72,9 @@ public void open(Reader reader) {
      * Save the project to a file
      */
     public void save(File file) throws IOException {
-        this.save(new FileWriter(file));
+        try (final Writer writer = new OutputStreamWriter(new FileOutputStream(file), StandardCharsets.UTF_8)) {
+            this.save(writer);
+        }
         this.file = Optional.of(file);
     }
 

core/src/main/java/edu/wpi/grip/core/serialization/SocketConverter.java

@@ -101,15 +101,15 @@ public Object unmarshal(HierarchicalStreamReader reader, UnmarshallingContext co
             // (such as connections) can reference sockets in the pipeline.
             Socket socket;
             if (reader.getAttribute(STEP_ATTRIBUTE) != null) {
-                final int stepIndex = Integer.valueOf(reader.getAttribute(STEP_ATTRIBUTE));
-                final int socketIndex = Integer.valueOf(reader.getAttribute(SOCKET_ATTRIBUTE));
+                final int stepIndex = Integer.parseInt(reader.getAttribute(STEP_ATTRIBUTE));
+                final int socketIndex = Integer.parseInt(reader.getAttribute(SOCKET_ATTRIBUTE));
 
                 final Step step = pipeline.getSteps().get(stepIndex);
                 socket = direction == Socket.Direction.INPUT ?
                         step.getInputSockets()[socketIndex] : step.getOutputSockets()[socketIndex];
             } else if (reader.getAttribute(SOURCE_ATTRIBUTE) != null) {
-                final int sourceIndex = Integer.valueOf(reader.getAttribute(SOURCE_ATTRIBUTE));
-                final int socketIndex = Integer.valueOf(reader.getAttribute(SOCKET_ATTRIBUTE));
+                final int sourceIndex = Integer.parseInt(reader.getAttribute(SOURCE_ATTRIBUTE));
+                final int socketIndex = Integer.parseInt(reader.getAttribute(SOCKET_ATTRIBUTE));
 
                 final Source source = pipeline.getSources().get(sourceIndex);
                 socket = source.getOutputSockets()[socketIndex];
@@ -118,7 +118,7 @@ public Object unmarshal(HierarchicalStreamReader reader, UnmarshallingContext co
             }
 
             if (socket.getDirection() == Socket.Direction.OUTPUT) {
-                ((OutputSocket) socket).setPreviewed(Boolean.valueOf(reader.getAttribute(PREVIEWED_ATTRIBUTE)));
+                ((OutputSocket) socket).setPreviewed(Boolean.parseBoolean(reader.getAttribute(PREVIEWED_ATTRIBUTE)));
             }
 
             if (reader.hasMoreChildren()) {
@@ -134,7 +134,7 @@ public Object unmarshal(HierarchicalStreamReader reader, UnmarshallingContext co
             reader.moveUp();
 
             return socket;
-        } catch (Exception e) {
+        } catch (RuntimeException e) {
             throw new ConversionException("Error deserializing socket", e);
         }
     }

core/src/main/java/edu/wpi/grip/core/sources/CameraSource.java

@@ -176,7 +176,7 @@ public FrameGrabber create(String addressProperty) throws MalformedURLException
         final String addressProperty = properties.getProperty(ADDRESS_PROPERTY);
 
         if (deviceNumberProperty != null) {
-            final int deviceNumber = Integer.valueOf(deviceNumberProperty);
+            final int deviceNumber = Integer.parseInt(deviceNumberProperty);
             this.name = "Webcam " + deviceNumber;
             this.grabberSupplier = () -> grabberFactory.create(deviceNumber);
         } else if (addressProperty != null) {

core/src/main/java/edu/wpi/grip/core/sources/MultiImageFileSource.java

@@ -196,11 +196,11 @@ private static Mat[] createImagesArray(List<String> paths) throws IOException {
     }
 
     private static int sizeFromProperties(Properties properties) {
-        return Integer.valueOf(properties.getProperty(SIZE_PROPERTY));
+        return Integer.parseInt(properties.getProperty(SIZE_PROPERTY));
     }
 
     private static int indexFromProperties(Properties properties) {
-        return Integer.valueOf(properties.getProperty(INDEX_PROPERTY));
+        return Integer.parseInt(properties.getProperty(INDEX_PROPERTY));
     }
 
     private static String[] pathsFromProperties(Properties properties) {

core/src/main/java/edu/wpi/grip/core/util/SafeShutdown.java

@@ -19,7 +19,7 @@ public final class SafeShutdown {
         Runtime.getRuntime().addShutdownHook(new Thread() {
             @Override
             public void run() {
-                stopping = true;
+                SafeShutdown.stopping = true;
             }
         });
     }

ui/src/main/java/edu/wpi/grip/ui/DeployController.java

@@ -33,6 +33,7 @@
 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;
@@ -50,23 +51,39 @@ public class DeployController {
     private final static URL LOCAL_GRIP_URL = Project.class.getProtectionDomain().getCodeSource().getLocation();
     private final static String LOCAL_GRIP_PATH = URLDecoder.decode(LOCAL_GRIP_URL.getPath());
 
-    @FXML private TextField address;
-    @FXML private TextField user;
-    @FXML private TextField password;
-    @FXML private TextField javaHome;
-    @FXML private TextField jvmArgs;
-    @FXML private TextField deployDir;
-    @FXML private TextField projectFile;
-    @FXML private ProgressIndicator progress;
-    @FXML private Label status;
-    @FXML private TextArea console;
-    @FXML private BooleanProperty deploying;
-    @FXML private StringProperty command;
-
-    @Inject private EventBus eventBus;
-    @Inject private Project project;
-    @Inject private Pipeline pipeline;
-    @Inject private Logger logger;
+    @FXML
+    private TextField address;
+    @FXML
+    private TextField user;
+    @FXML
+    private TextField password;
+    @FXML
+    private TextField javaHome;
+    @FXML
+    private TextField jvmArgs;
+    @FXML
+    private TextField deployDir;
+    @FXML
+    private TextField projectFile;
+    @FXML
+    private ProgressIndicator progress;
+    @FXML
+    private Label status;
+    @FXML
+    private TextArea console;
+    @FXML
+    private BooleanProperty deploying;
+    @FXML
+    private StringProperty command;
+
+    @Inject
+    private EventBus eventBus;
+    @Inject
+    private Project project;
+    @Inject
+    private Pipeline pipeline;
+    @Inject
+    private Logger logger;
 
     private Optional<Thread> deployThread = Optional.empty();
 
@@ -164,9 +181,12 @@ public StreamCopier.Listener file(String name, long size) {
             // Upload the core GRIP JAR only if there isn't already one with the same hash on the robot.  This prevents
             // us from redundantly deploying the same JAR over and over again (so deploy times after the first are
             // much faster), while still ensuring that the JAR is deployed if it has to be.
-            try (Session session = ssh.startSession()) {
-                Session.Command md5Cmd = session.exec("md5sum " + pathStr + GRIP_JAR);
-                String remoteMd5Sum = new DataInputStream(md5Cmd.getInputStream()).readLine();
+            try (Session session = ssh.startSession()) { // SSH doesn't store a reference to the 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();
+                }
                 String localMd5Sum = Resources.asByteSource(LOCAL_GRIP_URL).hash(Hashing.md5()).toString();
 
                 // If the MD5 sum doesn't match up or there's any kind of error (there isn't a JAR there, etc...),
@@ -195,18 +215,21 @@ public StreamCopier.Listener file(String name, long size) {
             setStatusAsync("Running GRIP", false);
             logger.info("Running " + commandStr);
 
-            Session session = ssh.startSession();
-            session.allocateDefaultPTY();
-            Session.Command cmd = session.exec(String.format("'%s/%s'", pathStr, GRIP_WRAPPER));
+            try (Session session = ssh.startSession()) {
+                session.allocateDefaultPTY();
+                Session.Command cmd = session.exec(String.format("'%s/%s'", pathStr, GRIP_WRAPPER));
+
+                try (final InputStreamReader reader = new InputStreamReader(cmd.getInputStream(), StandardCharsets.UTF_8)) {
+                    final LineReader inputReader = new LineReader(reader);
+                    while (isNotCanceled()) {
+                        String line = inputReader.readLine();
+                        if (line == null) {
+                            return;
+                        }
 
-            LineReader inputReader = new LineReader(new InputStreamReader(cmd.getInputStream()));
-            while (isNotCanceled()) {
-                String line = inputReader.readLine();
-                if (line == null) {
-                    return;
+                        Platform.runLater(() -> console.setText(console.getText() + line + "\n"));
+                    }
                 }
-
-                Platform.runLater(() -> console.setText(console.getText() + line + "\n"));
             }
         } catch (UnknownHostException e) {
             setStatusAsync("Unknown host: " + address.getText(), true);