fix findbugs error about using Beta guava api

zanata · Sep 24, 2014 · a098ae6 · a098ae6
1 parent 074630e
commit a098ae6
Show file tree

Hide file tree

Showing 5 changed files with 22 additions and 31 deletions.
diff --git a/zanata-client-commands/src/main/java/org/zanata/client/commands/UpdateChecker.java b/zanata-client-commands/src/main/java/org/zanata/client/commands/UpdateChecker.java
@@ -20,6 +20,7 @@
  */
 package org.zanata.client.commands;
 
+import java.io.BufferedWriter;
 import java.io.File;
 import java.io.FileReader;
 import java.io.IOException;
@@ -30,6 +31,7 @@
 import javax.ws.rs.client.WebTarget;
 import javax.ws.rs.core.Response;
 
+import org.apache.commons.io.output.FileWriterWithEncoding;
 import org.fedorahosted.openprops.Properties;
 import org.joda.time.DateTime;
 import org.joda.time.Days;
@@ -41,7 +43,6 @@
 import com.google.common.annotations.VisibleForTesting;
 import com.google.common.base.Charsets;
 import com.google.common.base.Optional;
-import com.google.common.io.Files;
 
 import static org.zanata.client.commands.ConsoleInteractorImpl.*;
 import static org.zanata.client.commands.Messages._;
@@ -155,7 +156,8 @@ private static void createUpdateMarkerFile(File updateMarker)
         props.setProperty(FREQUENCY, "weekly");
         props.setProperty(NO_ASKING, "true");
         props.setComment(NO_ASKING, _("no.check.update.prompt"));
-        props.store(Files.newWriter(updateMarker, Charsets.UTF_8), null);
+        props.store(new BufferedWriter(new FileWriterWithEncoding(updateMarker,
+                Charsets.UTF_8)), null);
     }
 
     public void checkNewerVersion() {
@@ -172,7 +174,8 @@ public void checkNewerVersion() {
             Properties props = loadFileToProperties(updateMarker);
             String today = DATE_FORMATTER.print(new DateTime());
             props.setProperty(LAST_CHECKED, today);
-            props.store(Files.newWriter(updateMarker, Charsets.UTF_8), null);
+            props.store(new BufferedWriter(new FileWriterWithEncoding(
+                    updateMarker, Charsets.UTF_8)), null);
         }
         catch (IOException e) {
             log.warn("failed to load file {}", updateMarker);

diff --git a/zanata-client-commands/src/main/java/org/zanata/client/commands/init/InitCommand.java b/zanata-client-commands/src/main/java/org/zanata/client/commands/init/InitCommand.java
@@ -20,7 +20,13 @@
  */
 package org.zanata.client.commands.init;
 
-import java.io.BufferedWriter;
+import static org.apache.commons.io.Charsets.UTF_8;
+import static org.zanata.client.commands.ConsoleInteractor.DisplayMode.Confirmation;
+import static org.zanata.client.commands.ConsoleInteractor.DisplayMode.Hint;
+import static org.zanata.client.commands.ConsoleInteractor.DisplayMode.Question;
+import static org.zanata.client.commands.ConsoleInteractor.DisplayMode.Warning;
+import static org.zanata.client.commands.Messages._;
+
 import java.io.File;
 import java.io.IOException;
 import java.net.URL;
@@ -31,6 +37,7 @@
 import javax.xml.bind.Unmarshaller;
 
 import org.apache.commons.configuration.ConfigurationException;
+import org.apache.commons.io.FileUtils;
 import org.apache.log4j.Level;
 import org.apache.log4j.LogManager;
 import org.jboss.resteasy.client.ClientResponse;
@@ -46,16 +53,8 @@
 import org.zanata.rest.client.ZanataProxyFactory;
 
 import com.google.common.annotations.VisibleForTesting;
-import com.google.common.base.Charsets;
 import com.google.common.base.Preconditions;
 import com.google.common.base.Strings;
-import com.google.common.io.Files;
-
-import static org.zanata.client.commands.ConsoleInteractor.DisplayMode.Confirmation;
-import static org.zanata.client.commands.ConsoleInteractor.DisplayMode.Hint;
-import static org.zanata.client.commands.ConsoleInteractor.DisplayMode.Question;
-import static org.zanata.client.commands.ConsoleInteractor.DisplayMode.Warning;
-import static org.zanata.client.commands.Messages._;
 
 /**
  * @author Patrick Huang <a
@@ -250,13 +249,9 @@ protected void downloadZanataXml(String projectId, String iterationId,
                 "Can not create %s. Make sure permission is writable.",
                 configFileDest);
 
-        BufferedWriter writer =
-                Files.newWriter(configFileDest, Charsets.UTF_8);
         String content = (String) response.getEntity(String.class);
         log.debug("project config from the server:\n{}", content);
-        writer.write(content);
-        writer.flush();
-        writer.close();
+        FileUtils.write(configFileDest, content, UTF_8);
         getOpts().setProjectConfig(configFileDest);
 
     }

diff --git a/...a-client-commands/src/main/java/org/zanata/client/commands/init/ProjectConfigHandler.java b/...a-client-commands/src/main/java/org/zanata/client/commands/init/ProjectConfigHandler.java
@@ -25,9 +25,9 @@
 import java.text.SimpleDateFormat;
 import java.util.Date;
 
+import org.apache.commons.io.FileUtils;
 import org.zanata.client.commands.ConsoleInteractor;
 import com.google.common.annotations.VisibleForTesting;
-import com.google.common.io.Files;
 
 import static org.zanata.client.commands.ConsoleInteractor.DisplayMode.Confirmation;
 import static org.zanata.client.commands.ConsoleInteractor.DisplayMode.Question;
@@ -67,7 +67,7 @@ protected void handleExistingProjectConfig() throws IOException {
                     new Date());
             backup = new File(projectConfig.getParent(),
                     "zanata.xml." + suffix);
-            Files.move(projectConfig, backup);
+            FileUtils.moveFile(projectConfig, backup);
             consoleInteractor
                     .printfln(Confirmation, _("backup.old.project.config"), backup);
 

diff --git a/zanata-client-commands/src/main/java/org/zanata/client/config/ZanataConfig.java b/zanata-client-commands/src/main/java/org/zanata/client/config/ZanataConfig.java
@@ -58,7 +58,7 @@ public class ZanataConfig implements Serializable {
     private String includes;
     private String excludes;
     private List<CommandHook> hooks = new ArrayList<CommandHook>();
-    private Splitter splitter = Splitter.on(",").omitEmptyStrings()
+    private transient Splitter splitter = Splitter.on(",").omitEmptyStrings()
             .trimResults();
 
     public ZanataConfig() {

diff --git a/zanata-client-commands/src/test/java/org/zanata/client/commands/init/InitCommandTest.java b/zanata-client-commands/src/test/java/org/zanata/client/commands/init/InitCommandTest.java
@@ -4,23 +4,21 @@
 import static org.mockito.Mockito.when;
 import static org.zanata.client.commands.HTTPMockContainer.Builder.readFromClasspath;
 
-import java.io.BufferedWriter;
 import java.io.File;
 import java.io.IOException;
 import java.net.InetSocketAddress;
 import java.net.URI;
 import java.util.List;
 
+import org.apache.commons.io.FileUtils;
 import org.hamcrest.Matchers;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.rules.ExpectedException;
 import org.junit.rules.TemporaryFolder;
-import org.mockito.Answers;
 import org.mockito.Mock;
-import org.mockito.Mockito;
 import org.mockito.MockitoAnnotations;
 import org.simpleframework.http.core.Container;
 import org.simpleframework.http.core.ContainerServer;
@@ -35,7 +33,6 @@
 
 import com.google.common.base.Charsets;
 import com.google.common.base.Joiner;
-import com.google.common.io.Files;
 
 public class InitCommandTest {
     private static final Logger log =
@@ -101,7 +98,7 @@ public void willDownloadProjectConfigFromServer() throws IOException {
         command.downloadZanataXml("gcc", "master", configFileDest);
 
         assertThat(configFileDest.exists(), Matchers.is(true));
-        List<String> lines = Files.readLines(configFileDest, Charsets.UTF_8);
+        List<String> lines = FileUtils.readLines(configFileDest, Charsets.UTF_8);
         String content = Joiner.on("\n").join(lines);
         assertThat(content, Matchers.equalTo(configContent));
         assertThat(opts.getProjectConfig(), Matchers.equalTo(configFileDest));
@@ -111,16 +108,12 @@ public void willDownloadProjectConfigFromServer() throws IOException {
     public void willWriteSrcDirIncludesExcludesToConfigFile() throws Exception {
         File configFile = new File(tempFolder.getRoot(), "zanata.xml");
         configFile.createNewFile();
-        BufferedWriter writer =
-                Files.newWriter(configFile, Charsets.UTF_8);
-        writer.write(readFromClasspath("serverresponse/projectConfig.xml"));
-        writer.flush();
-        writer.close();
+        FileUtils.write(configFile, readFromClasspath("serverresponse/projectConfig.xml"), Charsets.UTF_8);
 
         command.writeToConfig(new File("pot"), null, "", new File("po"),
                 configFile);
 
-        List<String> lines = Files.readLines(configFile, Charsets.UTF_8);
+        List<String> lines = FileUtils.readLines(configFile, Charsets.UTF_8);
         StringBuilder content = new StringBuilder();
         for (String line : lines) {
             log.debug(line);