Code clean up to use braces and java 7 features

Author: shs96c

java/client/src/org/openqa/selenium/firefox/internal/ClasspathExtension.java

@@ -17,7 +17,6 @@
 
 package org.openqa.selenium.firefox.internal;
 
-import com.google.common.io.Closeables;
 import com.google.common.io.Resources;
 
 import org.openqa.selenium.WebDriverException;
@@ -53,13 +52,9 @@ public void writeTo(File extensionsDir) throws IOException {
     }
 
     URL resourceUrl = Resources.getResource(loadResourcesUsing, loadFrom);
-    OutputStream stream = null;
 
-    try {
-      stream = new FileOutputStream(extractedXpi);
+    try (OutputStream stream = new FileOutputStream(extractedXpi)){
       Resources.copy(resourceUrl, stream);
-    } finally {
-      Closeables.close(stream, false);
     }
     new FileExtension(extractedXpi).writeTo(extensionsDir);
   }

java/client/src/org/openqa/selenium/firefox/internal/FileExtension.java

@@ -35,6 +35,7 @@
 import java.io.FileReader;
 import java.io.IOException;
 import java.io.Reader;
+import java.io.UncheckedIOException;
 import java.util.Iterator;
 import java.util.Map;
 
@@ -98,23 +99,22 @@ private String getExtensionId(File root) {
     File manifestJson = new File(root, "manifest.json");
     File installRdf = new File(root, "install.rdf");
 
-    if (installRdf.exists())
+    if (installRdf.exists()) {
       return readIdFromInstallRdf(root);
-    else if (manifestJson.exists())
+    } else if (manifestJson.exists()) {
       return readIdFromManifestJson(root);
-    else
+    } else {
       throw new WebDriverException(
-        "Extension should contain either install.rdf or manifest.json metadata file");
-
+          "Extension should contain either install.rdf or manifest.json metadata file");
+    }
   }
 
   private String readIdFromManifestJson(File root) {
     final String MANIFEST_JSON_FILE = "manifest.json";
     File manifestJsonFile = new File(root, MANIFEST_JSON_FILE);
-    try {
+    try (Reader reader = new FileReader(manifestJsonFile);
+         JsonInput json = new Json().newInput(reader)) {
       String addOnId = null;
-      Reader reader = new FileReader(manifestJsonFile);
-      JsonInput json = new Json().newInput(reader);
 
       Map<String, Object> manifestObject = json.read(MAP_TYPE);
       if (manifestObject.get("applications") instanceof Map) {
@@ -135,6 +135,8 @@ private String readIdFromManifestJson(File root) {
       return addOnId;
     } catch (FileNotFoundException e1) {
       throw new WebDriverException("Unable to file manifest.json in xpi file");
+    } catch (IOException e) {
+      throw new UncheckedIOException(e);
     }
   }