fix: remove commons io dependency (#113)

* remove commons-io dependency * remove guava * remove commons-io dependency * format
googleapis · Mar 16, 2021 · 4cf5185 · 4cf5185
1 parent 3c91622
commit 4cf5185
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 17 deletions.
diff --git a/pom.xml b/pom.xml
@@ -95,12 +95,5 @@
       <artifactId>commons-compress</artifactId>
       <version>1.20</version>
     </dependency>
-
-    <!-- pin at 2.6 for jdk 7 compatibility-->
-    <dependency>
-      <groupId>commons-io</groupId>
-      <artifactId>commons-io</artifactId>
-      <version>2.6</version>
-    </dependency>
   </dependencies>
 </project>
diff --git a/src/main/java/com/google/cloud/DownloadComponentsMojo.java b/src/main/java/com/google/cloud/DownloadComponentsMojo.java
@@ -53,7 +53,6 @@
 import org.apache.commons.compress.compressors.gzip.GzipCompressorInputStream;
 import org.apache.commons.compress.utils.IOUtils;
 import org.apache.commons.compress.utils.Lists;
-import org.apache.commons.io.FileUtils;
 import org.apache.maven.execution.MavenSession;
 import org.apache.maven.plugin.AbstractMojo;
 import org.apache.maven.plugin.MojoExecutionException;
@@ -242,15 +241,14 @@ private void updateCachedManifest() throws IOException {
     @SuppressWarnings("unused")
     boolean ignored = localCache.delete();
 
-    FileUtils.moveFile(tempFile, localCache);
+    Files.move(tempFile.toPath(), localCache.toPath());
   }
 
   /** Parse the locally cached manifest and extract the relevant components. */
   private List<Component> parseManifest() throws IOException {
-    JsonParser parser = new JsonParser();
     JsonElement json;
     try (FileReader reader = new FileReader(getManifestCache())) {
-      json = parser.parse(reader);
+      json = JsonParser.parseReader(reader);
     }
 
     JsonArray jsonComponents = json.getAsJsonObject().get("components").getAsJsonArray();
@@ -274,10 +272,9 @@ private Map<String, String> parseLocalChecksums() throws IOException {
     JsonElement json = new JsonObject();
 
     if (getChecksumFile().exists()) {
-      JsonParser parser = new JsonParser();
 
       try (FileReader reader = new FileReader(getChecksumFile())) {
-        json = parser.parse(reader);
+        json = JsonParser.parseReader(reader);
       }
     }
 
@@ -366,8 +363,18 @@ private void downloadComponent(Component component) throws IOException, NoSuchAl
 
     // Move it into place
     File localPath = getComponentPath(component);
-    FileUtils.deleteDirectory(localPath);
-    FileUtils.moveDirectory(tmpPath, localPath);
+    deleteRecursively(localPath);
+    Files.move(tmpPath.toPath(), localPath.toPath());
+  }
+
+  private static void deleteRecursively(File directory) {
+    File[] contents = directory.listFiles();
+    if (contents != null) {
+      for (File file : contents) {
+        deleteRecursively(file);
+      }
+    }
+    directory.delete();
   }
 
   private static String byteArrayToHex(byte[] a) {
@@ -386,9 +393,8 @@ private void writeLocalChecksums(List<Component> components) throws IOException
     JsonObject results = new JsonObject();
 
     try {
-      JsonParser parser = new JsonParser();
       try (FileReader reader = new FileReader(getChecksumFile())) {
-        results = parser.parse(reader).getAsJsonObject();
+        results = JsonParser.parseReader(reader).getAsJsonObject();
       }
     } catch (FileNotFoundException e) {
       // ignored