Remove Guava dependency

Author: bkromhout

README.md

@@ -2,9 +2,13 @@ A fork of [java-diff-utils](https://code.google.com/p/java-diff-utils/)
 
 # Changelog
 
+## 2.1.0
+
+- Removes the dependency on Guava
+
 ## 2.0.0
 
-- Change groupId and artifactId to prevent conflit with origin library: now 'com.github.java-diff-utils:java-diff-utils' instead of 'jp.skypencil.java-diff-utils:diffutils'
+- Change groupId and artifactId to prevent conflict with origin library: now 'com.github.java-diff-utils:java-diff-utils' instead of 'jp.skypencil.java-diff-utils:diffutils'
 - Adds the ability to differentiate the inserted and deleted tags and class-names in inline-diff
 - Default class-name is now `null` for deleted and inserted data, and "`change`" for change data
 - Default tag for deleted data is `del`

build.gradle

@@ -34,7 +34,6 @@ repositories {
 }
 
 dependencies {
-    compile group: 'com.google.guava', name: 'guava', version:'18.0'
     compile group: 'com.google.code.findbugs', name: 'jsr305', version:'3.0.0'
     testCompile group: 'org.hamcrest', name: 'hamcrest-library', version:'1.3'
     testCompile group: 'junit', name: 'junit', version:'4.12'

src/main/java/difflib/ChangeDelta.java

@@ -19,24 +19,22 @@
 
 /**
  * Describes the change-delta between original and revised texts.
- * 
- * @author <a href="[email protected]">Dmitry Naumenko</a>
  * @param T The type of the compared elements in the 'lines'.
+ * @author <a href="[email protected]">Dmitry Naumenko</a>
  */
 public class ChangeDelta<T> extends Delta<T> {
-    
+
     /**
      * Creates a change delta with the two given chunks.
      * @param original The original chunk. Must not be {@code null}.
-     * @param revised The original chunk. Must not be {@code null}.
+     * @param revised  The original chunk. Must not be {@code null}.
      */
-    public ChangeDelta(Chunk<T> original, Chunk<T>revised) {
-    	super(original, revised);
+    public ChangeDelta(Chunk<T> original, Chunk<T> revised) {
+        super(original, revised);
     }
-    
+
     /**
      * {@inheritDoc}
-     * 
      * @throws PatchFailedException
      */
     @Override
@@ -53,7 +51,7 @@ public void applyTo(List<T> target) throws PatchFailedException {
             i++;
         }
     }
-    
+
     /**
      * {@inheritDoc}
      */
@@ -70,7 +68,7 @@ public void restore(List<T> target) {
             i++;
         }
     }
-    
+
     /**
      * {@inheritDoc}
      */
@@ -81,7 +79,7 @@ public void verify(List<T> target) throws PatchFailedException {
                     + "delta original position > target size");
         }
     }
-    
+
     @Override
     public String toString() {
         return "[ChangeDelta, position: " + getOriginal().getPosition() + ", lines: "

src/main/java/difflib/Chunk.java

@@ -15,66 +15,48 @@
  */
 package difflib;
 
-import static com.google.common.base.Preconditions.checkArgument;
-
+import javax.annotation.Nonnegative;
 import java.util.Arrays;
 import java.util.List;
 
-import javax.annotation.Nonnegative;
-
 /**
- * Holds the information about the part of text involved in the diff process
- * 
- * <p>
- * Text is represented as <code>Object[]</code> because the diff engine is
- * capable of handling more than plain ascci. In fact, arrays or lists of any
- * type that implements {@link java.lang.Object#hashCode hashCode()} and
- * {@link java.lang.Object#equals equals()} correctly can be subject to
- * differencing using this library.
- * </p>
- * 
- * @author <a href="[email protected]>Dmitry Naumenko</a>
+ * Holds the information about the part of text involved in the diff process <p> Text is represented as
+ * <code>Object[]</code> because the diff engine is capable of handling more than plain ascci. In fact, arrays or lists
+ * of any type that implements {@link java.lang.Object#hashCode hashCode()} and {@link java.lang.Object#equals equals()}
+ * correctly can be subject to differencing using this library. </p>
  * @param T The type of the compared elements in the 'lines'.
+ * @author <a href="[email protected]>Dmitry Naumenko</a>
  */
 public class Chunk<T> {
     @Nonnegative
     private final int position;
     private List<T> lines;
-    
+
     /**
      * Creates a chunk and saves a copy of affected lines
-     * 
-     * @param position
-     *            the start position
-     * @param lines
-     *            the affected lines
+     * @param position the start position
+     * @param lines    the affected lines
      */
     public Chunk(@Nonnegative int position, List<T> lines) {
-        checkArgument(position >= 0);
+        if (position < 0) throw new IllegalArgumentException();
         this.position = position;
         this.lines = lines;
     }
-    
+
     /**
      * Creates a chunk and saves a copy of affected lines
-     * 
-     * @param position
-     *            the start position (zero-based numbering)
-     * @param lines
-     *            the affected lines
+     * @param position the start position (zero-based numbering)
+     * @param lines    the affected lines
      */
     public Chunk(@Nonnegative int position, T[] lines) {
-        checkArgument(position >= 0);
+        if (position < 0) throw new IllegalArgumentException();
         this.position = position;
         this.lines = Arrays.asList(lines);
     }
-    
+
     /**
-     * Verifies that this chunk's saved text matches the corresponding text in
-     * the given sequence.
-     * 
-     * @param target
-     *            the sequence to verify against.
+     * Verifies that this chunk's saved text matches the corresponding text in the given sequence.
+     * @param target the sequence to verify against.
      */
     public void verify(List<T> target) throws PatchFailedException {
         if (last() > target.size()) {
@@ -87,7 +69,7 @@ public void verify(List<T> target) throws PatchFailedException {
             }
         }
     }
-    
+
     /**
      * @return the start position of chunk in the text (zero-based numbering)
      */
@@ -111,15 +93,15 @@ public List<T> getLines() {
     public int size() {
         return lines.size();
     }
-    
+
     /**
      * Returns the index of the last line of the chunk. (zero-based numbering)
      */
     @Nonnegative
     public int last() {
         return getPosition() + size() - 1;
     }
-    
+
     /*
      * (non-Javadoc)
      * 
@@ -134,7 +116,7 @@ public int hashCode() {
         result = prime * result + size();
         return result;
     }
-    
+
     /*
      * (non-Javadoc)
      * 
@@ -158,10 +140,10 @@ public boolean equals(Object obj) {
             return false;
         return true;
     }
-    
+
     @Override
     public String toString() {
         return "[position: " + position + ", size: " + size() + ", lines: " + lines + "]";
     }
-    
+
 }

src/main/java/difflib/DiffRow.java

@@ -15,15 +15,11 @@
  */
 package difflib;
 
-import static com.google.common.base.Preconditions.checkNotNull;
-
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
 
 /**
- * Describes the diff row in form [tag, oldLine, newLine) for showing the
- * difference between two texts
- * 
+ * Describes the diff row in form [tag, oldLine, newLine) for showing the difference between two texts
  * @author <a href="[email protected]">Dmitry Naumenko</a>
  */
 public class DiffRow {
@@ -33,62 +29,62 @@ public class DiffRow {
     private String oldLine;
     @Nullable
     private String newLine;
-    
+
     public DiffRow(@Nonnull Tag tag, @Nullable String oldLine, @Nullable String newLine) {
-        this.tag = checkNotNull(tag);
+        this.tag = tag;
         this.oldLine = oldLine;
         this.newLine = newLine;
     }
-    
+
     public static enum Tag {
         INSERT, DELETE, CHANGE, EQUAL, SKIP
     }
-    
+
     /**
      * @return the tag
      */
     @Nonnull
     public Tag getTag() {
         return tag;
     }
-    
+
     /**
      * @param tag the tag to set
      */
     public void setTag(Tag tag) {
         this.tag = tag;
     }
-    
+
     /**
      * @return the oldLine
      */
     @Nullable
     public String getOldLine() {
         return oldLine;
     }
-    
+
     /**
      * @param oldLine the oldLine to set
      */
     public void setOldLine(@Nullable String oldLine) {
         this.oldLine = oldLine;
     }
-    
+
     /**
      * @return the newLine
      */
     @Nullable
     public String getNewLine() {
         return newLine;
     }
-    
+
     /**
      * @param newLine the newLine to set
      */
     public void setNewLine(@Nullable String newLine) {
         this.newLine = newLine;
     }
-    
+
     /*
      * (non-Javadoc)
      * 
@@ -103,7 +99,7 @@ public int hashCode() {
         result = prime * result + ((tag == null) ? 0 : tag.hashCode());
         return result;
     }
-    
+
     /*
      * (non-Javadoc)
      * 
@@ -135,7 +131,7 @@ public boolean equals(Object obj) {
             return false;
         return true;
     }
-    
+
     public String toString() {
         return "[" + this.tag + "," + this.oldLine + "," + this.newLine + "]";
     }