Replace most usages of commons-lang/commons-io with guava

Author: StevenGBrown

src/main/java/hudson/plugins/timestamper/Timestamp.java

@@ -27,10 +27,10 @@
 
 import java.util.Date;
 
-import org.apache.commons.lang.builder.ToStringBuilder;
-import org.apache.commons.lang.builder.ToStringStyle;
 import org.apache.commons.lang.time.FastDateFormat;
 
+import com.google.common.base.Objects;
+
 /**
  * A time-stamp, consisting of the elapsed time and the clock time.
  * 
@@ -96,10 +96,8 @@ public void markup(MarkupText text, String timestampFormat) {
    */
   @Override
   public int hashCode() {
-    int result = 17;
-    result = 37 * result + (int) (elapsedMillis ^ (elapsedMillis >>> 32));
-    result = 37 * result + (int) (millisSinceEpoch ^ (millisSinceEpoch >>> 32));
-    return result;
+    return Objects.hashCode(Long.valueOf(elapsedMillis),
+        Long.valueOf(millisSinceEpoch));
   }
 
   /**
@@ -120,8 +118,7 @@ public boolean equals(Object obj) {
    */
   @Override
   public String toString() {
-    return new ToStringBuilder(this, ToStringStyle.SHORT_PREFIX_STYLE)
-        .append("elapsedMillis", elapsedMillis)
-        .append("millisSinceEpoch", millisSinceEpoch).toString();
+    return Objects.toStringHelper(this).add("elapsedMillis", elapsedMillis)
+        .add("millisSinceEpoch", millisSinceEpoch).toString();
   }
 }

src/main/java/hudson/plugins/timestamper/TimestamperConfig.java

@@ -29,9 +29,9 @@
 import jenkins.model.GlobalConfiguration;
 import net.sf.json.JSONObject;
 
-import org.codehaus.plexus.util.StringUtils;
 import org.kohsuke.stapler.StaplerRequest;
 
+import com.google.common.base.Objects;
 import com.google.common.base.Supplier;
 
 /**
@@ -74,7 +74,7 @@ public TimestamperConfig() {
    * @return the time-stamp format
    */
   public String getTimestampFormat() {
-    return StringUtils.defaultString(timestampFormat, DEFAULT_TIMESTAMP_FORMAT);
+    return Objects.firstNonNull(timestampFormat, DEFAULT_TIMESTAMP_FORMAT);
   }
 
   /**

src/main/java/hudson/plugins/timestamper/TimestampsIO.java

@@ -41,8 +41,8 @@
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
-import org.apache.commons.io.FileUtils;
-import org.apache.commons.io.IOUtils;
+import com.google.common.io.Closeables;
+import com.google.common.io.Files;
 
 /**
  * Allows the time-stamps for a build to be written to disk and read back again.
@@ -188,7 +188,7 @@ private void writeVarint(long value) throws IOException {
     private void writeBufferTo(File file) throws IOException {
       FileOutputStream outputStream = outputStreams.get(file);
       if (outputStream == null) {
-        FileUtils.forceMkdir(file.getParentFile());
+        Files.createParentDirs(file);
         outputStream = new FileOutputStream(file);
         outputStreams.put(file, outputStream);
       }
@@ -202,7 +202,7 @@ private void writeBufferTo(File file) throws IOException {
      */
     void close() {
       for (FileOutputStream outputStream : outputStreams.values()) {
-        IOUtils.closeQuietly(outputStream);
+        Closeables.closeQuietly(outputStream);
       }
     }
   }
@@ -281,7 +281,7 @@ public Timestamp find(long consoleFilePointerToFind, Run<?, ?> build)
           }
         }
       } finally {
-        IOUtils.closeQuietly(logInputStream);
+        Closeables.closeQuietly(logInputStream);
       }
     }
 
@@ -345,7 +345,7 @@ public byte readByte() throws IOException {
         long shift = readVarint(byteReader);
         timeShifts.put(Long.valueOf(entry), Long.valueOf(shift));
       } finally {
-        IOUtils.closeQuietly(inputStream);
+        Closeables.closeQuietly(inputStream);
       }
       return timeShifts;
     }

src/main/java/hudson/plugins/timestamper/action/TimestampsAction.java

@@ -37,11 +37,12 @@
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
-import org.apache.commons.io.IOUtils;
-import org.apache.commons.lang.StringUtils;
 import org.kohsuke.stapler.StaplerRequest;
 import org.kohsuke.stapler.StaplerResponse;
 
+import com.google.common.base.Strings;
+import com.google.common.io.Closeables;
+
 /**
  * Action which serves a page of timestamps. The format of this page will not
  * change, so it can be safely parsed by scripts.
@@ -142,7 +143,7 @@ private int getPrecision(StaplerRequest request) {
     if ("nanoseconds".equalsIgnoreCase(precision)) {
       return 9;
     }
-    if (StringUtils.isNotEmpty(precision)) {
+    if (!Strings.isNullOrEmpty(precision)) {
       try {
         int intPrecision = Integer.parseInt(precision);
         if (intPrecision < 0) {
@@ -190,7 +191,7 @@ private void writeConsoleNotes(PrintWriter writer, int precision)
         }
       }
     } finally {
-      IOUtils.closeQuietly(dataInputStream);
+      Closeables.closeQuietly(dataInputStream);
     }
   }
 
@@ -204,7 +205,7 @@ private String formatTimestamp(Timestamp timestamp, int precision) {
     if (precision <= 3) {
       fractional = fractional.substring(0, precision);
     } else if (precision > 3) {
-      fractional += StringUtils.repeat("0", precision - 3);
+      fractional += Strings.repeat("0", precision - 3);
     }
     return String.valueOf(seconds) + "." + fractional + "\n";
   }

src/test/java/hudson/plugins/timestamper/TimestampTest.java

@@ -37,6 +37,7 @@
 import java.util.TimeZone;
 
 import nl.jqno.equalsverifier.EqualsVerifier;
+import nl.jqno.equalsverifier.Warning;
 
 import org.junit.AfterClass;
 import org.junit.Before;
@@ -129,7 +130,8 @@ public void testAntTargetNoteThenTimestamp() {
    */
   @Test
   public void testHashcodeAndEquals() {
-    EqualsVerifier.forClass(Timestamp.class).verify();
+    EqualsVerifier.forClass(Timestamp.class)
+        .suppress(Warning.STRICT_INHERITANCE).verify();
   }
 
   private MarkupText markup(String text, long millisSinceEpoch) {